Changeset 20690 for issm/trunk-jpl/src/c/analyses/SealevelriseAnalysis.cpp

Timestamp:

06/03/16 10:05:11 (9 years ago)

Author:

Mathieu Morlighem

Message:

NEW: marhsall strings instead of enums

File:

• issm/trunk-jpl/src/c/analyses/SealevelriseAnalysis.cpp (modified) (4 diffs)

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

@@ -31 +31 @@
 
         /*Create inputs: */
-        iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
-        iomodel->FetchDataToInput(elements,MaskOceanLevelsetEnum);
-        iomodel->FetchDataToInput(elements,MaskLandLevelsetEnum);
-        iomodel->FetchDataToInput(elements,SealevelriseDeltathicknessEnum);
-        iomodel->FetchDataToInput(elements,SealevelEnum,0);
+        iomodel->FetchDataToInput(elements,"md.mask.ice_levelset",MaskIceLevelsetEnum);
+        iomodel->FetchDataToInput(elements,"md.mask.ocean_levelset",MaskOceanLevelsetEnum);
+        iomodel->FetchDataToInput(elements,"md.mask.land_levelset",MaskLandLevelsetEnum);
+        iomodel->FetchDataToInput(elements,"md.sealevelrise.deltathickness",SealevelriseDeltathicknessEnum);
+        iomodel->FetchDataToInput(elements,"md.slr.sealevel",SealevelEnum,0);
 
 }/*}}}*/
@@ -60 +60 @@
 
         /*some constant parameters: */
-        parameters->AddObject(iomodel->CopyConstantObject(SealevelriseReltolEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(SealevelriseAbstolEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(SealevelriseMaxiterEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(SealevelriseRigidEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(SealevelriseElasticEnum));
-
-        iomodel->FetchData(&elastic,SealevelriseElasticEnum);
+        parameters->AddObject(iomodel->CopyConstantObject("md.slr.reltol",SealevelriseReltolEnum));
+        parameters->AddObject(iomodel->CopyConstantObject("md.slr.abstol",SealevelriseAbstolEnum));
+        parameters->AddObject(iomodel->CopyConstantObject("md.slr.maxiter",SealevelriseMaxiterEnum));
+        parameters->AddObject(iomodel->CopyConstantObject("md.slr.rigid",SealevelriseRigidEnum));
+        parameters->AddObject(iomodel->CopyConstantObject("md.slr.elastic",SealevelriseElasticEnum));
+
+        iomodel->FetchData(&elastic,"md.slr.elastic");
         if(elastic){
 
                 /*love numbers: */
-                iomodel->FetchData(&love_h,&nl,NULL,SealevelriseLoveHEnum);
-                iomodel->FetchData(&love_k,&nl,NULL,SealevelriseLoveKEnum);
+                iomodel->FetchData(&love_h,&nl,NULL,"md.slr.love_h");
+                iomodel->FetchData(&love_k,&nl,NULL,"md.slr.love_k");
 
                 /*compute elastic green function for a range of angles*/
-                iomodel->FetchData(&degacc,SealevelriseDegaccEnum);
+                iomodel->FetchData(&degacc,"md.slr.degacc");
                 M=reCast<int,IssmDouble>(180./degacc+1.);
                 G_elastic=xNew<IssmDouble>(M);
@@ -133 +133 @@
         
         /*Transitions: */
-        iomodel->FetchData(&transitions,&transitions_M,&transitions_N,&ntransitions,SealevelriseTransitionsEnum);
+        iomodel->FetchData(&transitions,&transitions_M,&transitions_N,&ntransitions,"md.slr.transitions");
         if(transitions){
                 parameters->AddObject(new DoubleMatArrayParam(SealevelriseTransitionsEnum,transitions,ntransitions,transitions_M,transitions_N));
@@ -147 +147 @@
 
         /*Requested outputs*/
-        iomodel->FetchData(&requestedoutputs,&numoutputs,SealevelriseRequestedOutputsEnum);
+        iomodel->FindConstant(&requestedoutputs,&numoutputs,"md.slr.requested_outputs");
         parameters->AddObject(new IntParam(SealevelriseNumRequestedOutputsEnum,numoutputs));
         if(numoutputs)parameters->AddObject(new StringArrayParam(SealevelriseRequestedOutputsEnum,requestedoutputs,numoutputs));
-        iomodel->DeleteData(&requestedoutputs,numoutputs,SealevelriseRequestedOutputsEnum);
+        iomodel->DeleteData(&requestedoutputs,numoutputs,"md.slr.requested_outputs");