Changeset 4297
- Timestamp:
- 06/29/10 08:34:51 (15 years ago)
- Location:
- issm/trunk/src/c
- Files:
-
- 6 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/EnumDefinitions/EnumAsString.cpp
r4290 r4297 51 51 case SteadyAnalysisEnum : return "SteadyAnalysis"; 52 52 case TransientAnalysisEnum : return "TransientAnalysis"; 53 case SlopeAnalysisEnum : return "SlopeAnalysis";54 53 case BedSlopeSolutionEnum : return "BedSlopeSolution"; 55 54 case BedSlopeAnalysisEnum : return "BedSlopeAnalysis"; -
issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h
r4290 r4297 54 54 TransientAnalysisEnum, // needed by nighly run (to be removed at some point?) 55 55 //slope 56 SlopeAnalysisEnum,57 56 BedSlopeSolutionEnum, 58 57 BedSlopeAnalysisEnum, -
issm/trunk/src/c/EnumDefinitions/StringAsEnum.cpp
r4290 r4297 49 49 else if (strcmp(name,"SteadyAnalysis")==0) return SteadyAnalysisEnum; 50 50 else if (strcmp(name,"TransientAnalysis")==0) return TransientAnalysisEnum; 51 else if (strcmp(name,"SlopeAnalysis")==0) return SlopeAnalysisEnum;52 51 else if (strcmp(name,"BedSlopeSolution")==0) return BedSlopeSolutionEnum; 53 52 else if (strcmp(name,"BedSlopeAnalysis")==0) return BedSlopeAnalysisEnum; -
issm/trunk/src/c/modules/ModelProcessorx/CreateDataSets.cpp
r4295 r4297 57 57 break; 58 58 59 case SlopeAnalysisEnum:60 CreateNodesSlopeCompute(pnodes, iomodel,iomodel_handle);61 CreateConstraintsSlopeCompute(pconstraints,iomodel,iomodel_handle);62 CreateLoadsSlopeCompute(ploads,iomodel,iomodel_handle);63 UpdateElementsSlopeCompute(elements,iomodel,iomodel_handle,analysis_counter,analysis_type);64 break;65 66 59 case BedSlopeAnalysisEnum: 67 CreateNodes SlopeCompute(pnodes, iomodel,iomodel_handle);68 CreateConstraints SlopeCompute(pconstraints,iomodel,iomodel_handle);69 CreateLoads SlopeCompute(ploads,iomodel,iomodel_handle);70 UpdateElements SlopeCompute(elements,iomodel,iomodel_handle,analysis_counter,analysis_type);60 CreateNodesBedSlope(pnodes, iomodel,iomodel_handle); 61 CreateConstraintsBedSlope(pconstraints,iomodel,iomodel_handle); 62 CreateLoadsBedSlope(ploads,iomodel,iomodel_handle); 63 UpdateElementsBedSlope(elements,iomodel,iomodel_handle,analysis_counter,analysis_type); 71 64 break; 72 65 73 66 case SurfaceSlopeAnalysisEnum: 74 CreateNodesS lopeCompute(pnodes, iomodel,iomodel_handle);75 CreateConstraintsS lopeCompute(pconstraints,iomodel,iomodel_handle);76 CreateLoadsS lopeCompute(ploads,iomodel,iomodel_handle);77 UpdateElementsS lopeCompute(elements,iomodel,iomodel_handle,analysis_counter,analysis_type);67 CreateNodesSurfaceSlope(pnodes, iomodel,iomodel_handle); 68 CreateConstraintsSurfaceSlope(pconstraints,iomodel,iomodel_handle); 69 CreateLoadsSurfaceSlope(ploads,iomodel,iomodel_handle); 70 UpdateElementsSurfaceSlope(elements,iomodel,iomodel_handle,analysis_counter,analysis_type); 78 71 break; 79 72 -
issm/trunk/src/c/solutions/steadystate.cpp
r4295 r4297 39 39 BoolParam* param=NULL; 40 40 41 const int numanalyses= 7;42 const int analyses[numanalyses]={DiagnosticHorizAnalysisEnum,DiagnosticVertAnalysisEnum,DiagnosticStokesAnalysisEnum,DiagnosticHutterAnalysisEnum,S lopeAnalysisEnum,ThermalAnalysisEnum,MeltingAnalysisEnum};41 const int numanalyses=8; 42 const int analyses[numanalyses]={DiagnosticHorizAnalysisEnum,DiagnosticVertAnalysisEnum,DiagnosticStokesAnalysisEnum,DiagnosticHutterAnalysisEnum,SurfaceSlopeAnalysisEnum,BedSlopeAnalysisEnum,ThermalAnalysisEnum,MeltingAnalysisEnum}; 43 43 const int solution_type=SteadystateSolutionEnum; 44 44 -
issm/trunk/src/c/solutions/transient3d.cpp
r4295 r4297 35 35 double start_init, finish_init; 36 36 37 const int numanalyses= 8;38 const int analyses[numanalyses]={DiagnosticHorizAnalysisEnum,DiagnosticVertAnalysisEnum,DiagnosticStokesAnalysisEnum,DiagnosticHutterAnalysisEnum,S lopeAnalysisEnum,PrognosticAnalysisEnum,ThermalAnalysisEnum,MeltingAnalysisEnum};37 const int numanalyses=9; 38 const int analyses[numanalyses]={DiagnosticHorizAnalysisEnum,DiagnosticVertAnalysisEnum,DiagnosticStokesAnalysisEnum,DiagnosticHutterAnalysisEnum,SurfaceSlopeAnalysisEnum,BedSlopeAnalysisEnum,PrognosticAnalysisEnum,ThermalAnalysisEnum,MeltingAnalysisEnum}; 39 39 const int solution_type=Transient3DSolutionEnum; 40 40
Note:
See TracChangeset
for help on using the changeset viewer.