Changeset 16008


Ignore:
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:
2 added
5 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.m

    r15771 r16008  
    7373                analyses=[BalancethicknessAnalysisEnum()];
    7474
     75        case BalancevelocitySolutionEnum(),
     76                numanalyses=1;
     77                analyses=[BalancevelocityAnalysisEnum()];
     78
    7579        case SurfaceSlopeSolutionEnum(),
    7680                numanalyses=1;
  • issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.py

    r15771 r16008  
    3737                numanalyses=1
    3838                analyses=[SurfaceSlopeAnalysisEnum()]
     39
     40        elif solutiontype == BalancevelocitySolutionEnum():
     41                numanalyses=1
     42                analyses=[BalancevelocityAnalysisEnum()]
    3943
    4044        elif solutiontype == BedSlopeSolutionEnum():
  • issm/trunk-jpl/src/m/enum/EnumDefinitions.py

    r15986 r16008  
    271271def BalancethicknessSoftAnalysisEnum(): return StringToEnum("BalancethicknessSoftAnalysis")[0]
    272272def BalancethicknessSoftSolutionEnum(): return StringToEnum("BalancethicknessSoftSolution")[0]
     273def BalancevelocityAnalysisEnum(): return StringToEnum("BalancevelocityAnalysis")[0]
     274def BalancevelocitySolutionEnum(): return StringToEnum("BalancevelocitySolution")[0]
    273275def BedSlopeAnalysisEnum(): return StringToEnum("BedSlopeAnalysis")[0]
    274276def BedSlopeSolutionEnum(): return StringToEnum("BedSlopeSolution")[0]
  • issm/trunk-jpl/src/m/solve/process_solve_options.m

    r15771 r16008  
    1111if ~ismember(solution_type,[StressbalanceSolutionEnum(),MasstransportSolutionEnum(),ThermalSolutionEnum(),...
    1212                SteadystateSolutionEnum(),TransientSolutionEnum(),EnthalpySolutionEnum(),...
    13                 BalancethicknessSolutionEnum(),BalancethicknessSoftSolutionEnum(),BedSlopeSolutionEnum(),...
     13                BalancethicknessSolutionEnum(),BalancethicknessSoftSolutionEnum(),...
     14                BalancevelocitySolutionEnum(),BedSlopeSolutionEnum(),...
    1415                SurfaceSlopeSolutionEnum(),HydrologySolutionEnum(),FlaimSolutionEnum(),GiaSolutionEnum()]),
    1516        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  
    2020        if solution_type not in (StressbalanceSolutionEnum(),MasstransportSolutionEnum(),ThermalSolutionEnum(),\
    2121                        SteadystateSolutionEnum(),TransientSolutionEnum(),EnthalpySolutionEnum(),\
    22                         BalancethicknessSolutionEnum(),BedSlopeSolutionEnum(),SurfaceSlopeSolutionEnum(),\
     22                        BalancethicknessSolutionEnum(),BalancevelocitySolutionEnum(),\
     23                        BedSlopeSolutionEnum(),SurfaceSlopeSolutionEnum(),\
    2324                        HydrologySolutionEnum(),FlaimSolutionEnum(),GiaSolutionEnum()):
    2425                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.