Changeset 18530

Timestamp:

09/18/14 16:27:16 (11 years ago)

Author:

seroussi

Message:

BUG: fixed NR, problem in analysis configuration

File:

• issm/trunk-jpl/src/c/classes/FemModel.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -444 +444 @@
 
                 case ThermalSolutionEnum:
-                        analyses[numanalyses++]=ThermalAnalysisEnum;
-                        analyses[numanalyses++]=MeltingAnalysisEnum;
-                        analyses[numanalyses++]=EnthalpyAnalysisEnum;
+                        analyses_temp[numanalyses++]=ThermalAnalysisEnum;
+                        analyses_temp[numanalyses++]=MeltingAnalysisEnum;
+                        analyses_temp[numanalyses++]=EnthalpyAnalysisEnum;
                         break;
 
                 case HydrologySolutionEnum:
-                        analyses[numanalyses++]=HydrologyShreveAnalysisEnum;
-                        analyses[numanalyses++]=HydrologyDCInefficientAnalysisEnum;
-                        analyses[numanalyses++]=HydrologyDCEfficientAnalysisEnum;
-                        analyses[numanalyses++]=L2ProjectionBaseAnalysisEnum;
-                        analyses[numanalyses++]=L2ProjectionEPLAnalysisEnum;
+                        analyses_temp[numanalyses++]=HydrologyShreveAnalysisEnum;
+                        analyses_temp[numanalyses++]=HydrologyDCInefficientAnalysisEnum;
+                        analyses_temp[numanalyses++]=HydrologyDCEfficientAnalysisEnum;
+                        analyses_temp[numanalyses++]=L2ProjectionBaseAnalysisEnum;
+                        analyses_temp[numanalyses++]=L2ProjectionEPLAnalysisEnum;
                         break;
 
                 case MasstransportSolutionEnum:
-                        analyses[numanalyses++]=MasstransportAnalysisEnum;
+                        analyses_temp[numanalyses++]=MasstransportAnalysisEnum;
                         break;
 
                 case BalancethicknessSolutionEnum:
-                        analyses[numanalyses++]=BalancethicknessAnalysisEnum;
+                        analyses_temp[numanalyses++]=BalancethicknessAnalysisEnum;
                         break;
 
                 case Balancethickness2SolutionEnum:
-                        analyses[numanalyses++]=Balancethickness2AnalysisEnum;
+                        analyses_temp[numanalyses++]=Balancethickness2AnalysisEnum;
                         break;
 
                 case BalancethicknessSoftSolutionEnum:
-                        analyses[numanalyses++]=BalancethicknessAnalysisEnum;
+                        analyses_temp[numanalyses++]=BalancethicknessAnalysisEnum;
                         break;
 
                 case BalancevelocitySolutionEnum:
-                        analyses[numanalyses++]=BalancevelocityAnalysisEnum;
-                        analyses[numanalyses++]=SmoothedSurfaceSlopeXAnalysisEnum;
-                        analyses[numanalyses++]=SmoothedSurfaceSlopeYAnalysisEnum;
+                        analyses_temp[numanalyses++]=BalancevelocityAnalysisEnum;
+                        analyses_temp[numanalyses++]=SmoothedSurfaceSlopeXAnalysisEnum;
+                        analyses_temp[numanalyses++]=SmoothedSurfaceSlopeYAnalysisEnum;
                         break;
 
                 case SurfaceSlopeSolutionEnum:
-                        analyses[numanalyses++]=L2ProjectionBaseAnalysisEnum;
+                        analyses_temp[numanalyses++]=L2ProjectionBaseAnalysisEnum;
                         break;
 
                 case BedSlopeSolutionEnum:
-                        analyses[numanalyses++]=L2ProjectionBaseAnalysisEnum;
+                        analyses_temp[numanalyses++]=L2ProjectionBaseAnalysisEnum;
                         break;
 
                 case GiaSolutionEnum:
-                        analyses[numanalyses++]=GiaAnalysisEnum;
+                        analyses_temp[numanalyses++]=GiaAnalysisEnum;
                         break;
                 
                 case DamageEvolutionSolutionEnum:
-                        analyses[numanalyses++]=DamageEvolutionAnalysisEnum;
+                        analyses_temp[numanalyses++]=DamageEvolutionAnalysisEnum;
                         break;