Changeset 21069

Timestamp:

08/04/16 08:58:23 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: getting rid of more enums

Location:

issm/trunk-jpl/src/m

Files:

• boundaryconditions/love_numbers.py (modified) (1 diff)
• consistency/ismodelselfconsistent.py (modified) (1 diff)
• coordsystems/gmtmask.py (modified) (1 diff)
• mesh/planet/gmsh/gmshplanet.py (modified) (1 diff)
• miscellaneous/issmdoc.m (modified) (1 diff)
• solve/WriteData.py (modified) (1 diff)
• solve/loadresultsfromdisk.m (modified) (1 diff)
• solve/loadresultsfromdisk.py (modified) (2 diffs)
• solve/marshall.py (modified) (1 diff)
• solve/solve.js (modified) (2 diffs)
• solve/solve.py (modified) (1 diff)
• solve/solveslm.m (modified) (3 diffs)

issm/trunk-jpl/src/m/boundaryconditions/love_numbers.py

@@ -1 +1 @@
 from MatlabFuncs import *
 from model import *
-from EnumDefinitions import *
 from numpy import *
 

issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.py

@@ -1 @@
-from EnumDefinitions import *
-from EnumToString import EnumToString
-
 def AnalysisConfiguration(solutiontype): #{{{
         """

issm/trunk-jpl/src/m/coordsystems/gmtmask.py

@@ -1 +1 @@
 from MatlabFuncs import *
 from model import *
-from EnumDefinitions import *
 from numpy import *
 from os import getenv, putenv

issm/trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.py

@@ -1 +1 @@
 from MatlabFuncs import *
 from model import *
-from EnumDefinitions import *
 from numpy import *
 from pairoptions import *

issm/trunk-jpl/src/m/miscellaneous/issmdoc.m

@@ -12 +12 @@
 disp(sprintf('%-63s %s','       md=parameterize(md,''Square.par'');','%fills all the other fields of the model'));
 disp(sprintf('%-63s %s','       md=setflowequation(md,''SSA'',''all'');','%defines all elements as SSA''s SSA'));
-disp(sprintf('%-63s %s','       md=solve(md,StressbalanceSolutionEnum());','%solve for stress balance'));
+disp(sprintf('%-63s %s','       md=solve(md,''Stressbalance'');','%solve for stress balance'));
 disp(sprintf('%-63s %s','       plotmodel(md,''data'',md.results.StressbalanceSolution.Vel);','%displays the velocity (type plotdoc for plotmodel help)'));

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

@@ -4 +4 @@
 import pairoptions
 import MatlabFuncs as m
-from EnumDefinitions import *
-from EnumToString import EnumToString
 
 def WriteData(fid,prefix,*args):

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

@@ -59 +59 @@
 %post processes qmu results if necessary
 else
-
-        if isscalar(md.private.solution),
-                md.private.solution=EnumToString(md.private.solution);
-        end
         md=postqmu(md);
         cd ..

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

@@ -2 +2 @@
 from results import results
 from parseresultsfromdisk import parseresultsfromdisk
-from EnumToString import EnumToString
 import MatlabFuncs as m
 
@@ -58 +57 @@
         #post processes qmu results if necessary
         else:
-
-                if not isinstance(md.private.solution,(str,unicode)):
-                        md.private.solution=EnumToString(md.private.solution)[0]
                 md=postqmu(md)
                 os.chdir('..')
 
         return md
-

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

@@ -1 +1 @@
 from WriteData import WriteData
-from EnumDefinitions import *
 
 def marshall(md):

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

@@ -70 +70 @@
         var args = Array.prototype.slice.call(arguments);
         var options = new pairoptions(args.slice(2,args.length));
-        options.addfield('solutionenum',solutionenum);
+        options.addfield('solutionstring',solutionstring);
 
         //recover some fields
-        md.priv.solution=solutionenum;
+        md.priv.solution=solutionstring;
         cluster=md.cluster;
 
@@ -83 +83 @@
                 if (solutionstring === 'FlaimSolution'){
                         md.priv.isconsistent=true;
-                        md.mesh.checkconsistency(md,solutionenum);
-                        md.flaim.checkconsistency(md,solutionenum);
+                        md.mesh.checkconsistency(md,solutionstring);
+                        md.flaim.checkconsistency(md,solutionstring);
                         if (md.priv.isconsistent==false){
                                 throw error('solve error message: model not consistent, see messages above');

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

@@ -3 +3 @@
 import shutil
 from pairoptions import pairoptions
-from EnumDefinitions import *
-from EnumToString import EnumToString
 from ismodelselfconsistent import ismodelselfconsistent
 from marshall import marshall

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

@@ -1 @@
-function slm=solveslm(slm,solutionenum,varargin)
+function slm=solveslm(slm,solutionstring,varargin)
 %SOLVESLR - apply solution sequence for this sealevel model
 %
 %   Usage:
-%      slm=solve(slm,solutionenum,varargin)
+%      slm=solve(slm,solutionstring,varargin)
 %      where varargin is a lit of paired arguments of string OR enums
 %
 %   solution types available comprise:
-%                - SealevelriseSolutionEnum
-%                - TransientSolutionEnum
+%                - 'Sealevelrise'
+%                - 'Transient'
 %
 %  extra options:
 %
 %   Examples:
-%      slm=solve(slm,TransientSolutionEnum);
+%      slm=solve(slm,'Transient');
 
 %first check consistency: 
-slm.checkconsistency(solutionenum);
+slm.checkconsistency(solutionstring);
 
 %process options:: 
-options=pairoptions(varargin{:},'solutionenum',solutionenum);
+options=pairoptions(varargin{:},'solutionstring',solutionstring);
 
 %figure out if the sum of cluster processors requested sums up correctly: 
@@ -30 +30 @@
 
 %recover some fields
-slm.private.solution=solutionenum;
+slm.private.solution=solutionstring;
 cluster=slm.cluster;
 batch=0;
@@ -36 +36 @@
 %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},solutionenum,'batch','yes');
+        slm.icecaps{i}=solve(slm.icecaps{i},solutionstring,'batch','yes');
 end
-slm.earth=solve(slm.earth,solutionenum,'batch','yes');
+slm.earth=solve(slm.earth,solutionstring,'batch','yes');
 
 %Firs, build a runtime name that is unique