Changeset 24313 for issm/trunk/src/m/consistency/ismodelselfconsistent.py

Timestamp:

11/01/19 12:01:57 (5 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 24310

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/consistency/ismodelselfconsistent.py (modified) (1 diff)

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

@@ -1 @@
-def AnalysisConfiguration(solutiontype): #{{{
-        """
-        ANALYSISCONFIGURATION - return type of analyses, number of analyses 
+def AnalysisConfiguration(solutiontype):  #{{{
+    """
+    ANALYSISCONFIGURATION - return type of analyses, number of analyses
 
-                Usage:
-                        [analyses]=AnalysisConfiguration(solutiontype);
-        """
+            Usage:
+                    [analyses] = AnalysisConfiguration(solutiontype)
+    """
 
-        if   solutiontype == 'StressbalanceSolution':
-                analyses=['StressbalanceAnalysis','StressbalanceVerticalAnalysis','StressbalanceSIAAnalysis','L2ProjectionBaseAnalysis']
+    if solutiontype == 'StressbalanceSolution':
+        analyses = ['StressbalanceAnalysis', 'StressbalanceVerticalAnalysis', 'StressbalanceSIAAnalysis', 'L2ProjectionBaseAnalysis']
+    elif solutiontype == 'SteadystateSolution':
+        analyses = ['StressbalanceAnalysis', 'StressbalanceVerticalAnalysis', 'StressbalanceSIAAnalysis', 'L2ProjectionBaseAnalysis', 'ThermalAnalysis', 'MeltingAnalysis', 'EnthalpyAnalysis']
+    elif solutiontype == 'ThermalSolution':
+        analyses = ['EnthalpyAnalysis', 'ThermalAnalysis', 'MeltingAnalysis']
+    elif solutiontype == 'MasstransportSolution':
+        analyses = ['MasstransportAnalysis']
+    elif solutiontype == 'BalancethicknessSolution':
+        analyses = ['BalancethicknessAnalysis']
+    elif solutiontype == 'SurfaceSlopeSolution':
+        analyses = ['L2ProjectionBaseAnalysis']
+    elif solutiontype == 'BalancevelocitySolution':
+        analyses = ['BalancevelocityAnalysis']
+    elif solutiontype == 'BedSlopeSolution':
+        analyses = ['L2ProjectionBaseAnalysis']
+    elif solutiontype == 'GiaSolution':
+        analyses = ['GiaIvinsAnalysis']
+    elif solutiontype == 'LoveSolution':
+        analyses = ['LoveAnalysis']
+    elif solutiontype == 'TransientSolution':
+        analyses = ['StressbalanceAnalysis', 'StressbalanceVerticalAnalysis', 'StressbalanceSIAAnalysis', 'L2ProjectionBaseAnalysis', 'ThermalAnalysis', 'MeltingAnalysis', 'EnthalpyAnalysis', 'MasstransportAnalysis', 'HydrologyShaktiAnalysis', 'HydrologyGladsAnalysis', 'HydrologyDCInefficientAnalysis', 'HydrologyDCEfficientAnalysis']
+    elif solutiontype == 'HydrologySolution':
+        analyses = ['L2ProjectionBaseAnalysis', 'HydrologyShreveAnalysis', 'HydrologyDCInefficientAnalysis', 'HydrologyDCEfficientAnalysis']
+    elif 'DamageEvolutionSolution':
+        analyses = ['DamageEvolutionAnalysis']
 
-        elif solutiontype == 'SteadystateSolution':
-                analyses=['StressbalanceAnalysis','StressbalanceVerticalAnalysis','StressbalanceSIAAnalysis','L2ProjectionBaseAnalysis','ThermalAnalysis','MeltingAnalysis','EnthalpyAnalysis']
+    else:
+        raise TypeError("solution type: '%s' not supported yet!" % solutiontype)
+    return analyses
+    #}}}
 
-        elif solutiontype == 'ThermalSolution':
-                analyses=['EnthalpyAnalysis','ThermalAnalysis','MeltingAnalysis']
-
-        elif solutiontype == 'MasstransportSolution':
-                analyses=['MasstransportAnalysis']
-
-        elif solutiontype == 'BalancethicknessSolution':
-                analyses=['BalancethicknessAnalysis']
-
-        elif solutiontype == 'SurfaceSlopeSolution':
-                analyses=['L2ProjectionBaseAnalysis']
-
-        elif solutiontype == 'BalancevelocitySolution':
-                analyses=['BalancevelocityAnalysis']
-
-        elif solutiontype == 'BedSlopeSolution':
-                analyses=['L2ProjectionBaseAnalysis']
-
-        elif solutiontype == 'GiaSolution':
-                analyses=['GiaIvinsAnalysis']
-
-        elif solutiontype == 'LoveSolution':
-                analyses=['LoveAnalysis']
-
-        elif solutiontype == 'TransientSolution':
-                analyses=['StressbalanceAnalysis','StressbalanceVerticalAnalysis','StressbalanceSIAAnalysis','L2ProjectionBaseAnalysis','ThermalAnalysis','MeltingAnalysis','EnthalpyAnalysis','MasstransportAnalysis']
-
-        elif solutiontype == 'HydrologySolution':
-                analyses=['L2ProjectionBaseAnalysis','HydrologyShreveAnalysis','HydrologyDCInefficientAnalysis','HydrologyDCEfficientAnalysis']
-
-        elif 'DamageEvolutionSolution':
-                analyses=['DamageEvolutionAnalysis']
-
-        else:
-                raise TypeError("solution type: '%s' not supported yet!" % solutiontype)
-
-        return analyses
-#}}}
 
 def ismodelselfconsistent(md):
-        """
-        ISMODELSELFCONSISTENT - check that model forms a closed form solvable problem.
+    """
+    ISMODELSELFCONSISTENT - check that model forms a closed form solvable problem.
 
-           Usage:
-              ismodelselfconsistent(md),
-        """
+       Usage:
+          ismodelselfconsistent(md),
+    """
 
-        #initialize consistency as true
-        md.private.isconsistent=True
+    #initialize consistency as true
+    md.private.isconsistent = True
 
-        #Get solution and associated analyses
-        solution=md.private.solution
-        analyses=AnalysisConfiguration(solution)
+    #Get solution and associated analyses
+    solution = md.private.solution
+    analyses = AnalysisConfiguration(solution)
+    #Go through a model fields, check that it is a class, and call checkconsistency
+    #fields = vars(md)
+    #for field in fields.iterkeys():
+    for field in md.properties():
+        #Some properties do not need to be checked
+        if field in ['results', 'debug', 'radaroverlay']:
+            continue
 
-        #Go through a model fields, check that it is a class, and call checkconsistency
-        fields=vars(md)
-#       for field in fields.iterkeys():
-        for field in md.properties():
+        #Check that current field is an object
+        if not hasattr(getattr(md, field), 'checkconsistency'):
+            md.checkmessage("field '%s' is not an object." % field)
 
-                #Some properties do not need to be checked
-                if field in ['results','debug','radaroverlay']:
-                        continue
+        #Check consistency of the object
+        exec("md.{}.checkconsistency(md, '{}', {})".format(field, solution, analyses))
 
-                #Check that current field is an object
-                if not hasattr(getattr(md,field),'checkconsistency'):
-                        md.checkmessage("field '%s' is not an object." % field)
-
-                #Check consistency of the object
-                exec("md.{}.checkconsistency(md,solution,analyses)".format(field))
-
-        #error message if mode is not consistent
-        if not md.private.isconsistent:
-                raise RuntimeError('Model not consistent, see messages above.')
-
+    #error message if mode is not consistent
+    if not md.private.isconsistent:
+        raise RuntimeError('Model not consistent, see messages above.')