Changeset 8404
- Timestamp:
- 05/24/11 09:21:21 (14 years ago)
- Location:
- issm/trunk/src
- Files:
-
- 10 added
- 2 deleted
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/Makefile.am
r8376 r8404 630 630 ./modules/SystemMatricesx/SystemMatricesx.cpp\ 631 631 ./modules/SystemMatricesx/SystemMatricesx.h\ 632 ./modules/ PenaltyConstraintsx/PenaltyConstraintsx.cpp\633 ./modules/ PenaltyConstraintsx/PenaltyConstraintsx.h\634 ./modules/ PenaltyConstraintsx/PenaltyConstraintsLocal.h\635 ./modules/ PenaltyConstraintsx/RiftConstraints.cpp\636 ./modules/ PenaltyConstraintsx/MeltingConstraints.cpp\637 ./modules/ PenaltyConstraintsx/MeltingIsPresent.cpp\632 ./modules/ConstraintsStatex/ConstraintsStatex.cpp\ 633 ./modules/ConstraintsStatex/ConstraintsStatex.h\ 634 ./modules/ConstraintsStatex/ConstraintsStateLocal.h\ 635 ./modules/ConstraintsStatex/RiftConstraintsState.cpp\ 636 ./modules/ConstraintsStatex/ThermalConstraintsState.cpp\ 637 ./modules/ConstraintsStatex/MeltingIsPresent.cpp\ 638 638 ./modules/Responsex/Responsex.h\ 639 639 ./modules/Responsex/Responsex.cpp\ … … 1265 1265 ./modules/SystemMatricesx/SystemMatricesx.cpp\ 1266 1266 ./modules/SystemMatricesx/SystemMatricesx.h\ 1267 ./modules/ PenaltyConstraintsx/PenaltyConstraintsx.cpp\1268 ./modules/ PenaltyConstraintsx/PenaltyConstraintsx.h\1269 ./modules/ PenaltyConstraintsx/PenaltyConstraintsLocal.h\1270 ./modules/ PenaltyConstraintsx/RiftConstraints.cpp\1271 ./modules/ PenaltyConstraintsx/MeltingConstraints.cpp\1272 ./modules/ PenaltyConstraintsx/MeltingIsPresent.cpp\1267 ./modules/ConstraintsStatex/ConstraintsStatex.cpp\ 1268 ./modules/ConstraintsStatex/ConstraintsStatex.h\ 1269 ./modules/ConstraintsStatex/ConstraintsStateLocal.h\ 1270 ./modules/ConstraintsStatex/RiftConstraintsState.cpp\ 1271 ./modules/ConstraintsStatex/ThermalConstraintsState.cpp\ 1272 ./modules/ConstraintsStatex/MeltingIsPresent.cpp\ 1273 1273 ./modules/Responsex/Responsex.h\ 1274 1274 ./modules/Responsex/Responsex.cpp\ -
issm/trunk/src/c/modules/modules.h
r8385 r8404 77 77 #include "./OutputResultsx/OutputResultsx.h" 78 78 #include "./OutputRiftsx/OutputRiftsx.h" 79 #include "./ PenaltyConstraintsx/PenaltyConstraintsx.h"79 #include "./ConstraintsStatex/ConstraintsStatex.h" 80 80 #include "./PointCloudFindNeighborsx/PointCloudFindNeighborsx.h" 81 81 #include "./PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.h" -
issm/trunk/src/c/solvers/solver_nonlinear.cpp
r7637 r8404 69 69 InputUpdateFromSolutionx( femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug); 70 70 71 PenaltyConstraintsx(&constraints_converged, &num_unstable_constraints, femmodel->elements,femmodel->nodes,femmodel->vertices,loads,femmodel->materials,femmodel->parameters);71 ConstraintsStatex(&constraints_converged, &num_unstable_constraints, femmodel->elements,femmodel->nodes,femmodel->vertices,loads,femmodel->materials,femmodel->parameters); 72 72 _printf_(VerboseConvergence()," number of unstable constraints: %i\n",num_unstable_constraints); 73 73 -
issm/trunk/src/c/solvers/solver_thermal_nonlinear.cpp
r7391 r8404 70 70 InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,tg); 71 71 72 PenaltyConstraintsx(&constraints_converged, &num_unstable_constraints, femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);72 ConstraintsStatex(&constraints_converged, &num_unstable_constraints, femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); 73 73 74 74 if (!converged){ -
issm/trunk/src/m/classes/clusters/pfe.m
r7629 r8404 119 119 120 120 fprintf(fid,'#PBS -S /bin/bash\n'); 121 fprintf(fid,'#PBS -N %s\n',modelname);121 % fprintf(fid,'#PBS -N %s\n',modelname); 122 122 fprintf(fid,'#PBS -l select=%i:ncpus=%i:model=%s\n',cluster.numnodes,cluster.cpuspernode,cluster.processor); 123 123 fprintf(fid,'#PBS -l walltime=%i\n',cluster.time*60); %walltime is in seconds. -
issm/trunk/src/m/solvers/solver_nonlinear.m
r8397 r8404 42 42 43 43 [femmodel.elements,femmodel.materials]=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,loads,femmodel.materials,femmodel.parameters,ug); 44 [loads,constraints_converged,num_unstable_constraints] = PenaltyConstraints( femmodel.elements,femmodel.nodes,femmodel.vertices,loads, femmodel.materials,femmodel.parameters);44 [loads,constraints_converged,num_unstable_constraints] =ConstraintsState( femmodel.elements,femmodel.nodes,femmodel.vertices,loads, femmodel.materials,femmodel.parameters); 45 45 46 46 issmprintf(VerboseConvergence(),'%s%i',' number of unstable constraints: ',num_unstable_constraints); -
issm/trunk/src/m/solvers/solver_thermal_nonlinear.m
r7391 r8404 39 39 40 40 [femmodel.elements,femmodel.materials]=InputUpdateFromSolution(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,t_g); 41 [femmodel.loads,constraints_converged,num_unstable_constraints] = PenaltyConstraints(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads, femmodel.materials,femmodel.parameters);41 [femmodel.loads,constraints_converged,num_unstable_constraints] =ConstraintsState(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads, femmodel.materials,femmodel.parameters); 42 42 43 43 if ~converged, -
issm/trunk/src/mex/Makefile.am
r8330 r8404 53 53 OutputResults\ 54 54 ParsePetscOptions\ 55 PenaltyConstraints\55 ConstraintsState\ 56 56 PointCloudFindNeighbors\ 57 57 PropagateFlagsFromConnectivity\ … … 251 251 OutputResults/OutputResults.h 252 252 253 PenaltyConstraints_SOURCES = PenaltyConstraints/PenaltyConstraints.cpp\254 PenaltyConstraints/PenaltyConstraints.h253 ConstraintsState_SOURCES = ConstraintsState/ConstraintsState.cpp\ 254 ConstraintsState/ConstraintsState.h 255 255 256 256 PointCloudFindNeighbors_SOURCES = PointCloudFindNeighbors/PointCloudFindNeighbors.cpp\
Note:
See TracChangeset
for help on using the changeset viewer.