Changeset 21058

Timestamp:

08/03/16 14:17:10 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: renaming some solutions

Location:

issm/trunk-jpl/src/m/solve

Files:

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

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

@@ -10 +10 @@
 %                - 'Masstransport'      or 'mt'
 %                - 'Thermal'            or 'th'
-%                - 'Steadystate'        or 'st'
+%                - 'Steadystate'        or 'ss'
 %                - 'Transient'          or 'tr'
 %                - 'Balancethickness'   or 'mc'
 %      - 'Balancevelocity'    or 'bv'
-%                - 'BedSlope'           or 'bs'
-%                - 'SurfaceSlope'       or 'ss'
+%                - 'BedSlope'           or 'bsl'
+%                - 'SurfaceSlope'       or 'ssl'
 %                - 'Hydrology'          or 'hy'
 %      - 'DamageEvolution'    or 'da'
-%                - 'Gia'                or 'gi'
-%                - 'Sealevelrise'       or 'sl'
+%                - 'Gia'                or 'gia'
+%                - 'Sealevelrise'       or 'slr'
 %
 %  extra options:
@@ -26 +26 @@
 %      - checkconsistency : 'yes' or 'no' (default is 'yes'), ensures checks on consistency of model
 %      - restart: 'directory name (relative to the execution directory) where the restart file is located.
+%      - outbinread  : if 0, download the outbin but do not process is (md.results is not updated)
 %
 %   Examples:
@@ -36 +37 @@
 
 %recover and process solve options
-if strcmpi(solutionstring,'sb') || strcmpi(solutionstring,'Stressbalance') || strcmpi(solutionstring, 'StressbalanceSolution')
+if strcmpi(solutionstring,'sb') || strcmpi(solutionstring,'Stressbalance')
         solutionstring = 'StressbalanceSolution';
-elseif strcmpi(solutionstring,'mt') || strcmpi(solutionstring,'Masstransport') || strcmpi(solutionstring,'MasstransportSolution')
+elseif strcmpi(solutionstring,'mt') || strcmpi(solutionstring,'Masstransport')
         solutionstring = 'MasstransportSolution';
-elseif strcmpi(solutionstring,'th') || strcmpi(solutionstring,'Thermal') || strcmpi(solutionstring,'ThermalSolution')
+elseif strcmpi(solutionstring,'th') || strcmpi(solutionstring,'Thermal')
         solutionstring = 'ThermalSolution';
-elseif strcmpi(solutionstring,'st') || strcmpi(solutionstring,'Steadystate') || strcmpi(solutionstring,'SteadystateSolution')
+elseif strcmpi(solutionstring,'ss') || strcmpi(solutionstring,'Steadystate') 
         solutionstring = 'SteadystateSolution';
-elseif strcmpi(solutionstring,'tr') || strcmpi(solutionstring,'Transient') || strcmpi(solutionstring,'TransientSolution')
+elseif strcmpi(solutionstring,'tr') || strcmpi(solutionstring,'Transient')
         solutionstring = 'TransientSolution';
-elseif strcmpi(solutionstring,'mc') || strcmpi(solutionstring,'Balancethickness') || strcmpi(solutionstring,'BalancethicknessSolution')
+elseif strcmpi(solutionstring,'mc') || strcmpi(solutionstring,'Balancethickness')
         solutionstring = 'BalancethicknessSolution';
-elseif strcmpi(solutionstring,'bv') || strcmpi(solutionstring,'Balancevelocity') || strcmpi(solutionstring,'BalancevelocitySolution')
+elseif strcmpi(solutionstring,'bv') || strcmpi(solutionstring,'Balancevelocity')
         solutionstring = 'BalancevelocitySolution';
-elseif strcmpi(solutionstring,'bs') || strcmpi(solutionstring,'BedSlope') || strcmpi(solutionstring,'BedSlopeSolution')
+elseif strcmpi(solutionstring,'bsl') || strcmpi(solutionstring,'BedSlope')
         solutionstring = 'BedSlopeSolution';
-elseif strcmpi(solutionstring,'ss') || strcmpi(solutionstring,'SurfaceSlope') || strcmpi(solutionstring,'SurfaceSlopeSolution')
+elseif strcmpi(solutionstring,'ssl') || strcmpi(solutionstring,'SurfaceSlope')
         solutionstring = 'SurfaceSlopeSolution';
-elseif strcmpi(solutionstring,'hy') || strcmpi(solutionstring,'Hydrology') || strcmpi(solutionstring,'HydrologySolution')
+elseif strcmpi(solutionstring,'hy') || strcmpi(solutionstring,'Hydrology')
         solutionstring = 'HydrologySolution';
-elseif strcmpi(solutionstring,'da') || strcmpi(solutionstring,'DamageEvolution') || strcmpi(solutionstring,'DamageEvolutionSolution')
+elseif strcmpi(solutionstring,'da') || strcmpi(solutionstring,'DamageEvolution')
         solutionstring = 'DamageEvolutionSolution';
-elseif strcmpi(solutionstring,'gi') || strcmpi(solutionstring,'GiaSolution') || strcmpi(solutionstring,'Gia')
+elseif strcmpi(solutionstring,'gia') || strcmpi(solutionstring,'Gia')
         solutionstring = 'GiaSolution';
