Changeset 21054

Timestamp:

08/03/16 00:40:55 (9 years ago)

Author:

agscott1

Message:

BUG: Added support for SealevelriseSolution for test2002

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

@@ -19 +19 @@
 %      - 'DamageEvolutionSolution'      or 'da'
 %                - 'GiaSolution'                                        or 'gi'
+%                - 'SealevelriseSolution'               or 'sl'
 %
 %  extra options:
@@ -59 +60 @@
 elseif strcmpi(solutionstring,'gi') || strcmpi(solutionstring,'GiaSolution') || strcmpi(solutionstring,'Gia')
         solutionstring = 'GiaSolution';
+elseif strcmpi(solutionstring,'sl') || strcmpi(solutionstring,'SealevelriseSolution') || strcmpi(solutionstring,'Sealevelrise')
+        solutionstring = 'SealevelriseSolution';
 else
         error(['solutionstring ' solutionstring ' not supported!']);

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

@@ -32 +32 @@
                  - 'DamageEvolutionSolution'    or 'da'
                  - 'GiaSolution'                                        or 'gi'
- 
+                 - 'SealevelriseSolution'               or 'sl'
+
            extra options:
               - loadonly : does not solve. only load results
@@ -67 +68 @@
                 solutionstring = 'DamageEvolutionSolution';
         elif solutionstring.lower() == 'gi' or solutionstring.lower() == 'giasolution' or solutionstring.lower() == 'gia':
+                solutionstring = 'GiaSolution';
+        elif solutionstring.lower() == 'sl' or solutionstring.lower() == 'sealevelrisesolution' or solutionstring.lower() == 'sealevelrise':
                 solutionstring = 'GiaSolution';
         else: