Changeset 16532

Timestamp:

10/23/13 11:53:47 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: no more SlopeAnalysisEnum

File:

• issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.py (modified) (2 diffs)

issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.py

@@ -7 +7 @@
 
                 Usage:
-                        [analyses, numanalyses]=AnalysisConfiguration(solutiontype);
+                        [analyses]=AnalysisConfiguration(solutiontype);
         """
 
         if   solutiontype == StressbalanceSolutionEnum():
-                numanalyses=5
-                analyses=[StressbalanceAnalysisEnum(),StressbalanceVerticalAnalysisEnum(),StressbalanceSIAAnalysisEnum(),SurfaceSlopeAnalysisEnum(),BedSlopeAnalysisEnum()]
+                analyses=[StressbalanceAnalysisEnum(),StressbalanceVerticalAnalysisEnum(),StressbalanceSIAAnalysisEnum(),L2ProjectionBaseAnalysisEnum()]
 
         elif solutiontype == SteadystateSolutionEnum():
-                numanalyses=7 
-                analyses=[StressbalanceAnalysisEnum(),StressbalanceVerticalAnalysisEnum(),StressbalanceSIAAnalysisEnum(),SurfaceSlopeAnalysisEnum(),BedSlopeAnalysisEnum(),ThermalAnalysisEnum(),MeltingAnalysisEnum()]
+                analyses=[StressbalanceAnalysisEnum(),StressbalanceVerticalAnalysisEnum(),StressbalanceSIAAnalysisEnum(),L2ProjectionBaseAnalysisEnum(),ThermalAnalysisEnum(),MeltingAnalysisEnum()]
 
         elif solutiontype == ThermalSolutionEnum():
-                numanalyses=2 
                 analyses=[EnthalpyAnalysisEnum(),ThermalAnalysisEnum(),MeltingAnalysisEnum()]
 
         elif solutiontype == MasstransportSolutionEnum():
-                numanalyses=1 
                 analyses=[MasstransportAnalysisEnum()]
 
         elif solutiontype == BalancethicknessSolutionEnum():
-                numanalyses=1 
                 analyses=[BalancethicknessAnalysisEnum()]
 
         elif solutiontype == SurfaceSlopeSolutionEnum():
-                numanalyses=1 
-                analyses=[SurfaceSlopeAnalysisEnum()]
+                analyses=[L2ProjectionBaseAnalysisEnum()]
 
         elif solutiontype == BalancevelocitySolutionEnum():
-                numanalyses=1 
                 analyses=[BalancevelocityAnalysisEnum()]
 
         elif solutiontype == BedSlopeSolutionEnum():
-                numanalyses=1 
-                analyses=[BedSlopeAnalysisEnum()]
+                analyses=[L2ProjectionBaseAnalysisEnum()]
 
         elif solutiontype == GiaSolutionEnum():
-                numanalyses=1
                 analyses=[GiaAnalysisEnum()]
 
         elif solutiontype == TransientSolutionEnum():
-                numanalyses=9 
-                analyses=[StressbalanceAnalysisEnum(),StressbalanceVerticalAnalysisEnum(),StressbalanceSIAAnalysisEnum(),SurfaceSlopeAnalysisEnum(),BedSlopeAnalysisEnum(),ThermalAnalysisEnum(),MeltingAnalysisEnum(),EnthalpyAnalysisEnum(),MasstransportAnalysisEnum()]
+                analyses=[StressbalanceAnalysisEnum(),StressbalanceVerticalAnalysisEnum(),StressbalanceSIAAnalysisEnum(),L2ProjectionBaseAnalysisEnum(),ThermalAnalysisEnum(),MeltingAnalysisEnum(),EnthalpyAnalysisEnum(),MasstransportAnalysisEnum()]
 
         elif solutiontype == FlaimSolutionEnum():
-                numanalyses=1 
                 analyses=[FlaimAnalysisEnum()]
 
         elif solutiontype == HydrologySolutionEnum():
-                numanalyses=3 
-                analyses=[BedSlopeAnalysisEnum(),SurfaceSlopeAnalysisEnum(),HydrologyShreveAnalysisEnum(),HydrologyDCInefficientAnalysisEnum(),HydrologyDCEfficientAnalysisEnum()]
+                analyses=[L2ProjectionBaseAnalysisEnum(),HydrologyShreveAnalysisEnum(),HydrologyDCInefficientAnalysisEnum(),HydrologyDCEfficientAnalysisEnum()]
 
         else:
                 raise TypeError("solution type: '%s' not supported yet!" % EnumToString(solutiontype)[0])
 
-        return analyses,numanalyses
+        return analyses
 #}}}
 
@@ -77 +65 @@
         #Get solution and associated analyses
         solution=md.private.solution
-        analyses,numanalyses=AnalysisConfiguration(solution)
+        analyses=AnalysisConfiguration(solution)
 
         #Go through a model fields, check that it is a class, and call checkconsistency