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

Timestamp:

06/18/20 18:48:50 (5 years ago)

Author:

Eric.Larour

Message:

CHG: moved GiaIvinsAnalysis to GiaAnalysis.
Made giamme the default gia offline class.
Made giacore handle giaivins, giamme and giacaron classes.
Added gia core to transient core.
Remove gia logic from sea level rise core, back into gia core.

File:

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

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

@@ -24 +24 @@
         int geodetic=0;
         int dslmodel=0;
-        int giamodel=0;
 
         /*Update elements: */
@@ -44 +43 @@
         iomodel->FetchDataToInput(inputs2,elements,"md.slr.sealevel",SealevelEnum,0);
         iomodel->FetchDataToInput(inputs2,elements,"md.geometry.bed",BedEnum);
-        iomodel->FetchDataToInput(inputs2,elements,"md.slr.Ngia",SealevelNGiaRateEnum);
-        iomodel->FetchDataToInput(inputs2,elements,"md.slr.Ugia",SealevelUGiaRateEnum);
         iomodel->FetchDataToInput(inputs2,elements,"md.slr.hydro_rate",SealevelriseHydroRateEnum);
                 
@@ -267 +264 @@
         else _error_("Dsl model " << dslmodel << " not implemented yet!");
                 
-        /*gia mme model: */
-        iomodel->FetchData(&giamodel,"md.gia.model");
-        if(giamodel==3){
-                /*deal with Ngia and Ugia: */
-                iomodel->FetchDataToDatasetInput(inputs2,elements,"md.gia.Ngia",GiaMmeNgiaEnum);
-                iomodel->FetchDataToDatasetInput(inputs2,elements,"md.gia.Ugia",GiaMmeUgiaEnum);
-        }
+        
 
         /*Initialize cumdeltalthickness and sealevel rise rate input*/
@@ -291 +282 @@
         IssmDouble* love_l=NULL;
         int         dslmodel=0;
-        int         giamodel=0;
 
         IssmDouble* G_rigid = NULL;
@@ -317 +307 @@
         /*some constant parameters: */
         parameters->AddObject(iomodel->CopyConstantObject("md.dsl.model",DslModelEnum));
-        parameters->AddObject(iomodel->CopyConstantObject("md.gia.model",GiaModelEnum));
         parameters->AddObject(iomodel->CopyConstantObject("md.slr.geodetic_run_frequency",SealevelriseGeodeticRunFrequencyEnum));
         parameters->AddObject(iomodel->CopyConstantObject("md.slr.reltol",SealevelriseReltolEnum));
@@ -357 +346 @@
                 if(modelid<=0 || modelid>nummodels)_error_("modelid field in dslmme object of md.dsl field should be between 1 and the number of ensemble runs!");
         } /*}}}*/
-        /*Deal with gia multi-model ensembles: {{{*/
-        iomodel->FetchData(&giamodel,"md.gia.model");
-        if(giamodel==3){
-                IssmDouble modelid; 
-                int nummodels;
-
-                parameters->AddObject(iomodel->CopyConstantObject("md.gia.nummodels",GiaNummodelsEnum));
-                iomodel->FetchData(&modelid,"md.gia.modelid");
-                /*create double param, not int param, because Dakota will be updating it as 
-                 * a double potentially: */
-                parameters->AddObject(new DoubleParam(GiaModelidEnum,modelid));
-
-                iomodel->FetchData(&nummodels,"md.gia.nummodels");
-
-                /*quick checks: */
-                if(nummodels<=0)_error_("giamme object in  md.gia field should contain at least 1 ensemble model!");
-                if(modelid<=0 || modelid>nummodels)_error_("modelid field in giamme object of md.gia field should be between 1 and the number of ensemble runs!");
-        } /*}}}*/
         /*Deal with elasticity {{{*/
         /*love numbers: */