Changeset 25118


Ignore:
Timestamp:
06/22/20 22:29:05 (5 years ago)
Author:
Eric.Larour
Message:

CHG: significant changes to the organization of slr -> new solidearth class
that encompasses all of the slr fields.

Location:
issm/trunk-jpl/src
Files:
6 added
24 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/analyses/Balancethickness2Analysis.cpp

    r24335 r25118  
    3232        iomodel->FetchDataToInput(inputs2,elements,"md.geometry.surface",SurfaceEnum);
    3333        iomodel->FetchDataToInput(inputs2,elements,"md.geometry.base",BaseEnum);
    34         iomodel->FetchDataToInput(inputs2,elements,"md.slr.sealevel",SealevelEnum,0);
     34        iomodel->FetchDataToInput(inputs2,elements,"md.solidearth.sealevel",SealevelEnum,0);
    3535        iomodel->FetchDataToInput(inputs2,elements,"md.mask.ice_levelset",MaskIceLevelsetEnum);
    3636        iomodel->FetchDataToInput(inputs2,elements,"md.initialization.vx",VxEnum);

  • issm/trunk-jpl/src/c/analyses/BalancethicknessAnalysis.cpp

    r24936 r25118  
    9999        iomodel->FetchDataToInput(inputs2,elements,"md.geometry.surface",SurfaceEnum);
    100100        iomodel->FetchDataToInput(inputs2,elements,"md.geometry.base",BaseEnum);
    101         iomodel->FetchDataToInput(inputs2,elements,"md.slr.sealevel",SealevelEnum,0);
     101        iomodel->FetchDataToInput(inputs2,elements,"md.solidearth.sealevel",SealevelEnum,0);
    102102        iomodel->FetchDataToInput(inputs2,elements,"md.mask.ice_levelset",MaskIceLevelsetEnum);
    103103        iomodel->FetchDataToInput(inputs2,elements,"md.initialization.vx",VxEnum);

  • issm/trunk-jpl/src/c/analyses/BalancevelocityAnalysis.cpp

    r24673 r25118  
    4141        iomodel->FetchDataToInput(inputs2,elements,"md.geometry.surface",SurfaceEnum);
    4242        iomodel->FetchDataToInput(inputs2,elements,"md.geometry.base",BaseEnum);
    43         iomodel->FetchDataToInput(inputs2,elements,"md.slr.sealevel",SealevelEnum,0);
     43        iomodel->FetchDataToInput(inputs2,elements,"md.solidearth.sealevel",SealevelEnum,0);
    4444        iomodel->FetchDataToInput(inputs2,elements,"md.mask.ice_levelset",MaskIceLevelsetEnum);
    4545        iomodel->FetchDataToInput(inputs2,elements,"md.initialization.vx",VxEnum);

  • issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp

    r24939 r25118  
    136136        iomodel->FetchDataToInput(inputs2,elements,"md.geometry.thickness",ThicknessEnum);
    137137        iomodel->FetchDataToInput(inputs2,elements,"md.geometry.surface",SurfaceEnum);
    138         iomodel->FetchDataToInput(inputs2,elements,"md.slr.sealevel",SealevelEnum,0);
     138        iomodel->FetchDataToInput(inputs2,elements,"md.solidearth.sealevel",SealevelEnum,0);
    139139        iomodel->FetchDataToInput(inputs2,elements,"md.geometry.base",BaseEnum);
    140140        iomodel->FetchDataToInput(inputs2,elements,"md.mask.ice_levelset",MaskIceLevelsetEnum);

  • issm/trunk-jpl/src/c/analyses/EsaAnalysis.cpp

    r24959 r25118  
    6161        /*some constant parameters: */
    6262        parameters->AddObject(iomodel->CopyConstantObject("md.esa.hemisphere",EsaHemisphereEnum));
    63         parameters->AddObject(iomodel->CopyConstantObject("md.slr.rigid",SealevelriseRigidEnum));
    64         parameters->AddObject(iomodel->CopyConstantObject("md.slr.horiz",SealevelriseHorizEnum));
    65         parameters->AddObject(iomodel->CopyConstantObject("md.slr.elastic",SealevelriseElasticEnum));
    66         parameters->AddObject(iomodel->CopyConstantObject("md.slr.rotation",SealevelriseRotationEnum));
     63        parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.settings.rigid",SolidearthSettingsRigidEnum));
     64        parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.settings.horiz",SolidearthSettingsHorizEnum));
     65        parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.settings.elastic",SolidearthSettingsElasticEnum));
     66        parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.settings.rotation",SolidearthSettingsRotationEnum));
    6767
    6868        /*deal with planet radius and area: */
    69         parameters->AddObject(iomodel->CopyConstantObject("md.slr.planetradius",SealevelPlanetRadiusEnum));
    70         iomodel->FetchData(&planetradius,"md.slr.planetradius");
     69        parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.planetradius",SolidearthPlanetRadiusEnum));
     70        iomodel->FetchData(&planetradius,"md.solidearth.planetradius");
    7171        planetarea=4*PI*planetradius*planetradius;
    72         parameters->AddObject(new DoubleParam(SealevelPlanetAreaEnum,planetarea));
     72        parameters->AddObject(new DoubleParam(SolidearthPlanetAreaEnum,planetarea));
    7373
    7474        /*love numbers: */

  • issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp

    r24933 r25118  
    7474
    7575        iomodel->FetchDataToInput(inputs2,elements,"md.geometry.surface",SurfaceEnum);
    76         iomodel->FetchDataToInput(inputs2,elements,"md.slr.sealevel",SealevelEnum,0);
     76        iomodel->FetchDataToInput(inputs2,elements,"md.solidearth.sealevel",SealevelEnum,0);
    7777        iomodel->FetchDataToInput(inputs2,elements,"md.mask.ice_levelset",MaskIceLevelsetEnum);
    7878        iomodel->FetchDataToInput(inputs2,elements,"md.basalforcings.groundedice_melting_rate",BasalforcingsGroundediceMeltingRateEnum,0.);

  • issm/trunk-jpl/src/c/analyses/FreeSurfaceTopAnalysis.cpp

    r24933 r25118  
    7777
    7878        iomodel->FetchDataToInput(inputs2,elements,"md.geometry.surface",SurfaceEnum);
    79         iomodel->FetchDataToInput(inputs2,elements,"md.slr.sealevel",SealevelEnum,0);
     79        iomodel->FetchDataToInput(inputs2,elements,"md.solidearth.sealevel",SealevelEnum,0);
    8080        iomodel->FetchDataToInput(inputs2,elements,"md.mask.ice_levelset",MaskIceLevelsetEnum);
    8181        iomodel->FetchDataToInput(inputs2,elements,"md.initialization.vx",VxEnum);

  • issm/trunk-jpl/src/c/analyses/HydrologyShreveAnalysis.cpp

    r24933 r25118  
    5858        iomodel->FetchDataToInput(inputs2,elements,"md.geometry.surface",SurfaceEnum);
    5959        iomodel->FetchDataToInput(inputs2,elements,"md.geometry.base",BaseEnum);
    60         iomodel->FetchDataToInput(inputs2,elements,"md.slr.sealevel",SealevelEnum,0);
     60        iomodel->FetchDataToInput(inputs2,elements,"md.solidearth.sealevel",SealevelEnum,0);
    6161        if(iomodel->domaintype!=Domain2DhorizontalEnum){
    6262                iomodel->FetchDataToInput(inputs2,elements,"md.mesh.vertexonbase",MeshVertexonbaseEnum);

  • issm/trunk-jpl/src/c/analyses/L2ProjectionBaseAnalysis.cpp

    r24335 r25118  
    4242        iomodel->FetchDataToInput(inputs2,elements,"md.geometry.surface",SurfaceEnum);
    4343   iomodel->FetchDataToInput(inputs2,elements,"md.geometry.base",BaseEnum);
    44         iomodel->FetchDataToInput(inputs2,elements,"md.slr.sealevel",SealevelEnum,0);
     44        iomodel->FetchDataToInput(inputs2,elements,"md.solidearth.sealevel",SealevelEnum,0);
    4545        iomodel->FetchDataToInput(inputs2,elements,"md.mask.ice_levelset",MaskIceLevelsetEnum);
    4646        if(iomodel->domaintype!=Domain2DhorizontalEnum & iomodel->domaintype!=Domain3DsurfaceEnum){

  • issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp

    r24861 r25118  
    148148        iomodel->FetchDataToInput(inputs2,elements,"md.geometry.surface",SurfaceEnum);
    149149        iomodel->FetchDataToInput(inputs2,elements,"md.geometry.base",BaseEnum);
    150         iomodel->FetchDataToInput(inputs2,elements,"md.slr.sealevel",SealevelEnum,0);
     150        iomodel->FetchDataToInput(inputs2,elements,"md.solidearth.sealevel",SealevelEnum,0);
    151151        iomodel->FetchDataToInput(inputs2,elements,"md.mask.ice_levelset",MaskIceLevelsetEnum);
    152152        iomodel->FetchDataToInput(inputs2,elements,"md.mask.ocean_levelset",MaskOceanLevelsetEnum);
    … …  
    907907        element->AddBasalInput2(BaseEnum,newbase,P1Enum);
    908908        element->AddBasalInput2(SealevelriseCumDeltathicknessEnum,cumdeltathickness,P1Enum);
    909         element->AddBasalInput2(SealevelriseDeltathicknessEnum,deltathickness,P1Enum);
     909        element->AddBasalInput2(SurfaceloadIceThicknessChangeEnum,deltathickness,P1Enum);
    910910
    911911        /*Free ressources:*/

  • issm/trunk-jpl/src/c/analyses/MeltingAnalysis.cpp

    r24335 r25118  
    5656        iomodel->FetchDataToInput(inputs2,elements,"md.geometry.surface",SurfaceEnum);
    5757        iomodel->FetchDataToInput(inputs2,elements,"md.geometry.base",BaseEnum);
    58         iomodel->FetchDataToInput(inputs2,elements,"md.slr.sealevel",SealevelEnum,0);
     58        iomodel->FetchDataToInput(inputs2,elements,"md.solidearth.sealevel",SealevelEnum,0);
    5959        iomodel->FetchDataToInput(inputs2,elements,"md.mask.ice_levelset",MaskIceLevelsetEnum);
    6060        if(iomodel->domaintype!=Domain2DhorizontalEnum){

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

    r25066 r25118  
    3838        iomodel->FetchDataToInput(inputs2,elements,"md.mask.ocean_levelset",MaskOceanLevelsetEnum);
    3939        iomodel->FetchDataToInput(inputs2,elements,"md.mask.ice_levelset",MaskIceLevelsetEnum);
    40         iomodel->FetchData(&geodetic,"md.slr.geodetic");
    41         iomodel->FetchDataToInput(inputs2,elements,"md.slr.deltathickness",SealevelriseDeltathicknessEnum);
    42         iomodel->FetchDataToInput(inputs2,elements,"md.slr.spcthickness",SealevelriseSpcthicknessEnum);
    43         iomodel->FetchDataToInput(inputs2,elements,"md.slr.sealevel",SealevelEnum,0);
     40        iomodel->FetchData(&geodetic,"md.solidearth.settings.computesealevelchange");
     41        iomodel->FetchDataToInput(inputs2,elements,"md.solidearth.surfaceload.icethicknesschange",SurfaceloadIceThicknessChangeEnum);
     42        iomodel->FetchDataToInput(inputs2,elements,"md.solidearth.sealevel",SealevelEnum,0);
    4443        iomodel->FetchDataToInput(inputs2,elements,"md.geometry.bed",BedEnum);
    45         iomodel->FetchDataToInput(inputs2,elements,"md.slr.hydro_rate",SealevelriseHydroRateEnum);
     44        iomodel->FetchDataToInput(inputs2,elements,"md.solidearth.surfaceload.waterheightchange",SurfaceloadWaterHeightChangeEnum);
    4645               
    4746        /*dynamic sea level: */
    … …  
    278277
    279278        int         nl;
     279        int         lovemodel=1;
    280280        IssmDouble* love_h=NULL;
    281281        IssmDouble* love_k=NULL;
    … …  
    307307        /*some constant parameters: */
    308308        parameters->AddObject(iomodel->CopyConstantObject("md.dsl.model",DslModelEnum));
    309         parameters->AddObject(iomodel->CopyConstantObject("md.slr.geodetic_run_frequency",SealevelriseGeodeticRunFrequencyEnum));
    310         parameters->AddObject(iomodel->CopyConstantObject("md.slr.reltol",SealevelriseReltolEnum));
    311         parameters->AddObject(iomodel->CopyConstantObject("md.slr.abstol",SealevelriseAbstolEnum));
    312         parameters->AddObject(iomodel->CopyConstantObject("md.slr.maxiter",SealevelriseMaxiterEnum));
    313         parameters->AddObject(iomodel->CopyConstantObject("md.slr.rigid",SealevelriseRigidEnum));
    314         parameters->AddObject(iomodel->CopyConstantObject("md.slr.horiz",SealevelriseHorizEnum));
    315         parameters->AddObject(iomodel->CopyConstantObject("md.slr.elastic",SealevelriseElasticEnum));
    316         parameters->AddObject(iomodel->CopyConstantObject("md.slr.rotation",SealevelriseRotationEnum));
    317         parameters->AddObject(iomodel->CopyConstantObject("md.slr.tide_love_h",SealevelriseTidalLoveHEnum));
    318         parameters->AddObject(iomodel->CopyConstantObject("md.slr.tide_love_k",SealevelriseTidalLoveKEnum));
    319         parameters->AddObject(iomodel->CopyConstantObject("md.slr.fluid_love",SealevelriseFluidLoveEnum));
    320         parameters->AddObject(iomodel->CopyConstantObject("md.slr.equatorial_moi",SealevelriseEquatorialMoiEnum));
    321         parameters->AddObject(iomodel->CopyConstantObject("md.slr.polar_moi",SealevelrisePolarMoiEnum));
    322         parameters->AddObject(iomodel->CopyConstantObject("md.slr.angular_velocity",SealevelriseAngularVelocityEnum));
    323         parameters->AddObject(iomodel->CopyConstantObject("md.slr.ocean_area_scaling",SealevelriseOceanAreaScalingEnum));
    324         parameters->AddObject(iomodel->CopyConstantObject("md.slr.geodetic",SealevelriseGeodeticEnum));
    325         parameters->AddObject(iomodel->CopyConstantObject("md.slr.planetradius",SealevelPlanetRadiusEnum));
     309        parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.settings.runfrequency",SolidearthSettingsRunFrequencyEnum));
     310        parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.settings.reltol",SolidearthSettingsReltolEnum));
     311        parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.settings.abstol",SolidearthSettingsAbstolEnum));
     312        parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.settings.maxiter",SolidearthSettingsMaxiterEnum));
     313        parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.settings.rigid",SolidearthSettingsRigidEnum));
     314        parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.settings.horiz",SolidearthSettingsHorizEnum));
     315        parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.settings.elastic",SolidearthSettingsElasticEnum));
     316        parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.settings.rotation",SolidearthSettingsRotationEnum));
     317        parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.rotational.equatorialmoi",RotationalEquatorialMoiEnum));
     318        parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.rotational.polarmoi",RotationalPolarMoiEnum));
     319        parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.rotational.angularvelocity",RotationalAngularVelocityEnum));
     320        parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.settings.ocean_area_scaling",SolidearthSettingsOceanAreaScalingEnum));
     321        parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.settings.computesealevelchange",SolidearthSettingsComputesealevelchangeEnum));
     322        parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.planetradius",SolidearthPlanetRadiusEnum));
    326323
    327324        /*compute planet area and plug into parameters:*/
    328         iomodel->FetchData(&planetradius,"md.slr.planetradius");
     325        iomodel->FetchData(&planetradius,"md.solidearth.planetradius");
    329326        planetarea=4*PI*planetradius*planetradius;
    330         parameters->AddObject(new DoubleParam(SealevelPlanetAreaEnum,planetarea));
     327        parameters->AddObject(new DoubleParam(SolidearthPlanetAreaEnum,planetarea));
    331328
    332329        /*Deal with dsl multi-model ensembles: {{{*/
    … …  
    348345        /*Deal with elasticity {{{*/
    349346        /*love numbers: */
    350         iomodel->FetchData(&love_h,&nl,NULL,"md.slr.love_h");
    351         iomodel->FetchData(&love_k,&nl,NULL,"md.slr.love_k");
    352         iomodel->FetchData(&love_l,&nl,NULL,"md.slr.love_l");
     347        iomodel->FetchData(&lovemodel,"md.solidearth.love.model");
     348        if(lovemodel==1){
     349                iomodel->FetchData(&love_h,&nl,NULL,"md.solidearth.love.h");
     350                iomodel->FetchData(&love_k,&nl,NULL,"md.solidearth.love.k");
     351                iomodel->FetchData(&love_l,&nl,NULL,"md.solidearth.love.l");
     352                parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.love.th",TidalLoveHEnum));
     353                parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.love.tk",TidalLoveKEnum));
     354                parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.love.tk2secular",TidalLoveK2SecularEnum));
     355        }
     356        else{
     357                parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.love.h",TidalLoveHEnum));
     358                parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.love.k",TidalLoveKEnum));
     359                parameters->AddObject(iomodel->CopyConstantObject("md.solidearth.love.k2secular",TidalLoveK2SecularEnum));
     360        }
    353361
    354362        /*compute elastic green function for a range of angles*/
    355         iomodel->FetchData(&degacc,"md.slr.degacc");
     363        iomodel->FetchData(&degacc,"md.solidearth.settings.degacc");
    356364        M=reCast<int,IssmDouble>(180./degacc+1.);
    357365
    … …  
    480488/*}}}*/
    481489        /*Transitions:{{{ */
    482         iomodel->FetchData(&transitions,&transitions_M,&transitions_N,&ntransitions,"md.slr.transitions");
     490        iomodel->FetchData(&transitions,&transitions_M,&transitions_N,&ntransitions,"md.solidearth.transitions");
    483491        if(transitions){
    484492                parameters->AddObject(new DoubleMatArrayParam(SealevelriseTransitionsEnum,transitions,ntransitions,transitions_M,transitions_N));
    … …  
    493501        } /*}}}*/
    494502        /*Requested outputs {{{*/
    495         iomodel->FindConstant(&requestedoutputs,&numoutputs,"md.slr.requested_outputs");
     503        iomodel->FindConstant(&requestedoutputs,&numoutputs,"md.solidearth.requested_outputs");
    496504        if(numoutputs)parameters->AddObject(new StringArrayParam(SealevelriseRequestedOutputsEnum,requestedoutputs,numoutputs));
    497         iomodel->DeleteData(&requestedoutputs,numoutputs,"md.slr.requested_outputs");
     505        iomodel->DeleteData(&requestedoutputs,numoutputs,"md.solidearth.requested_outputs");
    498506        /*}}}*/
    499507

  • issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp

    r24933 r25118  
    756756        iomodel->FetchDataToInput(inputs2,elements,"md.geometry.surface",SurfaceEnum);
    757757        iomodel->FetchDataToInput(inputs2,elements,"md.geometry.base",BaseEnum);
    758         iomodel->FetchDataToInput(inputs2,elements,"md.slr.sealevel",SealevelEnum,0);
     758        iomodel->FetchDataToInput(inputs2,elements,"md.solidearth.sealevel",SealevelEnum,0);
    759759        iomodel->FetchDataToInput(inputs2,elements,"md.mask.ice_levelset",MaskIceLevelsetEnum);
    760760        iomodel->FetchDataToInput(inputs2,elements,"md.mask.ocean_levelset",MaskOceanLevelsetEnum);

  • issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp

    r24936 r25118  
    104104        iomodel->FetchDataToInput(inputs2,elements,"md.geometry.surface",SurfaceEnum);
    105105        iomodel->FetchDataToInput(inputs2,elements,"md.geometry.base",BaseEnum);
    106         iomodel->FetchDataToInput(inputs2,elements,"md.slr.sealevel",SealevelEnum,0);
     106        iomodel->FetchDataToInput(inputs2,elements,"md.solidearth.sealevel",SealevelEnum,0);
    107107        iomodel->FetchDataToInput(inputs2,elements,"md.mask.ice_levelset",MaskIceLevelsetEnum);
    108108        if(iomodel->domaintype!=Domain2DhorizontalEnum){

  • issm/trunk-jpl/src/c/analyses/ThermalAnalysis.cpp

    r24933 r25118  
    133133        iomodel->FetchDataToInput(inputs2,elements,"md.geometry.surface",SurfaceEnum);
    134134        iomodel->FetchDataToInput(inputs2,elements,"md.geometry.base",BaseEnum);
    135         iomodel->FetchDataToInput(inputs2,elements,"md.slr.sealevel",SealevelEnum,0);
     135        iomodel->FetchDataToInput(inputs2,elements,"md.solidearth.sealevel",SealevelEnum,0);
    136136        iomodel->FetchDataToInput(inputs2,elements,"md.mask.ice_levelset",MaskIceLevelsetEnum);
    137137        iomodel->FetchDataToInput(inputs2,elements,"md.mask.ocean_levelset",MaskOceanLevelsetEnum);

  • issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

    r25066 r25118  
    52335233
    52345234        /*recover earth area: */
    5235         this->parameters->FindParam(&planetarea,SealevelPlanetAreaEnum);
     5235        this->parameters->FindParam(&planetarea,SolidearthPlanetAreaEnum);
    52365236
    52375237        /*how many dofs are we working with here? */
    … …  
    53875387
    53885388        /*recover earth area: */
    5389         this->parameters->FindParam(&planetarea,SealevelPlanetAreaEnum);
     5389        this->parameters->FindParam(&planetarea,SolidearthPlanetAreaEnum);
    53905390
    53915391        /*Compute lat,long,radius of elemental centroid: */
    … …  
    54565456
    54575457                /*Compute ice thickness change: */
    5458                 Input2* deltathickness_input=this->GetInput2(SealevelriseDeltathicknessEnum);
     5458                Input2* deltathickness_input=this->GetInput2(SurfaceloadIceThicknessChangeEnum);
    54595459                if (!deltathickness_input)_error_("delta thickness input needed to compute sea level rise!");
    54605460                deltathickness_input->GetInputAverage(&I);
    … …  
    55305530        /*recover parameters: */
    55315531        rho_earth=FindParam(MaterialsEarthDensityEnum);
    5532         this->parameters->FindParam(&computerigid,SealevelriseRigidEnum);
    5533         this->parameters->FindParam(&computeelastic,SealevelriseElasticEnum);
     5532        this->parameters->FindParam(&computerigid,SolidearthSettingsRigidEnum);
     5533        this->parameters->FindParam(&computeelastic,SolidearthSettingsElasticEnum);
    55345534        this->parameters->FindParam(&gsize,MeshNumberofverticesEnum);
    5535         this->parameters->FindParam(&planetarea,SealevelPlanetAreaEnum);
    5536         this->parameters->FindParam(&planetradius,SealevelPlanetRadiusEnum);
    5537         this->parameters->FindParam(&horiz,SealevelriseHorizEnum);
     5535        this->parameters->FindParam(&planetarea,SolidearthPlanetAreaEnum);
     5536        this->parameters->FindParam(&planetradius,SolidearthPlanetRadiusEnum);
     5537        this->parameters->FindParam(&horiz,SolidearthSettingsHorizEnum);
    55385538
    55395539        /*recover precomputed green function kernels:*/
    … …  
    57195719
    57205720        /*recover ocean area scaling: */
    5721         this->parameters->FindParam(&scaleoceanarea,SealevelriseOceanAreaScalingEnum);
     5721        this->parameters->FindParam(&scaleoceanarea,SolidearthSettingsOceanAreaScalingEnum);
    57225722
    57235723        /*retrieve precomputed G:*/
    … …  
    57375737
    57385738        /*Retrieve ice thickness at vertices: */
    5739         Input2* deltathickness_input=this->GetInput2(SealevelriseDeltathicknessEnum);
     5739        Input2* deltathickness_input=this->GetInput2(SurfaceloadIceThicknessChangeEnum);
    57405740        if (!deltathickness_input)_error_("delta thickness input needed to compute sea level rise!");
    57415741
    … …  
    58945894
    58955895        /*recover parameters:*/
    5896         this->parameters->FindParam(&computeelastic,SealevelriseElasticEnum);
    5897         this->parameters->FindParam(&horiz,SealevelriseHorizEnum);
     5896        this->parameters->FindParam(&computeelastic,SolidearthSettingsElasticEnum);
     5897        this->parameters->FindParam(&horiz,SolidearthSettingsHorizEnum);
    58985898        this->parameters->FindParam(&bp_compute_fingerprints,DslComputeFingerprintsEnum);
    58995899
    … …  
    59315931
    59325932                /*Compute ice thickness change: */
    5933                 Input2* deltathickness_input=this->GetInput2(SealevelriseDeltathicknessEnum);
     5933                Input2* deltathickness_input=this->GetInput2(SurfaceloadIceThicknessChangeEnum);
    59345934                if (!deltathickness_input)_error_("delta thickness input needed to compute sea level rise!");
    59355935                deltathickness_input->GetInputAverage(&I);

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

    r25066 r25118  
    47604760
    47614761        /*recover computational flags: */
    4762         this->parameters->FindParam(&computerigid,SealevelriseRigidEnum);
    4763         this->parameters->FindParam(&computeelastic,SealevelriseElasticEnum);
     4762        this->parameters->FindParam(&computerigid,SolidearthSettingsRigidEnum);
     4763        this->parameters->FindParam(&computeelastic,SolidearthSettingsElasticEnum);
    47644764
    47654765        /*Initialize temporary vector that will be used to sum eustatic components on all local elements, prior
    … …  
    48244824
    48254825        /*pull out some useful parameters: */
    4826         parameters->FindParam(&tide_love_h,SealevelriseTidalLoveHEnum);
    4827         parameters->FindParam(&tide_love_k,SealevelriseTidalLoveKEnum);
    4828         parameters->FindParam(&fluid_love,SealevelriseFluidLoveEnum);
    4829         parameters->FindParam(&moi_e,SealevelriseEquatorialMoiEnum);
    4830         parameters->FindParam(&moi_p,SealevelrisePolarMoiEnum);
    4831         parameters->FindParam(&omega,SealevelriseAngularVelocityEnum);
     4826        parameters->FindParam(&tide_love_h,TidalLoveHEnum);
     4827        parameters->FindParam(&tide_love_k,TidalLoveKEnum);
     4828        parameters->FindParam(&fluid_love,TidalLoveK2SecularEnum);
     4829        parameters->FindParam(&moi_e,RotationalEquatorialMoiEnum);
     4830        parameters->FindParam(&moi_p,RotationalPolarMoiEnum);
     4831        parameters->FindParam(&omega,RotationalAngularVelocityEnum);
    48324832
    48334833        /*compute perturbation terms for angular velocity vector: */
    … …  
    48884888
    48894889        /*retrieve parameters:*/
    4890         this->parameters->FindParam(&horiz,SealevelriseHorizEnum);
     4890        this->parameters->FindParam(&horiz,SolidearthSettingsHorizEnum);
    48914891
    48924892        /*Serialize vectors from previous iteration:*/

  • issm/trunk-jpl/src/c/cores/sealevelchange_core.cpp

    r25069 r25118  
    110110
    111111        /*Should we even be here?:*/
    112         femmodel->parameters->FindParam(&geodetic,SealevelriseGeodeticEnum); if(!geodetic)return;
     112        femmodel->parameters->FindParam(&geodetic,SolidearthSettingsComputesealevelchangeEnum); if(!geodetic)return;
    113113
    114114        /*Verbose: */
    … …  
    117117        /*retrieve more parameters:*/
    118118        femmodel->parameters->FindParam(&iscoupler,TransientIscouplerEnum);
    119         femmodel->parameters->FindParam(&frequency,SealevelriseGeodeticRunFrequencyEnum);
     119        femmodel->parameters->FindParam(&frequency,SolidearthSettingsRunFrequencyEnum);
    120120        femmodel->parameters->FindParam(&count,SealevelriseRunCountEnum);
    121         femmodel->parameters->FindParam(&horiz,SealevelriseHorizEnum);
     121        femmodel->parameters->FindParam(&horiz,SolidearthSettingsHorizEnum);
    122122        femmodel->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
    123123        femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
    … …  
    154154
    155155                /*we have accumulated thicknesses, dump them in deltathcikness: */
    156                 if(modelid==earthid)InputDuplicatex(femmodel,SealevelriseCumDeltathicknessEnum,SealevelriseDeltathicknessEnum);
     156                if(modelid==earthid)InputDuplicatex(femmodel,SealevelriseCumDeltathicknessEnum,SurfaceloadIceThicknessChangeEnum);
    157157        }
    158158
    … …  
    274274        femmodel->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
    275275        femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
    276         femmodel->parameters->FindParam(&geodetic,SealevelriseGeodeticEnum);
     276        femmodel->parameters->FindParam(&geodetic,SolidearthSettingsComputesealevelchangeEnum);
    277277
    278278        /*in case we are running SealevelriseSolutionEnum, then bypass transient settings:*/
    … …  
    290290        GetStericRate(&steric_rate_g,femmodel);
    291291        GetDynamicRate(&dynamic_rate_g,femmodel);
    292         GetVectorFromInputsx(&hydro_rate_g,femmodel,SealevelriseHydroRateEnum,VertexSIdEnum);
     292        GetVectorFromInputsx(&hydro_rate_g,femmodel,SurfaceloadWaterHeightChangeEnum,VertexSIdEnum);
    293293        if(geodetic){
    294294                GetVectorFromInputsx(&U_esa_rate,femmodel,SealevelUEsaRateEnum,VertexSIdEnum);
    … …  
    364364               
    365365        /*retrieve parameters:*/
    366         femmodel->parameters->FindParam(&horiz,SealevelriseHorizEnum);
     366        femmodel->parameters->FindParam(&horiz,SolidearthSettingsHorizEnum);
    367367        femmodel->parameters->FindParam(&geometrydone,SealevelriseGeometryDoneEnum);
    368368
    … …  
    470470
    471471        /*Recover some parameters: */
    472         femmodel->parameters->FindParam(&max_nonlinear_iterations,SealevelriseMaxiterEnum);
    473         femmodel->parameters->FindParam(&eps_rel,SealevelriseReltolEnum);
    474         femmodel->parameters->FindParam(&eps_abs,SealevelriseAbstolEnum);
     472        femmodel->parameters->FindParam(&max_nonlinear_iterations,SolidearthSettingsMaxiterEnum);
     473        femmodel->parameters->FindParam(&eps_rel,SolidearthSettingsReltolEnum);
     474        femmodel->parameters->FindParam(&eps_abs,SolidearthSettingsAbstolEnum);
    475475
    476476        /*computational flag: */
    477         femmodel->parameters->FindParam(&rotation,SealevelriseRotationEnum);
     477        femmodel->parameters->FindParam(&rotation,SolidearthSettingsRotationEnum);
    478478
    479479        /*Figure out size of g-set deflection vector and allocate solution vector: */
    … …  
    589589
    590590        /*retrieve some parameters:*/
    591         femmodel->parameters->FindParam(&horiz,SealevelriseHorizEnum);
     591        femmodel->parameters->FindParam(&horiz,SolidearthSettingsHorizEnum);
    592592
    593593        /*find size of vectors:*/
    … …  
    637637
    638638        /*retrieve some parameters:*/
    639         femmodel->parameters->FindParam(&frequency,SealevelriseGeodeticRunFrequencyEnum);
     639        femmodel->parameters->FindParam(&frequency,SolidearthSettingsRunFrequencyEnum);
    640640        femmodel->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
    641641
    … …  
    990990        if(VerboseSolution()) _printf0_("              computing earth mass transport\n");
    991991
     992        /*This module has to be recoded! We do not grab spc thicknesses from an earth model
     993         * anymore! Thicknesses come from a mass transport module applied to each basin!
     994         * Commeting out for now:*/
     995        _error_("EarthMassTransport error message: not supported anymore!");
     996
    992997        /*This mass transport module for the Earth is because we might have thickness variations as spcs
    993998         * specified in the md.slr class, outside of what we will get from the icecaps. That's why we get t
    … …  
    9961001        /*No mass transport module was called, so we are just going to retrieve the geometry thickness
    9971002         * at this time step, at prior time step, and plug the difference as deltathickness: */
    998         femmodel->parameters->FindParam(&time,TimeEnum);
     1003        /*femmodel->parameters->FindParam(&time,TimeEnum);
    9991004        femmodel->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
    10001005        nv=femmodel->vertices->NumberOfVertices();
    10011006
    10021007        GetVectorFromInputsx(&newthickness,femmodel,SealevelriseSpcthicknessEnum,VertexSIdEnum);
    1003         GetVectorFromInputsx(&oldthickness,femmodel,SealevelriseSpcthicknessEnum,VertexSIdEnum,time-dt);
     1008        GetVectorFromInputsx(&oldthickness,femmodel,SealevelriseSpcthicknessEnum,VertexSIdEnum,time-dt);*/
    10041009
    10051010        /*compute deltathickness: */
    1006         deltathickness = new Vector<IssmDouble>(nv);
    1007         newthickness->Copy(deltathickness); deltathickness->AXPY(oldthickness,-1);
     1011        /*deltathickness = new Vector<IssmDouble>(nv);
     1012        newthickness->Copy(deltathickness); deltathickness->AXPY(oldthickness,-1); */
    10081013
    10091014        /*plug into elements:*/
    1010         InputUpdateFromVectorx(femmodel,deltathickness,SealevelriseDeltathicknessEnum,VertexSIdEnum);
     1015//      InputUpdateFromVectorx(femmodel,deltathickness,SurfaceloadIceThicknessChangeEnum,VertexSIdEnum);
    10111016
    10121017        /*add to cumulated delta thickness: */
    1013         GetVectorFromInputsx(&cumdeltathickness,femmodel,SealevelriseCumDeltathicknessEnum,VertexSIdEnum);
     1018        /*GetVectorFromInputsx(&cumdeltathickness,femmodel,SealevelriseCumDeltathicknessEnum,VertexSIdEnum);
    10141019        cumdeltathickness->AXPY(deltathickness,1);
    1015         InputUpdateFromVectorx(femmodel,cumdeltathickness,SealevelriseCumDeltathicknessEnum,VertexSIdEnum);
     1020        InputUpdateFromVectorx(femmodel,cumdeltathickness,SealevelriseCumDeltathicknessEnum,VertexSIdEnum);*/
    10161021
    10171022        /*free ressources:*/
    1018         delete oldthickness;
     1023        /*delete oldthickness;
    10191024        delete newthickness;
    10201025        delete deltathickness;
    1021         delete cumdeltathickness;
     1026        delete cumdeltathickness;*/
    10221027
    10231028} /*}}}*/

  • issm/trunk-jpl/src/c/shared/Enum/Enum.vim

    r25066 r25118  
    307307syn keyword cConstant RootPathEnum
    308308syn keyword cConstant SaveResultsEnum
    309 syn keyword cConstant SealevelPlanetRadiusEnum
    310 syn keyword cConstant SealevelPlanetAreaEnum
     309syn keyword cConstant SolidearthPlanetRadiusEnum
     310syn keyword cConstant SolidearthPlanetAreaEnum
    311311syn keyword cConstant SealevelEustaticEnum
    312 syn keyword cConstant SealevelriseAbstolEnum
    313 syn keyword cConstant SealevelriseAngularVelocityEnum
    314 syn keyword cConstant SealevelriseElasticEnum
     312syn keyword cConstant SolidearthSettingsAbstolEnum
     313syn keyword cConstant RotationalAngularVelocityEnum
     314syn keyword cConstant SolidearthSettingsElasticEnum
    315315syn keyword cConstant SealevelriseGeometryDoneEnum
    316 syn keyword cConstant SealevelriseEquatorialMoiEnum
    317 syn keyword cConstant SealevelriseFluidLoveEnum
     316syn keyword cConstant RotationalEquatorialMoiEnum
     317syn keyword cConstant TidalLoveK2SecularEnum
    318318syn keyword cConstant SealevelriseGRigidEnum
    319319syn keyword cConstant SealevelriseGElasticEnum
    320 syn keyword cConstant SealevelriseGeodeticEnum
    321 syn keyword cConstant SealevelriseGeodeticRunFrequencyEnum
     320syn keyword cConstant SolidearthSettingsComputesealevelchangeEnum
     321syn keyword cConstant SolidearthSettingsRunFrequencyEnum
    322322syn keyword cConstant SealevelriseHElasticEnum
    323 syn keyword cConstant SealevelriseHorizEnum
    324 syn keyword cConstant SealevelriseMaxiterEnum
    325 syn keyword cConstant SealevelriseOceanAreaScalingEnum
    326 syn keyword cConstant SealevelrisePolarMoiEnum
    327 syn keyword cConstant SealevelriseReltolEnum
     323syn keyword cConstant SolidearthSettingsHorizEnum
     324syn keyword cConstant SolidearthSettingsMaxiterEnum
     325syn keyword cConstant SolidearthSettingsOceanAreaScalingEnum
     326syn keyword cConstant RotationalPolarMoiEnum
     327syn keyword cConstant SolidearthSettingsReltolEnum
    328328syn keyword cConstant SealevelriseRequestedOutputsEnum
    329 syn keyword cConstant SealevelriseRigidEnum
    330 syn keyword cConstant SealevelriseRotationEnum
     329syn keyword cConstant SolidearthSettingsRigidEnum
     330syn keyword cConstant SolidearthSettingsRotationEnum
    331331syn keyword cConstant SealevelriseRunCountEnum
    332 syn keyword cConstant SealevelriseTidalLoveHEnum
    333 syn keyword cConstant SealevelriseTidalLoveKEnum
     332syn keyword cConstant TidalLoveHEnum
     333syn keyword cConstant TidalLoveKEnum
    334334syn keyword cConstant SealevelriseTransitionsEnum
    335335syn keyword cConstant SealevelriseUElasticEnum
    … …  
    687687syn keyword cConstant SealevelriseCumDeltathicknessEnum
    688688syn keyword cConstant SealevelriseCumDeltathicknessOldEnum
    689 syn keyword cConstant SealevelriseDeltathicknessEnum
    690 syn keyword cConstant SealevelriseSpcthicknessEnum
    691 syn keyword cConstant SealevelriseHydroRateEnum
     689syn keyword cConstant SurfaceloadOtherEnum
     690syn keyword cConstant SurfaceloadIceThicknessChangeEnum
     691syn keyword cConstant SurfaceloadWaterHeightChangeEnum
    692692syn keyword cConstant SealevelriseIndicesEnum
    693693syn keyword cConstant SealevelriseGEnum

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

    r25066 r25118  
    301301        RootPathEnum,
    302302        SaveResultsEnum,
    303         SealevelPlanetRadiusEnum,
    304         SealevelPlanetAreaEnum,
     303        SolidearthPlanetRadiusEnum,
     304        SolidearthPlanetAreaEnum,
    305305        SealevelEustaticEnum,
    306         SealevelriseAbstolEnum,
    307         SealevelriseAngularVelocityEnum,
    308         SealevelriseElasticEnum,
     306        SolidearthSettingsAbstolEnum,
     307        RotationalAngularVelocityEnum,
     308        SolidearthSettingsElasticEnum,
    309309        SealevelriseGeometryDoneEnum,
    310         SealevelriseEquatorialMoiEnum,
    311         SealevelriseFluidLoveEnum,
     310        RotationalEquatorialMoiEnum,
     311        TidalLoveK2SecularEnum,
    312312        SealevelriseGRigidEnum,
    313313        SealevelriseGElasticEnum,
    314         SealevelriseGeodeticEnum,
    315         SealevelriseGeodeticRunFrequencyEnum,
     314        SolidearthSettingsComputesealevelchangeEnum,
     315        SolidearthSettingsRunFrequencyEnum,
    316316        SealevelriseHElasticEnum,
    317         SealevelriseHorizEnum,
    318         SealevelriseMaxiterEnum,
    319         SealevelriseOceanAreaScalingEnum,
    320         SealevelrisePolarMoiEnum,
    321         SealevelriseReltolEnum,
     317        SolidearthSettingsHorizEnum,
     318        SolidearthSettingsMaxiterEnum,
     319        SolidearthSettingsOceanAreaScalingEnum,
     320        RotationalPolarMoiEnum,
     321        SolidearthSettingsReltolEnum,
    322322        SealevelriseRequestedOutputsEnum,
    323         SealevelriseRigidEnum,
    324         SealevelriseRotationEnum,
     323        SolidearthSettingsRigidEnum,
     324        SolidearthSettingsRotationEnum,
    325325        SealevelriseRunCountEnum,
    326         SealevelriseTidalLoveHEnum,
    327         SealevelriseTidalLoveKEnum,
     326        TidalLoveHEnum,
     327        TidalLoveKEnum,
    328328        SealevelriseTransitionsEnum,
    329329        SealevelriseUElasticEnum,
    … …  
    684684        SealevelriseCumDeltathicknessEnum,
    685685        SealevelriseCumDeltathicknessOldEnum,
    686         SealevelriseDeltathicknessEnum,
    687         SealevelriseSpcthicknessEnum,
    688         SealevelriseHydroRateEnum,
     686        SurfaceloadOtherEnum,
     687        SurfaceloadIceThicknessChangeEnum,
     688        SurfaceloadWaterHeightChangeEnum,
    689689        SealevelriseIndicesEnum,
    690690        SealevelriseGEnum,

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

    r25066 r25118  
    309309                case RootPathEnum : return "RootPath";
    310310                case SaveResultsEnum : return "SaveResults";
    311                 case SealevelPlanetRadiusEnum : return "SealevelPlanetRadius";
    312                 case SealevelPlanetAreaEnum : return "SealevelPlanetArea";
     311                case SolidearthPlanetRadiusEnum : return "SolidearthPlanetRadius";
     312                case SolidearthPlanetAreaEnum : return "SolidearthPlanetArea";
    313313                case SealevelEustaticEnum : return "SealevelEustatic";
    314                 case SealevelriseAbstolEnum : return "SealevelriseAbstol";
    315                 case SealevelriseAngularVelocityEnum : return "SealevelriseAngularVelocity";
    316                 case SealevelriseElasticEnum : return "SealevelriseElastic";
     314                case SolidearthSettingsAbstolEnum : return "SolidearthSettingsAbstol";
     315                case RotationalAngularVelocityEnum : return "RotationalAngularVelocity";
     316                case SolidearthSettingsElasticEnum : return "SolidearthSettingsElastic";
    317317                case SealevelriseGeometryDoneEnum : return "SealevelriseGeometryDone";
    318                 case SealevelriseEquatorialMoiEnum : return "SealevelriseEquatorialMoi";
    319                 case SealevelriseFluidLoveEnum : return "SealevelriseFluidLove";
     318                case RotationalEquatorialMoiEnum : return "RotationalEquatorialMoi";
     319                case TidalLoveK2SecularEnum : return "TidalLoveK2Secular";
    320320                case SealevelriseGRigidEnum : return "SealevelriseGRigid";
    321321                case SealevelriseGElasticEnum : return "SealevelriseGElastic";
    322                 case SealevelriseGeodeticEnum : return "SealevelriseGeodetic";
    323                 case SealevelriseGeodeticRunFrequencyEnum : return "SealevelriseGeodeticRunFrequency";
     322                case SolidearthSettingsComputesealevelchangeEnum : return "SolidearthSettingsComputesealevelchange";
     323                case SolidearthSettingsRunFrequencyEnum : return "SolidearthSettingsRunFrequency";
    324324                case SealevelriseHElasticEnum : return "SealevelriseHElastic";
    325                 case SealevelriseHorizEnum : return "SealevelriseHoriz";
    326                 case SealevelriseMaxiterEnum : return "SealevelriseMaxiter";
    327                 case SealevelriseOceanAreaScalingEnum : return "SealevelriseOceanAreaScaling";
    328                 case SealevelrisePolarMoiEnum : return "SealevelrisePolarMoi";
    329                 case SealevelriseReltolEnum : return "SealevelriseReltol";
     325                case SolidearthSettingsHorizEnum : return "SolidearthSettingsHoriz";
     326                case SolidearthSettingsMaxiterEnum : return "SolidearthSettingsMaxiter";
     327                case SolidearthSettingsOceanAreaScalingEnum : return "SolidearthSettingsOceanAreaScaling";
     328                case RotationalPolarMoiEnum : return "RotationalPolarMoi";
     329                case SolidearthSettingsReltolEnum : return "SolidearthSettingsReltol";
    330330                case SealevelriseRequestedOutputsEnum : return "SealevelriseRequestedOutputs";
    331                 case SealevelriseRigidEnum : return "SealevelriseRigid";
    332                 case SealevelriseRotationEnum : return "SealevelriseRotation";
     331                case SolidearthSettingsRigidEnum : return "SolidearthSettingsRigid";
     332                case SolidearthSettingsRotationEnum : return "SolidearthSettingsRotation";
    333333                case SealevelriseRunCountEnum : return "SealevelriseRunCount";
    334                 case SealevelriseTidalLoveHEnum : return "SealevelriseTidalLoveH";
    335                 case SealevelriseTidalLoveKEnum : return "SealevelriseTidalLoveK";
     334                case TidalLoveHEnum : return "TidalLoveH";
     335                case TidalLoveKEnum : return "TidalLoveK";
    336336                case SealevelriseTransitionsEnum : return "SealevelriseTransitions";
    337337                case SealevelriseUElasticEnum : return "SealevelriseUElastic";
    … …  
    689689                case SealevelriseCumDeltathicknessEnum : return "SealevelriseCumDeltathickness";
    690690                case SealevelriseCumDeltathicknessOldEnum : return "SealevelriseCumDeltathicknessOld";
    691                 case SealevelriseDeltathicknessEnum : return "SealevelriseDeltathickness";
    692                 case SealevelriseSpcthicknessEnum : return "SealevelriseSpcthickness";
    693                 case SealevelriseHydroRateEnum : return "SealevelriseHydroRate";
     691                case SurfaceloadOtherEnum : return "SurfaceloadOther";
     692                case SurfaceloadIceThicknessChangeEnum : return "SurfaceloadIceThicknessChange";
     693                case SurfaceloadWaterHeightChangeEnum : return "SurfaceloadWaterHeightChange";
    694694                case SealevelriseIndicesEnum : return "SealevelriseIndices";
    695695                case SealevelriseGEnum : return "SealevelriseG";

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

    r25066 r25118  
    315315              else if (strcmp(name,"RootPath")==0) return RootPathEnum;
    316316              else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum;
    317               else if (strcmp(name,"SealevelPlanetRadius")==0) return SealevelPlanetRadiusEnum;
    318               else if (strcmp(name,"SealevelPlanetArea")==0) return SealevelPlanetAreaEnum;
     317              else if (strcmp(name,"SolidearthPlanetRadius")==0) return SolidearthPlanetRadiusEnum;
     318              else if (strcmp(name,"SolidearthPlanetArea")==0) return SolidearthPlanetAreaEnum;
    319319              else if (strcmp(name,"SealevelEustatic")==0) return SealevelEustaticEnum;
    320               else if (strcmp(name,"SealevelriseAbstol")==0) return SealevelriseAbstolEnum;
    321               else if (strcmp(name,"SealevelriseAngularVelocity")==0) return SealevelriseAngularVelocityEnum;
    322               else if (strcmp(name,"SealevelriseElastic")==0) return SealevelriseElasticEnum;
     320              else if (strcmp(name,"SolidearthSettingsAbstol")==0) return SolidearthSettingsAbstolEnum;
     321              else if (strcmp(name,"RotationalAngularVelocity")==0) return RotationalAngularVelocityEnum;
     322              else if (strcmp(name,"SolidearthSettingsElastic")==0) return SolidearthSettingsElasticEnum;
    323323              else if (strcmp(name,"SealevelriseGeometryDone")==0) return SealevelriseGeometryDoneEnum;
    324               else if (strcmp(name,"SealevelriseEquatorialMoi")==0) return SealevelriseEquatorialMoiEnum;
    325               else if (strcmp(name,"SealevelriseFluidLove")==0) return SealevelriseFluidLoveEnum;
     324              else if (strcmp(name,"RotationalEquatorialMoi")==0) return RotationalEquatorialMoiEnum;
     325              else if (strcmp(name,"TidalLoveK2Secular")==0) return TidalLoveK2SecularEnum;
    326326              else if (strcmp(name,"SealevelriseGRigid")==0) return SealevelriseGRigidEnum;
    327327              else if (strcmp(name,"SealevelriseGElastic")==0) return SealevelriseGElasticEnum;
    328               else if (strcmp(name,"SealevelriseGeodetic")==0) return SealevelriseGeodeticEnum;
    329               else if (strcmp(name,"SealevelriseGeodeticRunFrequency")==0) return SealevelriseGeodeticRunFrequencyEnum;
     328              else if (strcmp(name,"SolidearthSettingsComputesealevelchange")==0) return SolidearthSettingsComputesealevelchangeEnum;
     329              else if (strcmp(name,"SolidearthSettingsRunFrequency")==0) return SolidearthSettingsRunFrequencyEnum;
    330330              else if (strcmp(name,"SealevelriseHElastic")==0) return SealevelriseHElasticEnum;
    331               else if (strcmp(name,"SealevelriseHoriz")==0) return SealevelriseHorizEnum;
    332               else if (strcmp(name,"SealevelriseMaxiter")==0) return SealevelriseMaxiterEnum;
    333               else if (strcmp(name,"SealevelriseOceanAreaScaling")==0) return SealevelriseOceanAreaScalingEnum;
    334               else if (strcmp(name,"SealevelrisePolarMoi")==0) return SealevelrisePolarMoiEnum;
    335               else if (strcmp(name,"SealevelriseReltol")==0) return SealevelriseReltolEnum;
     331              else if (strcmp(name,"SolidearthSettingsHoriz")==0) return SolidearthSettingsHorizEnum;
     332              else if (strcmp(name,"SolidearthSettingsMaxiter")==0) return SolidearthSettingsMaxiterEnum;
     333              else if (strcmp(name,"SolidearthSettingsOceanAreaScaling")==0) return SolidearthSettingsOceanAreaScalingEnum;
     334              else if (strcmp(name,"RotationalPolarMoi")==0) return RotationalPolarMoiEnum;
     335              else if (strcmp(name,"SolidearthSettingsReltol")==0) return SolidearthSettingsReltolEnum;
    336336              else if (strcmp(name,"SealevelriseRequestedOutputs")==0) return SealevelriseRequestedOutputsEnum;
    337               else if (strcmp(name,"SealevelriseRigid")==0) return SealevelriseRigidEnum;
    338               else if (strcmp(name,"SealevelriseRotation")==0) return SealevelriseRotationEnum;
     337              else if (strcmp(name,"SolidearthSettingsRigid")==0) return SolidearthSettingsRigidEnum;
     338              else if (strcmp(name,"SolidearthSettingsRotation")==0) return SolidearthSettingsRotationEnum;
    339339              else if (strcmp(name,"SealevelriseRunCount")==0) return SealevelriseRunCountEnum;
    340               else if (strcmp(name,"SealevelriseTidalLoveH")==0) return SealevelriseTidalLoveHEnum;
    341               else if (strcmp(name,"SealevelriseTidalLoveK")==0) return SealevelriseTidalLoveKEnum;
     340              else if (strcmp(name,"TidalLoveH")==0) return TidalLoveHEnum;
     341              else if (strcmp(name,"TidalLoveK")==0) return TidalLoveKEnum;
    342342              else if (strcmp(name,"SealevelriseTransitions")==0) return SealevelriseTransitionsEnum;
    343343              else if (strcmp(name,"SealevelriseUElastic")==0) return SealevelriseUElasticEnum;
    … …  
    704704              else if (strcmp(name,"SealevelriseCumDeltathickness")==0) return SealevelriseCumDeltathicknessEnum;
    705705              else if (strcmp(name,"SealevelriseCumDeltathicknessOld")==0) return SealevelriseCumDeltathicknessOldEnum;
    706               else if (strcmp(name,"SealevelriseDeltathickness")==0) return SealevelriseDeltathicknessEnum;
    707               else if (strcmp(name,"SealevelriseSpcthickness")==0) return SealevelriseSpcthicknessEnum;
    708               else if (strcmp(name,"SealevelriseHydroRate")==0) return SealevelriseHydroRateEnum;
     706              else if (strcmp(name,"SurfaceloadOther")==0) return SurfaceloadOtherEnum;
     707              else if (strcmp(name,"SurfaceloadIceThicknessChange")==0) return SurfaceloadIceThicknessChangeEnum;
     708              else if (strcmp(name,"SurfaceloadWaterHeightChange")==0) return SurfaceloadWaterHeightChangeEnum;
    709709              else if (strcmp(name,"SealevelriseIndices")==0) return SealevelriseIndicesEnum;
    710710              else if (strcmp(name,"SealevelriseG")==0) return SealevelriseGEnum;

  • issm/trunk-jpl/src/c/shared/io/Marshalling/IoCodeConversions.cpp

    r25066 r25118  
    163163                fieldname=xNew<char>((strlen(field)+1)); xMemCpy<char>(fieldname,field,(strlen(field)+1));
    164164        }
    165         else if(strcmp(string_in,"SealevelriseDeltathickness")==0){
    166                 const char* field = "md.slr.deltathickness";
    167                 input_enum        = SealevelriseDeltathicknessEnum;
     165        else if(strcmp(string_in,"SurfaceloadIceThicknessChange")==0){
     166                const char* field = "md.solidearth.surfaceload.iceheightchange";
     167                input_enum        = SurfaceloadIceThicknessChangeEnum;
    168168                fieldname=xNew<char>((strlen(field)+1)); xMemCpy<char>(fieldname,field,(strlen(field)+1));
    169169        }
    … …  
    178178                fieldname=xNew<char>((strlen(field)+1)); xMemCpy<char>(fieldname,field,(strlen(field)+1));
    179179        }
    180         else if(strcmp(string_in,"SealevelriseHydroRate")==0){
    181                 const char* field = "md.slr.hydro_rate";
    182                 input_enum        = SealevelriseHydroRateEnum;
     180        else if(strcmp(string_in,"SurfaceloadWaterHeightChange")==0){
     181                const char* field = "md.solidearth.surfaceload.waterheightchange";
     182                input_enum        = SurfaceloadWaterHeightChangeEnum;
    183183                fieldname=xNew<char>((strlen(field)+1)); xMemCpy<char>(fieldname,field,(strlen(field)+1));
    184184        }

  • issm/trunk-jpl/src/m/classes/model.m

    r25074 r25118  
    2323                rifts            = 0;
    2424                dsl              = 0;
    25                 slr              = 0;
     25                solidearth       = 0;
    2626
    2727                debug            = 0;
    … …  
    126126                        if isa(md.calving,'double'); md.calving=calving(); end
    127127                        %2016 February 3
    128                         if isa(md.slr,'double'); md.slr=slr(); end
     128                        if isa(md.slr,'double'); md.solidearth=solidearth(); end
    129129                        %2016 October 11
    130130                        if isa(md.esa,'double'); md.esa=esa(); end
    … …  
    888888                        md.frontalforcings=extrude(md.frontalforcings,md);
    889889                        md.hydrology = extrude(md.hydrology,md);
    890                         md.slr = extrude(md.slr,md);
     890                        md.solidearth = extrude(md.solidearth,md);
    891891                        md.dsl = extrude(md.dsl,md);
    892892
    … …  
    12091209                        md.friction         = friction();
    12101210                        md.rifts            = rifts();
    1211                         md.slr              = slr();
     1211                        md.solidearth       = solidearth();
    12121212                        md.dsl              = dsl();
    12131213                        md.timestepping     = timestepping();
    … …  
    13901390                        disp(sprintf('%19s: %-22s -- %s','initialization'  ,['[1x1 ' class(self.initialization) ']'],'initial guess/state'));
    13911391                        disp(sprintf('%19s: %-22s -- %s','rifts'           ,['[1x1 ' class(self.rifts) ']'],'rifts properties'));
    1392                         disp(sprintf('%19s: %-22s -- %s','slr'             ,['[1x1 ' class(self.slr) ']'],'slr forcings'));
     1392                        disp(sprintf('%19s: %-22s -- %s','solidearth'      ,['[1x1 ' class(self.solidearth) ']'],'solidearth inputs and settings'));
    13931393                        disp(sprintf('%19s: %-22s -- %s','dsl'             ,['[1x1 ' class(self.dsl) ']'],'dynamic sea-level '));
    13941394                        disp(sprintf('%19s: %-22s -- %s','debug'           ,['[1x1 ' class(self.debug) ']'],'debugging tools (valgrind, gprof)'));
Note: See TracChangeset for help on using the changeset viewer.