Changeset 4331

Timestamp:

06/30/10 10:00:01 (15 years ago)

Author:

Mathieu Morlighem

Message:

Check Solution, not analysis type

Location:

issm/trunk/src/c/solutions

Files:

• adjoint_core.cpp (modified) (1 diff)
• balancedthickness2_core.cpp (modified) (1 diff)
• balancedthickness_core.cpp (modified) (1 diff)
• balancedvelocities_core.cpp (modified) (1 diff)
• bedslope_core.cpp (modified) (1 diff)
• diagnostic.cpp (modified) (1 diff)
• diagnostic_core.cpp (modified) (1 diff)
• prognostic2_core.cpp (modified) (1 diff)
• prognostic_core.cpp (modified) (1 diff)
• steadystate_core.cpp (modified) (1 diff)
• surfaceslope_core.cpp (modified) (1 diff)
• thermal_core.cpp (modified) (1 diff)
• transient2d_core.cpp (modified) (1 diff)
• transient3d_core.cpp (modified) (1 diff)

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

@@ -77 +77 @@
 
         if(verbose)_printf_("saving results:\n");
-        if(solution_type==AdjointAnalysisEnum){
+        if(solution_type==AdjointSolutionEnum){
                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,AdjointxEnum);
                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,AdjointyEnum);

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

@@ -44 +44 @@
 
         if(verbose)_printf_("saving results:\n");
-        if(solution_type==Balancedthickness2AnalysisEnum){
+        if(solution_type==Balancedthickness2SolutionEnum){
                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ThicknessEnum);
         }

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

@@ -39 +39 @@
 
         if(verbose)_printf_("saving results:\n");
-        if(solution_type==BalancedthicknessAnalysisEnum){
+        if(solution_type==BalancedthicknessSolutionEnum){
                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ThicknessEnum);
         }

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

@@ -39 +39 @@
 
         if(verbose)_printf_("saving results:\n");
-        if(solution_type==BalancedvelocitiesAnalysisEnum){
+        if(solution_type==BalancedvelocitiesSolutionEnum){
                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum);
                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum);

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

@@ -40 +40 @@
         
         if(verbose)_printf_("saving results:\n");
-        if(solution_type==BedSlopeAnalysisEnum){
+        if(solution_type==BedSlopeSolutionEnum){
                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BedSlopeXEnum);
                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BedSlopeYEnum);

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

@@ -38 +38 @@
         const int numanalyses=6;
         const int analyses[numanalyses]={DiagnosticHorizAnalysisEnum,DiagnosticVertAnalysisEnum,DiagnosticStokesAnalysisEnum,DiagnosticHutterAnalysisEnum,SurfaceSlopeAnalysisEnum,BedSlopeAnalysisEnum};
-        const int solution_type=DiagnosticAnalysisEnum;
+        const int solution_type=DiagnosticSolutionEnum;
 
         MODULEBOOT();

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

@@ -87 +87 @@
 
         if(verbose)_printf_("saving results:\n");
-        if(solution_type==DiagnosticAnalysisEnum){
+        if(solution_type==DiagnosticSolutionEnum){
                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum);
                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum);

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

@@ -37 +37 @@
 
         if(verbose)_printf_("saving results:\n");
-        if(solution_type==Prognostic2AnalysisEnum){
+        if(solution_type==Prognostic2SolutionEnum){
                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ThicknessEnum);
         }

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

@@ -35 +35 @@
 
         if(verbose)_printf_("saving results:\n");
-        if(solution_type==PrognosticAnalysisEnum){
+        if(solution_type==PrognosticSolutionEnum){
                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ThicknessEnum);
         }

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

@@ -58 +58 @@
         
         if(verbose)_printf_("saving results:\n");
-        if(solution_type==SteadystateAnalysisEnum){
+        if(solution_type==SteadystateSolutionEnum){
                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum);
                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum);

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

@@ -40 +40 @@
         
         if(verbose)_printf_("saving results:\n");
-        if(solution_type==SurfaceSlopeAnalysisEnum){
+        if(solution_type==SurfaceSlopeSolutionEnum){
                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SurfaceSlopeXEnum);
                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SurfaceSlopeYEnum);

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

@@ -48 +48 @@
 
                 if(verbose)_printf_("saving results:\n");
-                if(solution_type==ThermalAnalysisEnum){
+                if(solution_type==ThermalSolutionEnum){
                         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,TemperatureEnum,i,time);
                         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,MeltingRateEnum,i,time);

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

@@ -52 +52 @@
 
                 if(verbose)_printf_("%s\n","saving results:\n");
-                if(solution_type==Transient2DAnalysisEnum){
+                if(solution_type==Transient2DSolutionEnum){
                         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum,step,time); 
                         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum,step,time);

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

@@ -60 +60 @@
 
                 if(verbose)_printf_("%s\n","saving results:\n");
-                if(solution_type==Transient3DAnalysisEnum){
+                if(solution_type==Transient3DSolutionEnum){
                         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum,step,time);
                         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum,step,time);