Changeset 4297

Timestamp:

06/29/10 08:34:51 (15 years ago)

Author:

Mathieu Morlighem

Message:

Getting rid of SlopeAnalysis (now either Bed or Surface)

Location:

issm/trunk/src/c

Files:

• EnumDefinitions/EnumAsString.cpp (modified) (1 diff)
• EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• EnumDefinitions/StringAsEnum.cpp (modified) (1 diff)
• modules/ModelProcessorx/BedSlope (moved) (moved from issm/trunk/src/c/modules/ModelProcessorx/SlopeCompute )
• modules/ModelProcessorx/CreateDataSets.cpp (modified) (1 diff)
• solutions/steadystate.cpp (modified) (1 diff)
• solutions/transient3d.cpp (modified) (1 diff)

issm/trunk/src/c/EnumDefinitions/EnumAsString.cpp

@@ -51 +51 @@
                 case SteadyAnalysisEnum : return "SteadyAnalysis";
                 case TransientAnalysisEnum : return "TransientAnalysis";
-                case SlopeAnalysisEnum : return "SlopeAnalysis";
                 case BedSlopeSolutionEnum : return "BedSlopeSolution";
                 case BedSlopeAnalysisEnum : return "BedSlopeAnalysis";

issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h

@@ -54 +54 @@
         TransientAnalysisEnum, // needed by nighly run (to be removed at some point?)
         //slope
-        SlopeAnalysisEnum,
         BedSlopeSolutionEnum,
         BedSlopeAnalysisEnum,

issm/trunk/src/c/EnumDefinitions/StringAsEnum.cpp

@@ -49 +49 @@
         else if (strcmp(name,"SteadyAnalysis")==0) return SteadyAnalysisEnum;
         else if (strcmp(name,"TransientAnalysis")==0) return TransientAnalysisEnum;
-        else if (strcmp(name,"SlopeAnalysis")==0) return SlopeAnalysisEnum;
         else if (strcmp(name,"BedSlopeSolution")==0) return BedSlopeSolutionEnum;
         else if (strcmp(name,"BedSlopeAnalysis")==0) return BedSlopeAnalysisEnum;

issm/trunk/src/c/modules/ModelProcessorx/CreateDataSets.cpp

@@ -57 +57 @@
                         break;
 
-                case SlopeAnalysisEnum:
-                        CreateNodesSlopeCompute(pnodes, iomodel,iomodel_handle);
-                        CreateConstraintsSlopeCompute(pconstraints,iomodel,iomodel_handle);
-                        CreateLoadsSlopeCompute(ploads,iomodel,iomodel_handle);
-                        UpdateElementsSlopeCompute(elements,iomodel,iomodel_handle,analysis_counter,analysis_type);
-                        break;
-                
                 case BedSlopeAnalysisEnum:
-                        CreateNodesSlopeCompute(pnodes, iomodel,iomodel_handle);
-                        CreateConstraintsSlopeCompute(pconstraints,iomodel,iomodel_handle);
-                        CreateLoadsSlopeCompute(ploads,iomodel,iomodel_handle);
-                        UpdateElementsSlopeCompute(elements,iomodel,iomodel_handle,analysis_counter,analysis_type);
+                        CreateNodesBedSlope(pnodes, iomodel,iomodel_handle);
+                        CreateConstraintsBedSlope(pconstraints,iomodel,iomodel_handle);
+                        CreateLoadsBedSlope(ploads,iomodel,iomodel_handle);
+                        UpdateElementsBedSlope(elements,iomodel,iomodel_handle,analysis_counter,analysis_type);
                         break;
 
                 case SurfaceSlopeAnalysisEnum:
-                        CreateNodesSlopeCompute(pnodes, iomodel,iomodel_handle);
-                        CreateConstraintsSlopeCompute(pconstraints,iomodel,iomodel_handle);
-                        CreateLoadsSlopeCompute(ploads,iomodel,iomodel_handle);
-                        UpdateElementsSlopeCompute(elements,iomodel,iomodel_handle,analysis_counter,analysis_type);
+                        CreateNodesSurfaceSlope(pnodes, iomodel,iomodel_handle);
+                        CreateConstraintsSurfaceSlope(pconstraints,iomodel,iomodel_handle);
+                        CreateLoadsSurfaceSlope(ploads,iomodel,iomodel_handle);
+                        UpdateElementsSurfaceSlope(elements,iomodel,iomodel_handle,analysis_counter,analysis_type);
                         break;
 

issm/trunk/src/c/solutions/steadystate.cpp

@@ -39 +39 @@
         BoolParam* param=NULL;
 
-        const int numanalyses=7;
-        const int analyses[numanalyses]={DiagnosticHorizAnalysisEnum,DiagnosticVertAnalysisEnum,DiagnosticStokesAnalysisEnum,DiagnosticHutterAnalysisEnum,SlopeAnalysisEnum,ThermalAnalysisEnum,MeltingAnalysisEnum};
+        const int numanalyses=8;
+        const int analyses[numanalyses]={DiagnosticHorizAnalysisEnum,DiagnosticVertAnalysisEnum,DiagnosticStokesAnalysisEnum,DiagnosticHutterAnalysisEnum,SurfaceSlopeAnalysisEnum,BedSlopeAnalysisEnum,ThermalAnalysisEnum,MeltingAnalysisEnum};
         const int solution_type=SteadystateSolutionEnum;
 

issm/trunk/src/c/solutions/transient3d.cpp

@@ -35 +35 @@
         double   start_init, finish_init;
 
-        const int numanalyses=8;
-        const int analyses[numanalyses]={DiagnosticHorizAnalysisEnum,DiagnosticVertAnalysisEnum,DiagnosticStokesAnalysisEnum,DiagnosticHutterAnalysisEnum,SlopeAnalysisEnum,PrognosticAnalysisEnum,ThermalAnalysisEnum,MeltingAnalysisEnum};
+        const int numanalyses=9;
+        const int analyses[numanalyses]={DiagnosticHorizAnalysisEnum,DiagnosticVertAnalysisEnum,DiagnosticStokesAnalysisEnum,DiagnosticHutterAnalysisEnum,SurfaceSlopeAnalysisEnum,BedSlopeAnalysisEnum,PrognosticAnalysisEnum,ThermalAnalysisEnum,MeltingAnalysisEnum};
         const int solution_type=Transient3DSolutionEnum;