Changeset 16363

Timestamp:

10/10/13 09:55:10 (11 years ago)

Author:

Eric.Larour

Message:

CHG: changing requested outputs from enums to strings

Location:

issm/trunk-jpl

Files:

• src/c/analyses/masstransport_core.cpp (modified) (2 diffs)
• src/c/analyses/steadystate_core.cpp (modified) (3 diffs)
• src/c/analyses/stressbalance_core.cpp (modified) (2 diffs)
• src/c/analyses/transient_core.cpp (modified) (3 diffs)
• src/c/classes/FemModel.cpp (modified) (2 diffs)
• src/c/classes/FemModel.h (modified) (1 diff)
• src/c/classes/IoModel.cpp (modified) (1 diff)
• src/c/classes/IoModel.h (modified) (1 diff)
• src/c/modules/ModelProcessorx/CreateParameters.cpp (modified) (2 diffs)
• src/c/modules/ModelProcessorx/Stressbalance/CreateParametersStressbalance.cpp (modified) (2 diffs)
• src/m/classes/masstransport.m (modified) (3 diffs)
• src/m/classes/masstransport.py (modified) (3 diffs)
• src/m/classes/snowpack.m (modified) (1 diff)
• src/m/classes/steadystate.m (modified) (2 diffs)
• src/m/classes/steadystate.py (modified) (2 diffs)
• src/m/classes/stressbalance.m (modified) (3 diffs)
• src/m/classes/stressbalance.py (modified) (3 diffs)
• src/m/classes/transient.m (modified) (3 diffs)
• src/m/classes/transient.py (modified) (3 diffs)
• test/NightlyRun/android.m (modified) (1 diff)
• test/NightlyRun/test101.m (modified) (1 diff)
• test/NightlyRun/test101.py (modified) (1 diff)
• test/NightlyRun/test103.m (modified) (1 diff)
• test/NightlyRun/test103.py (modified) (1 diff)
• test/NightlyRun/test110.m (modified) (1 diff)
• test/NightlyRun/test110.py (modified) (1 diff)
• test/NightlyRun/test111.m (modified) (1 diff)
• test/NightlyRun/test111.py (modified) (1 diff)
• test/NightlyRun/test234.m (modified) (1 diff)
• test/NightlyRun/test235.m (modified) (1 diff)
• test/NightlyRun/test3001.m (modified) (1 diff)
• test/NightlyRun/test3001.py (modified) (1 diff)
• test/NightlyRun/test3003.m (modified) (1 diff)
• test/NightlyRun/test3003.py (modified) (1 diff)
• test/NightlyRun/test3010.m (modified) (1 diff)
• test/NightlyRun/test3010.py (modified) (1 diff)
• test/NightlyRun/test3015.m (modified) (1 diff)
• test/NightlyRun/test3015.py (modified) (1 diff)
• test/NightlyRun/test3020.m (modified) (1 diff)
• test/NightlyRun/test3020.py (modified) (1 diff)
• test/NightlyRun/test3021.m (modified) (1 diff)
• test/NightlyRun/test3101.m (modified) (1 diff)
• test/NightlyRun/test3101.py (modified) (1 diff)
• test/NightlyRun/test3103.m (modified) (1 diff)
• test/NightlyRun/test3103.py (modified) (1 diff)
• test/NightlyRun/test3110.m (modified) (1 diff)
• test/NightlyRun/test3110.py (modified) (1 diff)
• test/NightlyRun/test328.m (modified) (1 diff)
• test/NightlyRun/test328.py (modified) (1 diff)
• test/NightlyRun/test329.m (modified) (1 diff)
• test/NightlyRun/test329.py (modified) (1 diff)
• test/NightlyRun/test424.m (modified) (1 diff)
• test/NightlyRun/test424.py (modified) (1 diff)
• test/NightlyRun/test426.m (modified) (1 diff)
• test/NightlyRun/test426.py (modified) (1 diff)

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

@@ -13 +13 @@
 
         /*parameters: */
+        int   i;
         bool  save_results;
         bool  issmbgradients,ispdd,isdelta18o,isFS,isfreesurface,dakota_analysis;
         int   solution_type;
-        int  *requested_outputs = NULL;
+        char** requested_outputs = NULL;
         int   numoutputs        = 0;
 
@@ -77 +78 @@
 
         /*Free ressources:*/
-        xDelete<int>(requested_outputs);
+        if(numoutputs){ for (i=0;i<numoutputs;i++){char* string=requested_outputs[i];xDelete<char>(string);} xDelete<char*>(requested_outputs);} 
 }

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

@@ -21 +21 @@
 
         /*intermediary: */
+        int i;
         int step; 
         Vector<IssmDouble>* ug     = NULL;
@@ -32 +33 @@
         IssmDouble  reltol;
         int         numoutputs        = 0;
-        int        *requested_outputs = NULL;
+        char**      requested_outputs = NULL;
 
         /* recover parameters:*/
@@ -102 +103 @@
         delete ug_old;
         delete tg;
