Changeset 16008

Timestamp:

08/29/13 08:55:02 (12 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added balancevelocity solver (not finished yet)

Location:

issm/trunk-jpl/src/m

Files:

• consistency/ismodelselfconsistent.m (modified) (1 diff)
• consistency/ismodelselfconsistent.py (modified) (1 diff)
• enum/BalancevelocityAnalysisEnum.m (added)
• enum/BalancevelocitySolutionEnum.m (added)
• enum/EnumDefinitions.py (modified) (1 diff)
• solve/process_solve_options.m (modified) (1 diff)
• solve/process_solve_options.py (modified) (1 diff)

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

@@ -73 +73 @@
                 analyses=[BalancethicknessAnalysisEnum()];
 
+        case BalancevelocitySolutionEnum(),
+                numanalyses=1; 
+                analyses=[BalancevelocityAnalysisEnum()];
+
         case SurfaceSlopeSolutionEnum(),
                 numanalyses=1; 

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

@@ -37 +37 @@
                 numanalyses=1 
                 analyses=[SurfaceSlopeAnalysisEnum()]
+
+        elif solutiontype == BalancevelocitySolutionEnum():
+                numanalyses=1 
+                analyses=[BalancevelocityAnalysisEnum()]
 
         elif solutiontype == BedSlopeSolutionEnum():

issm/trunk-jpl/src/m/enum/EnumDefinitions.py

@@ -271 +271 @@
 def BalancethicknessSoftAnalysisEnum(): return StringToEnum("BalancethicknessSoftAnalysis")[0]
 def BalancethicknessSoftSolutionEnum(): return StringToEnum("BalancethicknessSoftSolution")[0]
+def BalancevelocityAnalysisEnum(): return StringToEnum("BalancevelocityAnalysis")[0]
+def BalancevelocitySolutionEnum(): return StringToEnum("BalancevelocitySolution")[0]
 def BedSlopeAnalysisEnum(): return StringToEnum("BedSlopeAnalysis")[0]
 def BedSlopeSolutionEnum(): return StringToEnum("BedSlopeSolution")[0]

issm/trunk-jpl/src/m/solve/process_solve_options.m

@@ -11 +11 @@
 if ~ismember(solution_type,[StressbalanceSolutionEnum(),MasstransportSolutionEnum(),ThermalSolutionEnum(),...
                 SteadystateSolutionEnum(),TransientSolutionEnum(),EnthalpySolutionEnum(),...
-                BalancethicknessSolutionEnum(),BalancethicknessSoftSolutionEnum(),BedSlopeSolutionEnum(),...
+                BalancethicknessSolutionEnum(),BalancethicknessSoftSolutionEnum(),...
+                BalancevelocitySolutionEnum(),BedSlopeSolutionEnum(),...
                 SurfaceSlopeSolutionEnum(),HydrologySolutionEnum(),FlaimSolutionEnum(),GiaSolutionEnum()]),
         error(['process_solve_options error message: solution_type ' EnumToString(solution_type) ' not supported yet!']);

issm/trunk-jpl/src/m/solve/process_solve_options.py

@@ -20 +20 @@
         if solution_type not in (StressbalanceSolutionEnum(),MasstransportSolutionEnum(),ThermalSolutionEnum(),\
                         SteadystateSolutionEnum(),TransientSolutionEnum(),EnthalpySolutionEnum(),\
-                        BalancethicknessSolutionEnum(),BedSlopeSolutionEnum(),SurfaceSlopeSolutionEnum(),\
+                        BalancethicknessSolutionEnum(),BalancevelocitySolutionEnum(),\
+                        BedSlopeSolutionEnum(),SurfaceSlopeSolutionEnum(),\
                         HydrologySolutionEnum(),FlaimSolutionEnum(),GiaSolutionEnum()):
                 raise ValueError("process_solve_options error message: solution_type '%s' not supported yet!" % EnumToString(solution_type)[0])