Changeset 16008
- Timestamp:
- 08/29/13 08:55:02 (12 years ago)
- Location:
- issm/trunk-jpl/src/m
- Files:
-
- 2 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.m
r15771 r16008 73 73 analyses=[BalancethicknessAnalysisEnum()]; 74 74 75 case BalancevelocitySolutionEnum(), 76 numanalyses=1; 77 analyses=[BalancevelocityAnalysisEnum()]; 78 75 79 case SurfaceSlopeSolutionEnum(), 76 80 numanalyses=1; -
issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.py
r15771 r16008 37 37 numanalyses=1 38 38 analyses=[SurfaceSlopeAnalysisEnum()] 39 40 elif solutiontype == BalancevelocitySolutionEnum(): 41 numanalyses=1 42 analyses=[BalancevelocityAnalysisEnum()] 39 43 40 44 elif solutiontype == BedSlopeSolutionEnum(): -
issm/trunk-jpl/src/m/enum/EnumDefinitions.py
r15986 r16008 271 271 def BalancethicknessSoftAnalysisEnum(): return StringToEnum("BalancethicknessSoftAnalysis")[0] 272 272 def BalancethicknessSoftSolutionEnum(): return StringToEnum("BalancethicknessSoftSolution")[0] 273 def BalancevelocityAnalysisEnum(): return StringToEnum("BalancevelocityAnalysis")[0] 274 def BalancevelocitySolutionEnum(): return StringToEnum("BalancevelocitySolution")[0] 273 275 def BedSlopeAnalysisEnum(): return StringToEnum("BedSlopeAnalysis")[0] 274 276 def BedSlopeSolutionEnum(): return StringToEnum("BedSlopeSolution")[0] -
issm/trunk-jpl/src/m/solve/process_solve_options.m
r15771 r16008 11 11 if ~ismember(solution_type,[StressbalanceSolutionEnum(),MasstransportSolutionEnum(),ThermalSolutionEnum(),... 12 12 SteadystateSolutionEnum(),TransientSolutionEnum(),EnthalpySolutionEnum(),... 13 BalancethicknessSolutionEnum(),BalancethicknessSoftSolutionEnum(),BedSlopeSolutionEnum(),... 13 BalancethicknessSolutionEnum(),BalancethicknessSoftSolutionEnum(),... 14 BalancevelocitySolutionEnum(),BedSlopeSolutionEnum(),... 14 15 SurfaceSlopeSolutionEnum(),HydrologySolutionEnum(),FlaimSolutionEnum(),GiaSolutionEnum()]), 15 16 error(['process_solve_options error message: solution_type ' EnumToString(solution_type) ' not supported yet!']); -
issm/trunk-jpl/src/m/solve/process_solve_options.py
r15771 r16008 20 20 if solution_type not in (StressbalanceSolutionEnum(),MasstransportSolutionEnum(),ThermalSolutionEnum(),\ 21 21 SteadystateSolutionEnum(),TransientSolutionEnum(),EnthalpySolutionEnum(),\ 22 BalancethicknessSolutionEnum(),BedSlopeSolutionEnum(),SurfaceSlopeSolutionEnum(),\ 22 BalancethicknessSolutionEnum(),BalancevelocitySolutionEnum(),\ 23 BedSlopeSolutionEnum(),SurfaceSlopeSolutionEnum(),\ 23 24 HydrologySolutionEnum(),FlaimSolutionEnum(),GiaSolutionEnum()): 24 25 raise ValueError("process_solve_options error message: solution_type '%s' not supported yet!" % EnumToString(solution_type)[0])
Note:
See TracChangeset
for help on using the changeset viewer.