Changeset 20036 for issm/trunk-jpl/src

Timestamp:

01/30/16 21:55:21 (9 years ago)

Author:

Eric.Larour

Message:

CHG: added requested outputs for slr solution.

Location:

issm/trunk-jpl/src

Files:

• c/analyses/SealevelriseAnalysis.cpp (modified) (2 diffs)
• 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) (7 diffs)
• m/enum/EnumDefinitions.js (modified) (1 diff)
• m/enum/EnumDefinitions.py (modified) (1 diff)
• m/enum/SealevelriseNumRequestedOutputsEnum.m (added)
• m/enum/SealevelriseRequestedOutputsEnum.m (added)

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

@@ -48 +48 @@
         int         M,m,lower_row,upper_row;
         IssmDouble  degacc=.01;
+
+        int     numoutputs;
+        char**  requestedoutputs = NULL;
 
         /*some constant parameters: */
@@ -144 +147 @@
                 xDelete<IssmDouble>(G_elastic_local);
         }
+        
+        /*Requested outputs*/
+        iomodel->FetchData(&requestedoutputs,&numoutputs,SealevelriseRequestedOutputsEnum);
+        parameters->AddObject(new IntParam(SealevelriseNumRequestedOutputsEnum,numoutputs));
+        if(numoutputs)parameters->AddObject(new StringArrayParam(SealevelriseRequestedOutputsEnum,requestedoutputs,numoutputs));
+        iomodel->DeleteData(&requestedoutputs,numoutputs,SealevelriseRequestedOutputsEnum);
+
 
 }/*}}}*/

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

@@ -1049 +1049 @@
         SealevelriseGElasticEnum,
         SealevelriseDegaccEnum,
+        SealevelriseRequestedOutputsEnum,
+        SealevelriseNumRequestedOutputsEnum,
         /*}}}*/
         MaximumNumberOfDefinitionsEnum

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

@@ -1003 +1003 @@
                 case SealevelriseGElasticEnum : return "SealevelriseGElastic";
                 case SealevelriseDegaccEnum : return "SealevelriseDegacc";
+                case SealevelriseRequestedOutputsEnum : return "SealevelriseRequestedOutputs";
+                case SealevelriseNumRequestedOutputsEnum : return "SealevelriseNumRequestedOutputs";
                 case MaximumNumberOfDefinitionsEnum : return "MaximumNumberOfDefinitions";
                 default : return "unknown";

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

@@ -1027 +1027 @@
               else if (strcmp(name,"SealevelriseGElastic")==0) return SealevelriseGElasticEnum;
               else if (strcmp(name,"SealevelriseDegacc")==0) return SealevelriseDegaccEnum;
+              else if (strcmp(name,"SealevelriseRequestedOutputs")==0) return SealevelriseRequestedOutputsEnum;
+              else if (strcmp(name,"SealevelriseNumRequestedOutputs")==0) return SealevelriseNumRequestedOutputsEnum;
               else if (strcmp(name,"MaximumNumberOfDefinitions")==0) return MaximumNumberOfDefinitionsEnum;
          else stage=10;

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

@@ -16 +16 @@
                 eustatic         = 0;
                 degacc         = 0;
+                requested_outputs      = {};
         end
         methods
@@ -43 +44 @@
                 self.degacc=.01;
                 
+                %output default:
+                self.requested_outputs={'default'};
+                
                 end % }}}
                 function md = checkconsistency(self,md,solution,analyses) % {{{
@@ -54 +58 @@
                         md = checkfield(md,'fieldname','slr.maxiter','size',[1 1],'>=',1);
                         md = checkfield(md,'fieldname','slr.degacc','size',[1 1],'>=',1e-10);
+                        md = checkfield(md,'fieldname','slr.requested_outputs','stringrow',1);
 
                         %check that love numbers are provided at the same level of accuracy: 
@@ -60 +65 @@
                         end
 
+                end % }}}
+                function list=defaultoutputs(self,md) % {{{
+                        list = {'SealevelriseS'};
                 end % }}}
                 function disp(self) % {{{
@@ -74 +82 @@
                         fielddisplay(self,'eustatic','eustatic sea level rise');
                         fielddisplay(self,'degacc','accuracy (default .01 deg) for numerical discretization of the Green''s functions');
+                        fielddisplay(self,'requested_outputs','additional outputs requested');
 
                 end % }}}
@@ -87 +96 @@
                         WriteData(fid,'object',self,'class','sealevelrise','fieldname','eustatic','format','Boolean');
                         WriteData(fid,'object',self,'class','sealevelrise','fieldname','degacc','format','Double');
+                        
+                        %process requested outputs
+                        outputs = self.requested_outputs;
+                        pos  = find(ismember(outputs,'default'));
+                        if ~isempty(pos),
+                                outputs(pos) = [];                         %remove 'default' from outputs
+                                outputs      = [outputs defaultoutputs(self,md)]; %add defaults
+                        end
+                        WriteData(fid,'data',outputs,'enum',SealevelriseRequestedOutputsEnum,'format','StringArray');
+
                 end % }}}
                 function savemodeljs(self,fid,modelname) % {{{
@@ -99 +118 @@
                         writejsdouble(fid,[modelname '.slr.eustatic'],self.eustatic);
                         writejsdouble(fid,[modelname '.slr.degacc'],self.degacc);
+                        writejscellstring(fid,[modelname '.slr.requested_outputs'],self.requested_outputs);
 
                 end % }}}

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

@@ -988 +988 @@
 function SealevelriseGElasticEnum(){ return 984;}
 function SealevelriseDegaccEnum(){ return 985;}
-function MaximumNumberOfDefinitionsEnum(){ return 986;}
+function SealevelriseRequestedOutputsEnum(){ return 986;}
+function SealevelriseNumRequestedOutputsEnum(){ return 987;}
+function MaximumNumberOfDefinitionsEnum(){ return 988;}

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

@@ -995 +995 @@
 def SealevelriseGElasticEnum(): return StringToEnum("SealevelriseGElastic")[0]
 def SealevelriseDegaccEnum(): return StringToEnum("SealevelriseDegacc")[0]
+def SealevelriseRequestedOutputsEnum(): return StringToEnum("SealevelriseRequestedOutputs")[0]
+def SealevelriseNumRequestedOutputsEnum(): return StringToEnum("SealevelriseNumRequestedOutputs")[0]
 def MaximumNumberOfDefinitionsEnum(): return StringToEnum("MaximumNumberOfDefinitions")[0]