-        delete ug;
-        xDelete<int>(requested_outputs);
+        delete ug;      
+        if(numoutputs){ for (i=0;i<numoutputs;i++){char* string=requested_outputs[i];xDelete<char>(string);} xDelete<char*>(requested_outputs);}
 }
 bool steadystateconvergence(Vector<IssmDouble>* tg,Vector<IssmDouble>* tg_old,Vector<IssmDouble>* ug,Vector<IssmDouble>* ug_old,IssmDouble reltol){

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

@@ -21 +21 @@
         int   solution_type;
         int   numoutputs        = 0;
-        int  *requested_outputs = NULL;
+        char** requested_outputs = NULL;
+        int    i;
+
 
         /* recover parameters:*/
@@ -96 +98 @@
         if(solution_type==StressbalanceSolutionEnum)femmodel->RequestedDependentsx();
 
-        /*Free ressources:*/
-        xDelete<int>(requested_outputs);
+        /*Free ressources:*/    
+        if(numoutputs){ for (i=0;i<numoutputs;i++){char* string=requested_outputs[i];xDelete<char>(string);} xDelete<char*>(requested_outputs);}
 }

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

@@ -20 +20 @@
 
         /*parameters: */
+        int    i;
         IssmDouble starttime,finaltime,dt,yts;
         bool   isstressbalance,ismasstransport,isFS,isthermal,isgroundingline,isenthalpy,isdelta18o,isgia;
@@ -27 +28 @@
         int    meshtype,groundingline_migration;
         int    numoutputs         = 0;
-        int   *requested_outputs = NULL;
+        char** requested_outputs = NULL;
+
 
         /*intermediary: */
@@ -184 +186 @@
         femmodel->RequestedDependentsx();
 
-        /*Free ressources:*/
-        xDelete<int>(requested_outputs);
+        /*Free ressources:*/    
+        if(numoutputs){ for (i=0;i<numoutputs;i++){char* string=requested_outputs[i];xDelete<char>(string);} xDelete<char*>(requested_outputs);}
 }

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -470 +470 @@
 }
 /*}}}*/
-void FemModel::RequestedOutputsx(int* requested_outputs, int numoutputs){/*{{{*/
-
-        int      output_enum;
+void FemModel::RequestedOutputsx(char** requested_outputs, int numoutputs){/*{{{*/
+
+        char*    output_string;
         int      step;
         IssmDouble   time;
@@ -485 +485 @@
         if(numoutputs){
                 for(int i=0;i<numoutputs;i++){
-                        output_enum=requested_outputs[i];
-
-                        switch(output_enum){
-
-                                case IceVolumeEnum:
-                                        Responsex(&output_value,"IceVolume");
-                                        results->AddObject(new GenericExternalResult<double>(results->Size()+1,IceVolumeEnum,reCast<IssmPDouble>(output_value),step,time));
-                                        break;
-                                case IceVolumeAboveFloatationEnum:
-                                        Responsex(&output_value,"IceVolumeAboveFloatation");
-                                        results->AddObject(new GenericExternalResult<double>(results->Size()+1,IceVolumeAboveFloatationEnum,reCast<IssmPDouble>(output_value),step,time));
-                                        break;
-                                case TotalSmbEnum:
-                                        Responsex(&output_value,"TotalSmb");
-                                        results->AddObject(new GenericExternalResult<double>(results->Size()+1,TotalSmbEnum,reCast<IssmPDouble>(output_value),step,time));
-                                        break;
-                                case MaxVelEnum:
-                                        Responsex(&output_value,"MaxVel");
-                                        results->AddObject(new GenericExternalResult<double>(results->Size()+1,MaxVelEnum,reCast<IssmPDouble>(output_value),step,time));
-                                        break;
-                                default:
-                                        /*create this output in the element inputs, and then transfer to results:*/
-                                        for(int j=0;j<elements->Size();j++){
-                                                element=(Element*)elements->GetObjectByOffset(j);
-                                                element->RequestedOutput(output_enum,step,time);
-                                        }
-                                        break;
+                        output_string=requested_outputs[i];
+
+                        if (strcmp(output_string,"IceVolume")==0){
+                                Responsex(&output_value,output_string);
+                                results->AddObject(new GenericExternalResult<double>(results->Size()+1,IceVolumeEnum,reCast<IssmPDouble>(output_value),step,time));
+
+                        }
+                        else if (strcmp(output_string,"TotalSmb")==0){
+                                Responsex(&output_value,output_string);
+                                results->AddObject(new GenericExternalResult<double>(results->Size()+1,TotalSmbEnum,reCast<IssmPDouble>(output_value),step,time));
+                        }
+                        else if (strcmp(output_string,"MaxVel")==0){
+                                Responsex(&output_value,output_string);
+                                results->AddObject(new GenericExternalResult<double>(results->Size()+1,MaxVelEnum,reCast<IssmPDouble>(output_value),step,time));
+                        }
+                        else{
+                                /*create this output in the element inputs, and then transfer to results:*/
+                                for(int j=0;j<elements->Size();j++){
+                                        element=(Element*)elements->GetObjectByOffset(j);
+                                        element->RequestedOutput(StringToEnumx(output_string),step,time);
+                                }
                         }
                 }

issm/trunk-jpl/src/c/classes/FemModel.h

@@ -82 +82 @@
                 void DakotaResponsesx(double* d_responses,char** responses_descriptors,int numresponsedescriptors,int d_numresponses);
                 #endif
-                void RequestedOutputsx(int* requested_outputs, int numoutputs);
+                void RequestedOutputsx(char** requested_outputs, int numoutputs);
                 void RequestedDependentsx(void);
                 void Responsex(IssmDouble* presponse,int response_descriptor_enum);

issm/trunk-jpl/src/c/classes/IoModel.cpp

@@ -339 +339 @@
         if(vector)if (!this->independents[dataenum]) xDelete<IssmDouble>(vector);
 
+} /*}}}*/
+/*FUNCTION IoModel::DeleteData(char*** pstringarray, int numstrings, int dataenum) {{{*/
+void  IoModel::DeleteData(char*** pstringarray, int numstrings, int dataenum){
+
+        int i;
+        char** stringarray=*pstringarray;
+        
+        if (numstrings){
+                for (i=0;i<numstrings;i++){
+                        char* string=stringarray[i]; 
+                        xDelete<char>(string);
+                }
+                xDelete<char*>(stringarray);
+        }
+        *pstringarray=NULL;
 } /*}}}*/
 /*FUNCTION IoModel::FetchConstants{{{*/

issm/trunk-jpl/src/c/classes/IoModel.h

@@ -67 +67 @@
                 void        DeleteData(int num,...);
                 void        DeleteData(IssmDouble* vector, int dataenum);
+                void        DeleteData(char*** pstringarray, int numstrings, int dataenum);
                 void        FetchConstants(void);
                 void        FetchData(bool* pboolean,int data_enum);

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp

@@ -21 +21 @@
         int         numoutputs,meshtype;
         Parameters *parameters       = NULL;
-        IssmDouble *requestedoutputs = NULL;
+        char**      requestedoutputs = NULL;
         IssmDouble  time;
         bool        ispdd,isdelta18o;
@@ -136 +136 @@
         parameters->AddObject(new BoolParam(SaveResultsEnum,true));
 
-        iomodel->FetchData(&requestedoutputs,&numoutputs,NULL,TransientRequestedOutputsEnum);
+        /*Requested outputs */
+        iomodel->FetchData(&requestedoutputs,&numoutputs,TransientRequestedOutputsEnum);
         parameters->AddObject(new IntParam(TransientNumRequestedOutputsEnum,numoutputs));
-        if(numoutputs)parameters->AddObject(new IntVecParam(TransientRequestedOutputsEnum,requestedoutputs,numoutputs));
-        iomodel->DeleteData(requestedoutputs,TransientRequestedOutputsEnum);
-
-        iomodel->FetchData(&requestedoutputs,&numoutputs,NULL,SteadystateRequestedOutputsEnum);
+        if(numoutputs)parameters->AddObject(new StringArrayParam(TransientRequestedOutputsEnum,requestedoutputs,numoutputs));
+        iomodel->DeleteData(&requestedoutputs,numoutputs,TransientRequestedOutputsEnum);
+
+        iomodel->FetchData(&requestedoutputs,&numoutputs,SteadystateRequestedOutputsEnum);
         parameters->AddObject(new IntParam(SteadystateNumRequestedOutputsEnum,numoutputs));
-        if(numoutputs)parameters->AddObject(new IntVecParam(SteadystateRequestedOutputsEnum,requestedoutputs,numoutputs));
-        iomodel->DeleteData(requestedoutputs,SteadystateRequestedOutputsEnum);
-
-        iomodel->FetchData(&requestedoutputs,&numoutputs,NULL,MasstransportRequestedOutputsEnum);
+        if(numoutputs)parameters->AddObject(new StringArrayParam(SteadystateRequestedOutputsEnum,requestedoutputs,numoutputs));
+        iomodel->DeleteData(&requestedoutputs,numoutputs,SteadystateRequestedOutputsEnum);
+
+        iomodel->FetchData(&requestedoutputs,&numoutputs,MasstransportRequestedOutputsEnum);
         parameters->AddObject(new IntParam(MasstransportNumRequestedOutputsEnum,numoutputs));
-        if(numoutputs)parameters->AddObject(new IntVecParam(MasstransportRequestedOutputsEnum,requestedoutputs,numoutputs));
-        iomodel->DeleteData(requestedoutputs,MasstransportRequestedOutputsEnum);
+        if(numoutputs)parameters->AddObject(new StringArrayParam(MasstransportRequestedOutputsEnum,requestedoutputs,numoutputs));
+        iomodel->DeleteData(&requestedoutputs,numoutputs,MasstransportRequestedOutputsEnum);
 
         /*Deal with mass flux segments: {{{*/

issm/trunk-jpl/src/c/modules/ModelProcessorx/Stressbalance/CreateParametersStressbalance.cpp

@@ -12 +12 @@
         /*Intermediaries*/
         int         numoutputs;
-        IssmDouble *requestedoutputs = NULL;
+        char**      requestedoutputs = NULL;
 
         /*Get parameters: */
@@ -35 +35 @@
 
         /*Requested outputs*/
-        iomodel->FetchData(&requestedoutputs,&numoutputs,NULL,StressbalanceRequestedOutputsEnum);
+        iomodel->FetchData(&requestedoutputs,&numoutputs,StressbalanceRequestedOutputsEnum);
         parameters->AddObject(new IntParam(StressbalanceNumRequestedOutputsEnum,numoutputs));
-        if(numoutputs)parameters->AddObject(new IntVecParam(StressbalanceRequestedOutputsEnum,requestedoutputs,numoutputs));
-        iomodel->DeleteData(requestedoutputs,StressbalanceRequestedOutputsEnum);
+        if(numoutputs)parameters->AddObject(new StringArrayParam(StressbalanceRequestedOutputsEnum,requestedoutputs,numoutputs));
+        iomodel->DeleteData(&requestedoutputs,numoutputs,StressbalanceRequestedOutputsEnum);
 
         /*Assign output pointer: */

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

@@ -13 +13 @@
                  vertex_pairing         = NaN;
                  penalty_factor         = 0;
-                 requested_outputs      = NaN;
+                 requested_outputs      = {};
         end
         methods (Static)
@@ -85 +85 @@
                         md = checkfield(md,'masstransport.min_thickness','>',0);
                         if ~isempty(md.masstransport.requested_outputs),
-                                md = checkfield(md,'masstransport.requested_outputs','size',[NaN 1]);
+                                md = checkfield(md,'masstransport.requested_outputs','size',[1 NaN]);
                         end
 
@@ -111 +111 @@
                         WriteData(fid,'object',obj,'fieldname','vertex_pairing','format','DoubleMat','mattype',3);
                         WriteData(fid,'object',obj,'fieldname','penalty_factor','format','Double');
-                        WriteData(fid,'object',obj,'fieldname','requested_outputs','format','DoubleMat','mattype',3);
+                        WriteData(fid,'object',obj,'fieldname','requested_outputs','format','StringArray');
                 end % }}}
         end

issm/trunk-jpl/src/m/classes/masstransport.py

@@ -21 +21 @@
                 self.vertex_pairing         = float('NaN')
                 self.penalty_factor         = 0
-                self.requested_outputs      = float('NaN')
+                self.requested_outputs      = []
 
                 #set defaults
@@ -66 +66 @@
                 md = checkfield(md,'masstransport.min_thickness','>',0)
                 if not md.masstransport.requested_outputs:
-                        md = checkfield(md,'masstransport.requested_outputs','size',[float('NaN'),1])
+                        md = checkfield(md,'masstransport.requested_outputs','size',[1, float('NaN')])
 
                 return md
@@ -78 +78 @@
                 WriteData(fid,'object',self,'fieldname','vertex_pairing','format','DoubleMat','mattype',3)
                 WriteData(fid,'object',self,'fieldname','penalty_factor','format','Double')
-                WriteData(fid,'object',self,'fieldname','requested_outputs','format','DoubleMat','mattype',3);
+                WriteData(fid,'object',self,'fieldname','requested_outputs','format','StringArray');
         # }}}

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

@@ -471 +471 @@
                         WriteData(fid,'object',obj,'class','snowpack','fieldname','rift_penalty_threshold','format','Integer');
                         WriteData(fid,'object',obj,'class','snowpack','fieldname','referential','format','DoubleMat','mattype',1);
-                        WriteData(fid,'object',obj,'class','snowpack','fieldname','requested_outputs','format','DoubleMat','mattype',3);
+                        WriteData(fid,'object',obj,'class','snowpack','fieldname','requested_outputs','format','StringArray');
                         WriteData(fid,'data',obj.loadingforce(:,1),'format','DoubleMat','mattype',1,'enum',LoadingforceXEnum);
                         WriteData(fid,'data',obj.loadingforce(:,2),'format','DoubleMat','mattype',1,'enum',LoadingforceYEnum);

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

@@ -8 +8 @@
                 reltol            = 0;
                 maxiter           = 0;
-                requested_outputs = NaN;
+                requested_outputs = {};
         end
         methods
@@ -50 +50 @@
                         WriteData(fid,'object',obj,'fieldname','reltol','format','Double');
                         WriteData(fid,'object',obj,'fieldname','maxiter','format','Integer');
-                        WriteData(fid,'object',obj,'fieldname','requested_outputs','format','DoubleMat','mattype',3);
+                        WriteData(fid,'object',obj,'fieldname','requested_outputs','format','StringArray');
                 end % }}}
         end

issm/trunk-jpl/src/m/classes/steadystate.py

@@ -16 +16 @@
                 self.reltol            = 0
                 self.maxiter           = 0
-                self.requested_outputs = float('NaN')
+                self.requested_outputs = []
 
                 #set defaults
@@ -56 +56 @@
                 WriteData(fid,'object',self,'fieldname','reltol','format','Double')
                 WriteData(fid,'object',self,'fieldname','maxiter','format','Integer')
-                WriteData(fid,'object',self,'fieldname','requested_outputs','format','DoubleMat','mattype',3)
+                WriteData(fid,'object',self,'fieldname','requested_outputs','format','StringArray')
         # }}}

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

@@ -23 +23 @@
                 referential            = NaN;
                 loadingforce           = NaN;
-                requested_outputs      = NaN;
+                requested_outputs      = {};
         end
         methods
@@ -92 +92 @@
                         md = checkfield(md,'stressbalance.loadingforce','size',[md.mesh.numberofvertices 3]);
                         if ~isempty(md.stressbalance.requested_outputs),
-                                md = checkfield(md,'stressbalance.requested_outputs','size',[NaN 1]);
+                                md = checkfield(md,'stressbalance.requested_outputs','size',[1 NaN]);
                         end
 
@@ -172 +172 @@
                         WriteData(fid,'object',obj,'class','stressbalance','fieldname','rift_penalty_threshold','format','Integer');
                         WriteData(fid,'object',obj,'class','stressbalance','fieldname','referential','format','DoubleMat','mattype',1);
-                        WriteData(fid,'object',obj,'class','stressbalance','fieldname','requested_outputs','format','DoubleMat','mattype',3);
+                        WriteData(fid,'object',obj,'class','stressbalance','fieldname','requested_outputs','format','StringArray');
                         WriteData(fid,'data',obj.loadingforce(:,1),'format','DoubleMat','mattype',1,'enum',LoadingforceXEnum);
                         WriteData(fid,'data',obj.loadingforce(:,2),'format','DoubleMat','mattype',1,'enum',LoadingforceYEnum);

issm/trunk-jpl/src/m/classes/stressbalance.py

@@ -34 +34 @@
                 self.referential              = float('NaN')
                 self.loadingforce             = float('NaN')
-                self.requested_outputs        = float('NaN')
+                self.requested_outputs        = []
 
                 #set defaults
@@ -124 +124 @@
                 md = checkfield(md,'stressbalance.loadingforce','size',[md.mesh.numberofvertices,3])
                 if not md.stressbalance.requested_outputs:
-                        md = checkfield(md,'stressbalance.requested_outputs','size',[float('NaN'),1])
+                        md = checkfield(md,'stressbalance.requested_outputs','size',[1, float('NaN')])
 
                 #singular solution
@@ -172 +172 @@
                 WriteData(fid,'object',self,'class','stressbalance','fieldname','rift_penalty_threshold','format','Integer')
                 WriteData(fid,'object',self,'class','stressbalance','fieldname','referential','format','DoubleMat','mattype',1)
-                WriteData(fid,'object',self,'class','stressbalance','fieldname','requested_outputs','format','DoubleMat','mattype',3)
+                WriteData(fid,'object',self,'class','stressbalance','fieldname','requested_outputs','format','StringArray')
                 WriteData(fid,'data',self.loadingforce[:,0],'format','DoubleMat','mattype',1,'enum',LoadingforceXEnum())
                 WriteData(fid,'data',self.loadingforce[:,1],'format','DoubleMat','mattype',1,'enum',LoadingforceYEnum())

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

@@ -12 +12 @@
                 isgia             = 0;
                 isdamage             = 0;
-                requested_outputs = NaN;
+                requested_outputs = {};
         end
         methods
@@ -45 +45 @@
                         md = checkfield(md,'transient.isgia','numel',[1],'values',[0 1]);
                         md = checkfield(md,'transient.isdamage','numel',[1],'values',[0 1]);
-                        md = checkfield(md,'transient.requested_outputs','size',[NaN 1]);
+                        md = checkfield(md,'transient.requested_outputs','size',[1 NaN]);
 
                 end % }}}
@@ -67 +67 @@
                         WriteData(fid,'object',obj,'fieldname','isgia','format','Boolean');
                         WriteData(fid,'object',obj,'fieldname','isdamage','format','Boolean');
-                        WriteData(fid,'object',obj,'fieldname','requested_outputs','format','DoubleMat','mattype',3);
+                        WriteData(fid,'object',obj,'fieldname','requested_outputs','format','StringArray');
                 end % }}}
         end

issm/trunk-jpl/src/m/classes/transient.py

@@ -18 +18 @@
                 self.isgroundingline   = False
                 self.isgia             = False
-                self.requested_outputs = float('NaN')
+                self.requested_outputs = []
 
                 #set defaults
@@ -56 +56 @@
                 md = checkfield(md,'transient.isgroundingline','numel',[1],'values',[0,1])
                 md = checkfield(md,'transient.isgia','numel',[1],'values',[0,1])
-                md = checkfield(md,'transient.requested_outputs','size',[float('NaN')])
+                md = checkfield(md,'transient.requested_outputs','size',[1, float('NaN')])
 
 
@@ -67 +67 @@
                 WriteData(fid,'object',self,'fieldname','isgroundingline','format','Boolean')
                 WriteData(fid,'object',self,'fieldname','isgia','format','Boolean')
-                WriteData(fid,'object',self,'fieldname','requested_outputs','format','DoubleMat','mattype',3)
+                WriteData(fid,'object',self,'fieldname','requested_outputs','format','StringArray')
         # }}}
 

issm/trunk-jpl/test/NightlyRun/android.m

@@ -5 +5 @@
 md.cluster=generic('name',oshostname(),'np',3);
 md.verbose=verbose('mprocessor',true,'module',true,'solution',true,'solver',true,'convergence',true,'control',true,'qmu',true,'autodiff',true);
-md.stressbalance.requested_outputs=StressTensorEnum();
+md.stressbalance.requested_outputs={'StressTensor'};
 md=solve(md,StressbalanceSolutionEnum());
 

issm/trunk-jpl/test/NightlyRun/test101.m

@@ -4 +4 @@
 md=setflowequation(md,'SSA','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md.stressbalance.requested_outputs=StressTensorEnum();
+md.stressbalance.requested_outputs={'StressTensor'};
+md.verbose=verbose('11111111');
 md=solve(md,StressbalanceSolutionEnum());
 

issm/trunk-jpl/test/NightlyRun/test101.py

@@ -13 +13 @@
 md=setflowequation(md,'SSA','all')
 md.cluster=generic('name',oshostname(),'np',3)
-md.stressbalance.requested_outputs=StressTensorEnum()
+md.stressbalance.requested_outputs=['StressTensor']
 md=solve(md,StressbalanceSolutionEnum())
 

issm/trunk-jpl/test/NightlyRun/test103.m

@@ -5 +5 @@
 md=setflowequation(md,'HO','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md.stressbalance.requested_outputs=StressTensorEnum();
+md.stressbalance.requested_outputs={'StressTensor'};
 md=solve(md,StressbalanceSolutionEnum());
 

issm/trunk-jpl/test/NightlyRun/test103.py

@@ -14 +14 @@
 md=setflowequation(md,'HO','all')
 md.cluster=generic('name',oshostname(),'np',3)
-md.stressbalance.requested_outputs=StressTensorEnum()
+md.stressbalance.requested_outputs=['StressTensor']
 md=solve(md,StressbalanceSolutionEnum())
 

issm/trunk-jpl/test/NightlyRun/test110.m

@@ -4 +4 @@
 md=setflowequation(md,'SSA','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md.transient.requested_outputs=IceVolumeEnum();
+md.transient.requested_outputs={'IceVolume'};
 
 md=solve(md,TransientSolutionEnum());

issm/trunk-jpl/test/NightlyRun/test110.py

@@ -13 +13 @@
 md=setflowequation(md,'SSA','all')
 md.cluster=generic('name',oshostname(),'np',3)
-md.transient.requested_outputs=IceVolumeEnum()
+md.transient.requested_outputs=['IceVolume']
 
 md=solve(md,TransientSolutionEnum())

issm/trunk-jpl/test/NightlyRun/test111.m

@@ -5 +5 @@
 md=setflowequation(md,'HO','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md.transient.requested_outputs=IceVolumeEnum();
+md.transient.requested_outputs={'IceVolume'};
 md=solve(md,TransientSolutionEnum());
 

issm/trunk-jpl/test/NightlyRun/test111.py

@@ -14 +14 @@
 md=setflowequation(md,'HO','all')
 md.cluster=generic('name',oshostname(),'np',3)
-md.transient.requested_outputs=IceVolumeEnum()
+md.transient.requested_outputs=['IceVolume']
 md=solve(md,TransientSolutionEnum())
 

issm/trunk-jpl/test/NightlyRun/test234.m

@@ -57 +57 @@
 
 md.stressbalance.reltol=10^-5; %tighten for qmu analyses
-md.transient.requested_outputs=IceVolumeEnum();
+md.transient.requested_outputs={'IceVolume'};
 
 %solve

issm/trunk-jpl/test/NightlyRun/test235.m

@@ -52 +52 @@
 
 md.stressbalance.reltol=10^-5; %tighten for qmu analyses
-md.transient.requested_outputs=IceVolumeEnum();
+md.transient.requested_outputs={'IceVolume'};
 
 %solve

issm/trunk-jpl/test/NightlyRun/test3001.m

@@ -4 +4 @@
 md=setflowequation(md,'SSA','all');
 md.cluster=generic('name',oshostname(),'np',1);
-md.stressbalance.requested_outputs=StressTensorEnum();
+md.stressbalance.requested_outputs={'StressTensor'};
 md.autodiff.isautodiff=true;
 md.toolkits.DefaultAnalysis=issmgslsolver();

issm/trunk-jpl/test/NightlyRun/test3001.py

@@ -13 +13 @@
 md=setflowequation(md,'SSA','all')
 md.cluster=generic('name',oshostname(),'np',1)
-md.stressbalance.requested_outputs=StressTensorEnum()
+md.stressbalance.requested_outputs=['StressTensor']
 md.toolkits.DefaultAnalysis=issmgslsolver()
 md.autodiff.isautodiff=True

issm/trunk-jpl/test/NightlyRun/test3003.m

@@ -5 +5 @@
 md=setflowequation(md,'HO','all');
 md.cluster=generic('name',oshostname(),'np',1);
-md.stressbalance.requested_outputs=StressTensorEnum();
+md.stressbalance.requested_outputs={'StressTensor'};
 md.autodiff.isautodiff=true;
 md.toolkits.DefaultAnalysis=issmgslsolver();

issm/trunk-jpl/test/NightlyRun/test3003.py

@@ -14 +14 @@
 md=setflowequation(md,'HO','all')
 md.cluster=generic('name',oshostname(),'np',1)
-md.stressbalance.requested_outputs=StressTensorEnum()
+md.stressbalance.requested_outputs=['StressTensor']
 md.toolkits.DefaultAnalysis=issmgslsolver()
 md.autodiff.isautodiff=True

issm/trunk-jpl/test/NightlyRun/test3010.m

@@ -4 +4 @@
 md=setflowequation(md,'SSA','all');
 md.cluster=generic('name',oshostname(),'np',1);
-md.transient.requested_outputs=IceVolumeEnum();
+md.transient.requested_outputs={'IceVolume'};
 
 md.autodiff.isautodiff=true;

issm/trunk-jpl/test/NightlyRun/test3010.py

@@ -14 +14 @@
 md.cluster=generic('name',oshostname(),'np',1)
 md.toolkits.DefaultAnalysis=issmgslsolver()
-md.transient.requested_outputs=IceVolumeEnum()
+md.transient.requested_outputs=['IceVolume']
 
 md.autodiff.isautodiff=True

issm/trunk-jpl/test/NightlyRun/test3015.m

@@ -8 +8 @@
 md=setflowequation(md,'SSA','all');
 md.cluster=generic('name',oshostname(),'np',1);
-md.masstransport.requested_outputs=IceVolumeEnum();
+md.masstransport.requested_outputs={'IceVolume'};
 md.verbose=verbose('autodiff',true);
 md.toolkits.DefaultAnalysis=issmgslsolver();

issm/trunk-jpl/test/NightlyRun/test3015.py

@@ -22 +22 @@
 md=setflowequation(md,'SSA','all')
 md.cluster=generic('name',oshostname(),'np',3)
-md.masstransport.requested_outputs=IceVolumeEnum()
+md.masstransport.requested_outputs=['IceVolume']
 md.verbose=verbose('autodiff',True)
 md.toolkits.DefaultAnalysis=issmgslsolver()

issm/trunk-jpl/test/NightlyRun/test3020.m

@@ -8 +8 @@
 md=setflowequation(md,'SSA','all');
 md.cluster=generic('name',oshostname(),'np',1);
-md.transient.requested_outputs=[IceVolumeEnum();MaxVelEnum()];
+md.transient.requested_outputs={'IceVolume','MaxVelEnum'};
 md.verbose=verbose('autodiff',true);
 md.stressbalance.restol=1e-4;

issm/trunk-jpl/test/NightlyRun/test3020.py

@@ -22 +22 @@
 md=setflowequation(md,'SSA','all')
 md.cluster=generic('name',oshostname(),'np',1)
-md.transient.requested_outputs=[IceVolumeEnum(),MaxVelEnum()]
+md.transient.requested_outputs=['IceVolume','MaxVel']
 md.verbose=verbose('autodiff',True)
 md.stressbalance.restol=0.000001

issm/trunk-jpl/test/NightlyRun/test3021.m

@@ -4 +4 @@
 md=setflowequation(md,'SSA','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md.stressbalance.requested_outputs=StressTensorEnum();
+md.stressbalance.requested_outputs={'StressTensor'};
 md.autodiff.isautodiff=false;
 md.toolkits.DefaultAnalysis=issmsolver();

issm/trunk-jpl/test/NightlyRun/test3101.m

@@ -4 +4 @@
 md=setflowequation(md,'SSA','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md.stressbalance.requested_outputs=StressTensorEnum();
+md.stressbalance.requested_outputs={'StressTensor'};
 md.autodiff.isautodiff=true;
 md.toolkits.DefaultAnalysis=issmmumpssolver();

issm/trunk-jpl/test/NightlyRun/test3101.py

@@ -13 +13 @@
 md=setflowequation(md,'SSA','all')
 md.cluster=generic('name',oshostname(),'np',3)
-md.stressbalance.requested_outputs=StressTensorEnum()
+md.stressbalance.requested_outputs=['StressTensor']
 md.toolkits.DefaultAnalysis=issmmumpssolver()
 md.autodiff.isautodiff=True

issm/trunk-jpl/test/NightlyRun/test3103.m

@@ -5 +5 @@
 md=setflowequation(md,'HO','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md.stressbalance.requested_outputs=StressTensorEnum();
+md.stressbalance.requested_outputs={'StressTensor'};
 md.autodiff.isautodiff=true;
 md.toolkits.DefaultAnalysis=issmmumpssolver();

issm/trunk-jpl/test/NightlyRun/test3103.py

@@ -14 +14 @@
 md=setflowequation(md,'HO','all')
 md.cluster=generic('name',oshostname(),'np',3)
-md.stressbalance.requested_outputs=StressTensorEnum()
+md.stressbalance.requested_outputs=['StressTensor']
 md.toolkits.DefaultAnalysis=issmmumpssolver()
 md.autodiff.isautodiff=True

issm/trunk-jpl/test/NightlyRun/test3110.m

@@ -4 +4 @@
 md=setflowequation(md,'SSA','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md.transient.requested_outputs=IceVolumeEnum();
+md.transient.requested_outputs={'IceVolume'};
 
 md.autodiff.isautodiff=true;

issm/trunk-jpl/test/NightlyRun/test3110.py

@@ -14 +14 @@
 md.cluster=generic('name',oshostname(),'np',3)
 md.toolkits.DefaultAnalysis=issmmumpssolver()
-md.transient.requested_outputs=IceVolumeEnum()
+md.transient.requested_outputs=['IceVolume']
 
 md.autodiff.isautodiff=True

issm/trunk-jpl/test/NightlyRun/test328.m

@@ -8 +8 @@
 md.surfaceforcings.href=md.geometry.surface;
 md.surfaceforcings.smbref= 1000. - 0.001*md.mesh.x - 0.005*md.mesh.y;
-md.transient.requested_outputs=TotalSmbEnum();
+md.transient.requested_outputs={'TotalSmb'};
 md.cluster=generic('name',oshostname(),'np',3);
 md=solve(md,TransientSolutionEnum());

issm/trunk-jpl/test/NightlyRun/test328.py

@@ -17 +17 @@
 md.surfaceforcings.b_pos=-100. + 0.00005*md.mesh.x - 0.0001*md.mesh.y
 md.surfaceforcings.b_neg=250. + 0.000051*md.mesh.x - 0.00011*md.mesh.y
-md.transient.requested_outputs=TotalSmbEnum()
+md.transient.requested_outputs=['TotalSmb']
 md.surfaceforcings.href=copy.deepcopy(md.geometry.surface).reshape(-1)
 md.surfaceforcings.smbref= 1000. - 0.001*md.mesh.x - 0.005*md.mesh.y;

issm/trunk-jpl/test/NightlyRun/test329.m

@@ -9 +9 @@
 md.surfaceforcings.href=md.geometry.surface;
 md.surfaceforcings.smbref= 1000. - 0.001*md.mesh.x - 0.005*md.mesh.y;
-md.transient.requested_outputs=TotalSmbEnum();
+md.transient.requested_outputs={'TotalSmb'};
 md.cluster=generic('name',oshostname(),'np',3);
 md=solve(md,TransientSolutionEnum());

issm/trunk-jpl/test/NightlyRun/test329.py

@@ -20 +20 @@
 md.surfaceforcings.href=copy.deepcopy(md.geometry.surface).reshape(-1)
 md.surfaceforcings.smbref= 1000. - 0.001*md.mesh.x - 0.005*md.mesh.y;
-md.transient.requested_outputs=TotalSmbEnum()
+md.transient.requested_outputs=['TotalSmb']
 md.cluster=generic('name',oshostname(),'np',3)
 md=solve(md,TransientSolutionEnum())

issm/trunk-jpl/test/NightlyRun/test424.m

@@ -13 +13 @@
 md.transient.isgroundingline=1;
 md.groundingline.migration='AgressiveMigration';
-md.transient.requested_outputs=[IceVolumeEnum();IceVolumeAboveFloatationEnum()];
+md.transient.requested_outputs={'IceVolume','IceVolumeAboveFloatation'};
 
 md.cluster=generic('name',oshostname(),'np',3);

issm/trunk-jpl/test/NightlyRun/test424.py

@@ -23 +23 @@
 md.transient.isgroundingline=True
 md.groundingline.migration='AgressiveMigration'
-md.transient.requested_outputs=[IceVolumeEnum(),IceVolumeAboveFloatationEnum()]
+md.transient.requested_outputs=['IceVolume','IceVolumeAboveFloatation']
 
 md.cluster=generic('name',oshostname(),'np',3)

issm/trunk-jpl/test/NightlyRun/test426.m

@@ -14 +14 @@
 md.transient.isgroundingline=1;
 md.groundingline.migration='AgressiveMigration';
-md.transient.requested_outputs=[IceVolumeEnum();IceVolumeAboveFloatationEnum()];
+md.transient.requested_outputs={'IceVolume','IceVolumeAboveFloatation'};
 md.cluster=generic('name',oshostname(),'np',3);
 

issm/trunk-jpl/test/NightlyRun/test426.py

@@ -24 +24 @@
 md.transient.isgroundingline=True
 md.groundingline.migration='AgressiveMigration'
-md.transient.requested_outputs=[IceVolumeEnum(),IceVolumeAboveFloatationEnum()]
+md.transient.requested_outputs=['IceVolume','IceVolumeAboveFloatation']
 md.cluster=generic('name',oshostname(),'np',3)