Changeset 16137 for issm/trunk/src/m/solve/solve.py

Timestamp:

09/16/13 09:43:55 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 16135

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/m/solve/solve.py (modified) (3 diffs)

issm/trunk ¶

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad

issm/trunk/src/m/solve/solve.py ¶

@@ -8 +8 @@
 from ismodelselfconsistent import *
 from marshall import *
-from ispetsc import *
 from waitonlock import *
 from loadresultsfromcluster import *
@@ -21 +20 @@
  
            solution types available comprise:
-              - DiagnosticSolutionEnum
-              - PrognosticSolutionEnum
+              - StressbalanceSolutionEnum
+              - MasstransportSolutionEnum
               - ThermalSolutionEnum
               - SteadystateSolutionEnum
@@ -36 +35 @@
  
            Examples:
-              md=solve(md,DiagnosticSolutionEnum);
+              md=solve(md,StressbalanceSolutionEnum);
         """
 

@@ +1 @@
+nightlylog
+configure.sh
 par
 ad