-elseif strcmpi(solutionstring,'sl') || strcmpi(solutionstring,'SealevelriseSolution') || strcmpi(solutionstring,'Sealevelrise')
+elseif strcmpi(solutionstring,'slr') || strcmpi(solutionstring,'Sealevelrise')
         solutionstring = 'SealevelriseSolution';
 else

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

@@ -23 +23 @@
                  - 'Masstransport'    or 'mt'
                  - 'Thermal'          or 'th'
-                 - 'Steadystate'      or 'st'
+                 - 'Steadystate'      or 'ss'
                  - 'Transient'        or 'tr'
                  - 'Balancethickness' or 'mc'
                  - 'Balancevelocity'  or 'bv'
-                 - 'BedSlope'         or 'bs'
-                 - 'SurfaceSlope'     or 'ss'
+                 - 'BedSlope'         or 'bsl'
+                 - 'SurfaceSlope'     or 'ssl'
                  - 'Hydrology'        or 'hy'
                  - 'DamageEvolution'  or 'da'
-                 - 'Gia'              or 'gi'
-                 - 'Sealevelrise'     or 'sl'
+                 - 'Gia'              or 'gia'
+                 - 'Sealevelrise'     or 'slr'
 
            extra options:
@@ -45 +45 @@
 
         #recover and process solve options
-        if solutionstring.lower() == 'sb' or solutionstring.lower() == 'stressbalance' or solutionstring.lower() == 'stressbalancesolution':
+        if solutionstring.lower() == 'sb' or solutionstring.lower() == 'stressbalance'
                 solutionstring = 'StressbalanceSolution';
-        elif solutionstring.lower() == 'mt' or solutionstring.lower() == 'masstransport' or solutionstring.lower() == 'masstransportsolution':
+        elif solutionstring.lower() == 'mt' or solutionstring.lower() == 'masstransport'
                 solutionstring = 'MasstransportSolution';       
-        elif solutionstring.lower() == 'th' or solutionstring.lower() == 'thermal' or solutionstring.lower() == 'thermalsolution':
+        elif solutionstring.lower() == 'th' or solutionstring.lower() == 'thermal'
                 solutionstring = 'ThermalSolution';
-        elif solutionstring.lower() == 'st' or solutionstring.lower() == 'steadystate' or solutionstring.lower() == 'steadystatesolution':
+        elif solutionstring.lower() == 'st' or solutionstring.lower() == 'steadystate'
                 solutionstring = 'SteadystateSolution';
-        elif solutionstring.lower() == 'tr' or solutionstring.lower() == 'transient' or solutionstring.lower() == 'transientsolution':
+        elif solutionstring.lower() == 'tr' or solutionstring.lower() == 'transient'
                 solutionstring = 'TransientSolution';
-        elif solutionstring.lower() == 'mc' or solutionstring.lower() == 'balancethickness' or solutionstring.lower() == 'balancethicknesssolution':
+        elif solutionstring.lower() == 'mc' or solutionstring.lower() == 'balancethickness'
                 solutionstring = 'BalancethicknessSolution';
-        elif solutionstring.lower() == 'bv' or solutionstring.lower() == 'balancevelocity' or solutionstring.lower() == 'balancevelocitysolution':
+        elif solutionstring.lower() == 'bv' or solutionstring.lower() == 'balancevelocity'
                 solutionstring = 'BalancevelocitySolution';
-        elif solutionstring.lower() == 'bs' or solutionstring.lower() == 'bedslope' or solutionstring.lower() == 'bedslopesolution':
+        elif solutionstring.lower() == 'bsl' or solutionstring.lower() == 'bedslope'
                 solutionstring = 'BedSlopeSolution';
-        elif solutionstring.lower() == 'ss' or solutionstring.lower() == 'surfaceslope' or solutionstring.lower() == 'surfaceslopesolution':
+        elif solutionstring.lower() == 'ssl' or solutionstring.lower() == 'surfaceslope'
                 solutionstring = 'SurfaceSlopeSolution';
-        elif solutionstring.lower() == 'hy' or solutionstring.lower() == 'hydrology' or solutionstring.lower() == 'hydrologysolution':
+        elif solutionstring.lower() == 'hy' or solutionstring.lower() == 'hydrology'
                 solutionstring = 'HydrologySolution';
-        elif solutionstring.lower() == 'da' or solutionstring.lower() == 'damageevolution' or solutionstring.lower() == 'damageevolutionsolution':
+        elif solutionstring.lower() == 'da' or solutionstring.lower() == 'damageevolution'
                 solutionstring = 'DamageEvolutionSolution';
-        elif solutionstring.lower() == 'gi' or solutionstring.lower() == 'giasolution' or solutionstring.lower() == 'gia':
+        elif solutionstring.lower() == 'gia' or solutionstring.lower() == 'gia'
                 solutionstring = 'GiaSolution';
-        elif solutionstring.lower() == 'sl' or solutionstring.lower() == 'sealevelrisesolution' or solutionstring.lower() == 'sealevelrise':
+        elif solutionstring.lower() == 'slr' or solutionstring.lower() == 'sealevelrise':
                 solutionstring = 'SealevelriseSolution';
         else: