Changeset 21227

Timestamp:

09/23/16 13:40:39 (9 years ago)

Author:

Eric.Larour

Message:

CHG: adapted solveslm to the new string processing instead of enum based processing.

File:

• issm/trunk-jpl/src/m/solve/solveslm.m (modified) (3 diffs)

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

@@ -1 @@
-function slm=solveslm(slm,solutionstring,varargin)
+function slm=solveslm(slm,solutionstringi,varargin)
 %SOLVESLR - apply solution sequence for this sealevel model
 %
@@ -15 +15 @@
 %      slm=solve(slm,'Transient');
 
-%first check consistency: 
+%recover and process solve options
+if strcmpi(solutionstringi,'tr') || strcmpi(solutionstringi,'Transient')
+        solutionstring = 'TransientSolution';
+elseif strcmpi(solutionstringi,'slr') || strcmpi(solutionstringi,'Sealevelrise')
+        solutionstring = 'SealevelriseSolution';
+else
+        error(['solutionstring ' solutionstringi ' not supported!']);
+end
+
+%check consistency: 
 slm.checkconsistency(solutionstring);
 
-%process options:: 
+%process options 
 options=pairoptions(varargin{:},'solutionstring',solutionstring);
 
@@ -36 +45 @@
 %now, go through icecaps, glacies and earth, and upload all the data independently: 
 for i=1:length(slm.icecaps),
-        slm.icecaps{i}=solve(slm.icecaps{i},solutionstring,'batch','yes');
+        slm.icecaps{i}=solve(slm.icecaps{i},solutionstringi,'batch','yes');
 end
-slm.earth=solve(slm.earth,solutionstring,'batch','yes');
+slm.earth=solve(slm.earth,solutionstringi,'batch','yes');
 
 %Firs, build a runtime name that is unique