Changeset 21053

Timestamp:

08/02/16 22:50:15 (9 years ago)

Author:

agscott1

Message:

BUG: Added GiaSolution string for solve (for test2000s)

Location:

issm/trunk-jpl/src/m/solve

Files:

• solve.m (modified) (2 diffs)
• solve.py (modified) (2 diffs)

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

@@ -18 +18 @@
 %                - 'HydrologySolution'                  or 'hy'
 %      - 'DamageEvolutionSolution'      or 'da'
+%                - 'GiaSolution'                                        or 'gi'
 %
 %  extra options:
@@ -56 +57 @@
 elseif strcmpi(solutionstring,'da') || strcmpi(solutionstring,'DamageEvolution') || strcmpi(solutionstring,'DamageEvolutionSolution')
         solutionstring = 'DamageEvolutionSolution';
+elseif strcmpi(solutionstring,'gi') || strcmpi(solutionstring,'GiaSolution') || strcmpi(solutionstring,'Gia')
+        solutionstring = 'GiaSolution';
 else
         error(['solutionstring ' solutionstring ' not supported!']);

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

@@ -31 +31 @@
                  - 'HydrologySolution'                  or 'hy'
                  - 'DamageEvolutionSolution'    or 'da'
-
+                 - 'GiaSolution'                                        or 'gi'
  
            extra options:
@@ -63 +63 @@
                 solutionstring = 'SurfaceSlopeSolution';
         elif solutionstring.lower() == 'hy' or solutionstring.lower() == 'hydrology' or solutionstring.lower() == 'hydrologysolution':
-                solutioneum = 'HydrologySolution';
+                solutionstring = 'HydrologySolution';
         elif solutionstring.lower() == 'da' or solutionstring.lower() == 'damageevolution' or solutionstring.lower() == 'damageevolutionsolution':
                 solutionstring = 'DamageEvolutionSolution';
+        elif solutionstring.lower() == 'gi' or solutionstring.lower() == 'giasolution' or solutionstring.lower() == 'gia':
+                solutionstring = 'GiaSolution';
         else:   
                 raise ValueError("solutionstring '%s' not supported!" % solutionstring)