Changeset 20154

Timestamp:

02/13/16 13:23:14 (9 years ago)

Author:

Eric.Larour

Message:

CHG: renamed SealevelriseS to Sealevel.

Location:

issm/trunk-jpl/src

Files:

• c/analyses/SealevelriseAnalysis.cpp (modified) (2 diffs)
• c/classes/Elements/Element.cpp (modified) (1 diff)
• c/cores/sealevelrise_core.cpp (modified) (1 diff)
• c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• c/shared/Enum/StringToEnumx.cpp (modified) (1 diff)
• m/classes/slr.m (modified) (6 diffs)
• m/enum/EnumDefinitions.js (modified) (1 diff)
• m/enum/EnumDefinitions.py (modified) (1 diff)
• m/enum/SealevelEnum.m (added)
• m/enum/SealevelriseSEnum.m (deleted)

issm/trunk-jpl/src/c/analyses/SealevelriseAnalysis.cpp

@@ -196 +196 @@
 
         S = xNew<IssmDouble>(numvertices);
-        element->GetInputListOnVertices(S,SealevelriseSEnum,0);
+        element->GetInputListOnVertices(S,SealevelEnum,0);
 
         /*Add deltaS to S:*/
@@ -202 +202 @@
 
         /*Add S back into inputs: */
-        element->AddInput(SealevelriseSEnum,S,P1Enum);
+        element->AddInput(SealevelEnum,S,P1Enum);
 
         /*Free ressources:*/

issm/trunk-jpl/src/c/classes/Elements/Element.cpp

@@ -1530 +1530 @@
                                 name==MaterialsRheologyBbarEnum ||
                                 name==MaterialsRheologyNEnum ||
-                                name==SealevelriseSEnum || 
+                                name==SealevelEnum || 
                                 name==SealevelriseDeltathicknessEnum || 
                                 name==GiaWEnum || 

issm/trunk-jpl/src/c/cores/sealevelrise_core.cpp

@@ -76 +76 @@
 
         /*transfer sea-level back to ice caps: */
-        if(iscoupler)TransferSealevel(femmodel,SealevelriseSEnum);
+        if(iscoupler)TransferSealevel(femmodel,SealevelEnum);
 } 
 /*}}}*/

issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

@@ -1052 +1052 @@
         SealevelriseSolutionEnum,
         SealevelriseAnalysisEnum,
-        SealevelriseSEnum,
+        SealevelEnum,
         SealevelriseDeltathicknessEnum,
         SealevelriseMaxiterEnum,

issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

@@ -1004 +1004 @@
                 case SealevelriseSolutionEnum : return "SealevelriseSolution";
                 case SealevelriseAnalysisEnum : return "SealevelriseAnalysis";
-                case SealevelriseSEnum : return "SealevelriseS";
+                case SealevelEnum : return "Sealevel";
                 case SealevelriseDeltathicknessEnum : return "SealevelriseDeltathickness";
                 case SealevelriseMaxiterEnum : return "SealevelriseMaxiter";

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

@@ -1028 +1028 @@
               else if (strcmp(name,"SealevelriseSolution")==0) return SealevelriseSolutionEnum;
               else if (strcmp(name,"SealevelriseAnalysis")==0) return SealevelriseAnalysisEnum;
-              else if (strcmp(name,"SealevelriseS")==0) return SealevelriseSEnum;
+              else if (strcmp(name,"Sealevel")==0) return SealevelEnum;
               else if (strcmp(name,"SealevelriseDeltathickness")==0) return SealevelriseDeltathicknessEnum;
               else if (strcmp(name,"SealevelriseMaxiter")==0) return SealevelriseMaxiterEnum;

issm/trunk-jpl/src/m/classes/slr.m

@@ -7 +7 @@
         properties (SetAccess=public) 
                 deltathickness = NaN;
+                sealevel       = NaN; 
                 maxiter        = 0;
                 reltol         = 0;
@@ -56 +57 @@
                         if ~ismember(SealevelriseAnalysisEnum(),analyses), return; end
                         md = checkfield(md,'fieldname','slr.deltathickness','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
+                        md = checkfield(md,'fieldname','slr.sealevel','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
                         md = checkfield(md,'fieldname','slr.love_h','NaN',1,'Inf',1);
                         md = checkfield(md,'fieldname','slr.love_k','NaN',1,'Inf',1);
@@ -71 +73 @@
                 end % }}}
                 function list=defaultoutputs(self,md) % {{{
-                        list = {'SealevelriseS'};
+                        list = {'Sealevel'};
                 end % }}}
                 function disp(self) % {{{
@@ -77 +79 @@
 
                         fielddisplay(self,'deltathickness','thickness change (main loading of the slr solution core [m]');
+                        fielddisplay(self,'sealevel','current sea level (prior to computation) [m]');
                         fielddisplay(self,'reltol','sea level rise relative convergence criterion, (default, NaN: not applied)');
                         fielddisplay(self,'abstol','sea level rise absolute convergence criterion, NaN: not applied');
@@ -92 +95 @@
                 function marshall(self,md,fid) % {{{
                         WriteData(fid,'object',self,'class','sealevelrise','fieldname','deltathickness','format','DoubleMat','mattype',1);
+                        WriteData(fid,'data',self.sealevel,'enum',SealevelEnum(),'format','DoubleMat','mattype',1);
                         WriteData(fid,'object',self,'class','sealevelrise','fieldname','reltol','format','Double');
                         WriteData(fid,'object',self,'class','sealevelrise','fieldname','abstol','format','Double');
@@ -117 +121 @@
                 
                         writejs1Darray(fid,[modelname '.srl.deltathickness'],self.deltathickness);
+                        writejs1Darray(fid,[modelname '.srl.sealevel'],self.sealevel);
                         writejsdouble(fid,[modelname '.slr.reltol'],self.reltol);
                         writejsdouble(fid,[modelname '.slr.abstol'],self.abstol);

issm/trunk-jpl/src/m/enum/EnumDefinitions.js

@@ -989 +989 @@
 function SealevelriseSolutionEnum(){ return 985;}
 function SealevelriseAnalysisEnum(){ return 986;}
-function SealevelriseSEnum(){ return 987;}
+function SealevelEnum(){ return 987;}
 function SealevelriseDeltathicknessEnum(){ return 988;}
 function SealevelriseMaxiterEnum(){ return 989;}

issm/trunk-jpl/src/m/enum/EnumDefinitions.py

@@ -996 +996 @@
 def SealevelriseSolutionEnum(): return StringToEnum("SealevelriseSolution")[0]
 def SealevelriseAnalysisEnum(): return StringToEnum("SealevelriseAnalysis")[0]
-def SealevelriseSEnum(): return StringToEnum("SealevelriseS")[0]
+def SealevelEnum(): return StringToEnum("Sealevel")[0]
 def SealevelriseDeltathicknessEnum(): return StringToEnum("SealevelriseDeltathickness")[0]
 def SealevelriseMaxiterEnum(): return StringToEnum("SealevelriseMaxiter")[0]