Changeset 25252


Ignore:
Timestamp:
07/10/20 10:50:37 (5 years ago)
Author:
jdquinn
Message:

BUG: Reverting recent changes until Basile can review

Location:
issm/trunk-jpl/src/c
Files:
9 edited

Legend:

Unmodified
Added
Removed

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

    r25251 r25252  
    224224                basalelement->NodalFunctions(basis,gauss);
    225225
    226                 epl_transmitivity = EplTransmitivity(basalelement,gauss,epl_thick_input);
    227                 epl_storing                             = EplStoring(basalelement,gauss,epl_thick_input);
     226                epl_transmitivity = EplTransmitivity(basalelement,gauss,epl_thick_input,epl_head_input,base_input);
     227                epl_storing                             = EplStoring(basalelement,gauss,epl_thick_input,epl_head_input,base_input);
    228228
    229229                /*Diffusivity*/
    … …  
    358358                basalelement ->JacobianDeterminant(&Jdet,xyz_list,gauss);
    359359                basalelement ->NodalFunctions(basis,gauss);
    360                 epl_storing     = EplStoring(basalelement,gauss,epl_thick_input);
    361                 epl_transmitivity = EplTransmitivity(basalelement,gauss,epl_thick_input);
     360                epl_storing     = EplStoring(basalelement,gauss,epl_thick_input,epl_head_input,base_input);
     361                epl_transmitivity = EplTransmitivity(basalelement,gauss,epl_thick_input,epl_head_input,base_input);
    362362
    363363                /*Loading term*/
    … …  
    386386        for(int iv=0;iv<numvertices;iv++){
    387387                gauss->GaussVertex(iv);
    388                 epl_transmitivity = EplTransmitivity(basalelement,gauss,epl_thick_input);
     388                epl_transmitivity = EplTransmitivity(basalelement,gauss,epl_thick_input,epl_head_input,base_input);
    389389                connectivity = IssmDouble(basalelement->VertexConnectivity(iv));
    390390                residual_input->GetInputValue(&residual,gauss);
    … …  
    453453
    454454/*Intermediaries*/
    455 IssmDouble HydrologyDCEfficientAnalysis::EplStoring(Element* element,Gauss* gauss, Input2* epl_thick_input){/*{{{*/
     455IssmDouble HydrologyDCEfficientAnalysis::EplStoring(Element* element,Gauss* gauss, Input2* epl_thick_input, Input2* epl_head_input, Input2* base_input){/*{{{*/
    456456        IssmDouble epl_storing;
    457457        IssmDouble water_sheet,storing;
    … …  
    484484        return storing;
    485485}/*}}}*/
    486 IssmDouble HydrologyDCEfficientAnalysis::EplTransmitivity(Element* element,Gauss* gauss, Input2* epl_thick_input){/*{{{*/
     486IssmDouble HydrologyDCEfficientAnalysis::EplTransmitivity(Element* element,Gauss* gauss, Input2* epl_thick_input, Input2* epl_head_input, Input2* base_input){/*{{{*/
    487487        IssmDouble epl_transmitivity;
    488488        IssmDouble water_sheet;

  • issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.h

    r25247 r25252  
    3535
    3636                /*Intermediaries*/
    37                 IssmDouble EplStoring(Element* element,Gauss* gauss, Input2* epl_thick_input);
    38                 IssmDouble EplTransmitivity(Element* element,Gauss* gauss, Input2* epl_thick_input);
     37                IssmDouble EplStoring(Element* element,Gauss* gauss, Input2* epl_thick_input, Input2* epl_head_input, Input2* base_input);
     38                IssmDouble EplTransmitivity(Element* element,Gauss* gauss, Input2* epl_thick_input, Input2* epl_head_input, Input2* base_input);
    3939                void GetHydrologyDCInefficientHmax(IssmDouble* ph_max,Element* element, Node* innode);
    4040                IssmDouble GetHydrologyKMatrixTransfer(Element* element);

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

    r25247 r25252  
    238238        Input2* sed_head_input = basalelement->GetInput2(SedimentHeadSubstepEnum);
    239239        Input2* base_input     = basalelement->GetInput2(BaseEnum);
     240        Input2* old_wh_input   = basalelement->GetInput2(SedimentHeadOldEnum);                  _assert_(old_wh_input);
    240241
    241242        /*Transfer related Inputs*/
    … …  
    243244                basalelement->GetInput2Value(&active_element,HydrologydcMaskEplactiveEltEnum);
    244245        }
     246
    245247        /* Start  looping on the number of gaussian points: */
    246248        Gauss* gauss=basalelement->NewGauss(2);
    247249
    248250        for(int ig=gauss -> begin();ig<gauss->end();ig++){
    249                 gauss       ->GaussPoint(ig);
    250                 basalelement->JacobianDeterminant(&Jdet,xyz_list,gauss);
     251                gauss          -> GaussPoint(ig);
     252                basalelement   -> JacobianDeterminant(&Jdet,xyz_list,gauss);
    251253                basalelement->NodalFunctionsDerivatives(dbasis,xyz_list,gauss);
    252254                basalelement->NodalFunctions(basis,gauss);
    … …  
    257259                /*Diffusivity*/
    258260                D_scalar=sediment_transmitivity*gauss->weight*Jdet;
     261                //D_scalar=gauss->weight*Jdet;
    259262                if(dt!=0.) D_scalar=D_scalar*dt;
    260263                for(int i=0;i<numnodes;i++){
    … …  
    263266                        }
    264267                }
     268
    265269                /*Transient*/
    266270                if(dt!=0.){
    267271                        D_scalar=sediment_storing*gauss->weight*Jdet;
     272                        //D_scalar=(sediment_storing/sediment_transmitivity)*gauss->weight*Jdet;
    268273                        for(int i=0;i<numnodes;i++) for(int j=0;j<numnodes;j++) Ke->values[i*numnodes+j] += D_scalar*basis[j]*basis[i];
     274
    269275                        /*Transfer EPL part*/
    270276                        if(isefficientlayer){
    … …  
    272278                                        transfer=GetHydrologyKMatrixTransfer(basalelement);
    273279                                        D_scalar=dt*transfer*gauss->weight*Jdet;
     280                                        //D_scalar=dt*(transfer/sediment_transmitivity)*gauss->weight*Jdet;
    274281                                        for(int i=0;i<numnodes;i++) for(int j=0;j<numnodes;j++) Ke->values[i*numnodes+j] += D_scalar*basis[j]*basis[i];
    275282                                }
    … …  
    291298
    292299        /*Intermediaries*/
    293         bool            thawed_element;
    294         int             domaintype;
     300        bool             thawed_element;
     301        int                      domaintype;
    295302        Element* basalelement;
    296303
    … …  
    321328        /*Intermediaries */
    322329        bool       active_element,isefficientlayer;
    323         int        smb_model,smbsubstepping;
    324         int        hydrologysubstepping,smb_averaging;
     330        int        smb_model;
     331        int        smbsubstepping;
     332        int        hydrologysubstepping;
     333        int        smb_averaging;
    325334        IssmDouble dt,scalar,sediment_storing;
    326335        IssmDouble water_head,sediment_transmitivity;
    327336        IssmDouble water_load,runoff_value,transfer;
    328         IssmDouble Jdet,time;
     337        IssmDouble Jdet;
    329338
    330339        IssmDouble *xyz_list             = NULL;
    … …  
    346355        basalelement->FindParam(&isefficientlayer,HydrologydcIsefficientlayerEnum);
    347356        basalelement->FindParam(&smb_model,SmbEnum);
     357        basalelement->FindParam(&smb_averaging,SmbAveragingEnum);
    348358
    349359        Input2* sed_head_input   = basalelement->GetInput2(SedimentHeadSubstepEnum);
    … …  
    353363        Input2* SedTrans_input   = basalelement->GetInput2(HydrologydcSedimentTransmitivityEnum); _assert_(SedTrans_input);
    354364
     365        IssmDouble time;
     366        basalelement->FindParam(&time,TimeEnum);
     367
    355368        if(dt!= 0.){
    356369                old_wh_input = basalelement->GetInput2(SedimentHeadOldEnum); _assert_(old_wh_input);
    357370        }
    358371        if(smb_model==SMBgradientscomponentsEnum){
    359                 basalelement->FindParam(&time,TimeEnum);
    360372                basalelement->FindParam(&smbsubstepping,SmbStepsPerStepEnum);
    361373                basalelement->FindParam(&hydrologysubstepping,HydrologyStepsPerStepEnum);
    … …  
    371383                else{
    372384                        //finer stepping in smb, we average the runoff from transient input
    373                         basalelement->FindParam(&smb_averaging,SmbAveragingEnum);
    374385                        dummy_input = basalelement->GetInput2(SmbRunoffTransientEnum,time-dt,time,smb_averaging); _assert_(dummy_input);
    375386                }
    … …  
    384395        /* Start  looping on the number of gaussian points: */
    385396        Gauss* gauss=basalelement->NewGauss(2);
     397
     398        IssmDouble yts;
     399        basalelement->FindParam(&yts,ConstantsYtsEnum);
    386400
    387401        for(int ig=gauss->begin();ig<gauss->end();ig++){
    … …  
    397411                        else                     runoff_value = 0.;
    398412                        scalar = Jdet*gauss->weight*(water_load+runoff_value);
     413                        //scalar = Jdet*gauss->weight*(water_load)/sediment_transmitivity;
    399414                        if(dt!=0.) scalar = scalar*dt;
    400415                        for(int i=0;i<numnodes;i++){
    … …  
    409424                                else runoff_value = 0.;
    410425                                scalar = Jdet*gauss->weight*(water_load+runoff_value);
     426                                //scalar = Jdet*gauss->weight*(water_load)/sediment_transmitivity;
    411427                                if(dt!=0.) scalar = scalar*dt;
    412428                                for(int i=0;i<numnodes;i++){
    … …  
    429445                                }
    430446                                scalar = Jdet*gauss->weight*((water_head*sediment_storing)+(dt*transfer));
     447                                //scalar = Jdet*gauss->weight*((water_head*sediment_storing)+(dt*transfer))/sediment_transmitivity;
    431448                                for(int i=0;i<numnodes;i++)pe->values[i]+=scalar*basis[i];
    432449                        }
    433450                        else{
    434451                                scalar = Jdet*gauss->weight*(water_head*sediment_storing);
     452                                //scalar = Jdet*gauss->weight*(water_head*sediment_storing)/sediment_transmitivity;
    435453                                for(int i=0;i<numnodes;i++)pe->values[i]+=scalar*basis[i];
    436454                        }
    … …  
    553571        IssmDouble storing,yield;
    554572        IssmDouble base_elev,prestep_head,water_sheet;
    555         IssmDouble porewater_mass           = element->FindParam(HydrologydcSedimentPoreWaterMassEnum);
    556         IssmDouble layer_compressibility    = element->FindParam(HydrologydcSedimentLayerCompressibilityEnum);
     573        IssmDouble rho_freshwater           = element->FindParam(MaterialsRhoFreshwaterEnum);
     574        IssmDouble g                        = element->FindParam(ConstantsGEnum);
     575        IssmDouble sediment_porosity        = element->FindParam(HydrologydcSedimentPorosityEnum);
    557576        IssmDouble sediment_thickness       = element->FindParam(HydrologydcSedimentThicknessEnum);
     577        IssmDouble sediment_compressibility = element->FindParam(HydrologydcSedimentCompressibilityEnum);
     578        IssmDouble water_compressibility    = element->FindParam(HydrologydcWaterCompressibilityEnum);
    558579        element->FindParam(&unconf_scheme,HydrologydcUnconfinedFlagEnum);
    559580        switch(unconf_scheme){
    560581        case 0:
    561                 sediment_storing=porewater_mass*sediment_thickness*layer_compressibility;
     582                sediment_storing=rho_freshwater*g*sediment_porosity*sediment_thickness*(water_compressibility+(sediment_compressibility/sediment_porosity));
    562583                break;
    563584        case 1:
    564                 yield = element->FindParam(HydrologydcSedimentPorosityEnum);
    565585                base_input->GetInputValue(&base_elev,gauss);
    566586                sed_head_input->GetInputValue(&prestep_head,gauss);
    567 
    568587                water_sheet=max(0.0,(prestep_head-(base_elev-sediment_thickness)));
    569                 storing=porewater_mass*sediment_thickness*layer_compressibility;
     588
     589                /* if (water_sheet<sediment_thickness){ */
     590                /*      sediment_storing=rho_freshwater*g*sediment_porosity*sediment_thickness*(water_compressibility+(sediment_compressibility/sediment_porosity)); */
     591                /* } */
     592                /* else{ */
     593                /*      sediment_storing=sediment_porosity; */
     594                /* } */
     595                storing=rho_freshwater*g*sediment_porosity*sediment_thickness*(water_compressibility+(sediment_compressibility/sediment_porosity));
    570596                //using logistic function for heavyside approximation
    571597                expfac=10.;
     598                yield=sediment_porosity;
    572599                sediment_storing=yield+(storing-yield)/(1+exp(-2*expfac*(water_sheet-0.99*sediment_thickness)));
    573600                break;
    … …  
    579606IssmDouble HydrologyDCInefficientAnalysis::SedimentTransmitivity(Element* element,Gauss* gauss,Input2* sed_head_input, Input2* base_input,Input2* SedTrans_input){/*{{{*/
    580607        int unconf_scheme;
     608        IssmDouble ratio,expfac;
    581609        IssmDouble sediment_transmitivity;
    582610        IssmDouble FullLayer_transmitivity;
     611        IssmDouble meltingrate;
     612        IssmDouble groundedice;
    583613        IssmDouble base_elev,prestep_head,water_sheet;
    584614        IssmDouble sediment_thickness       = element->FindParam(HydrologydcSedimentThicknessEnum);

  • issm/trunk-jpl/src/c/classes/Inputs2/TransientInput2.cpp

    r25247 r25252  
    420420                /*If already processed return*/
    421421                if(fabs(this->current_step-this_step)<1.e-5) return;
     422                //              if(this->current_step>this_step-1.e-5 && this->current_step<this_step+1.e-5) return;
    422423
    423424                /*Prepare input*/

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

    r25247 r25252  
    11/*!\file: CreateParameters.cpp
    22 * \brief general driver for creating parameters dataset
    3  */
     3 */ 
    44
    55#ifdef HAVE_CONFIG_H
    … …  
    6363        parameters->AddObject(iomodel->CopyConstantObject("md.calving.law",CalvingLawEnum));
    6464        parameters->AddObject(iomodel->CopyConstantObject("md.frontalforcings.parameterization",FrontalForcingsParamEnum));
    65         parameters->AddObject(new IntParam(SealevelriseRunCountEnum,1));
     65        parameters->AddObject(new IntParam(SealevelriseRunCountEnum,1)); 
    6666
    6767          {/*This is specific to ice...*/
    … …  
    9898          }
    9999
    100         /*amr properties*/
     100        /*amr properties*/     
    101101        int amrtype,amr_frequency;
    102102        iomodel->FindConstant(&amr_frequency,"md.transient.amr_frequency");
    … …  
    156156                case LinearFloatingMeltRateEnum:
    157157                        iomodel->FindConstant(&interp,"md.timestepping.interp_forcings");
    158                         iomodel->FetchData(&transparam,&N,&M,"md.basalforcings.deepwater_melting_rate");
     158                        iomodel->FetchData(&transparam,&N,&M,"md.basalforcings.deepwater_melting_rate"); 
    159159                        if(N==1){
    160160                                _assert_(M==1);
    … …  
    166166                        }
    167167                        xDelete<IssmDouble>(transparam);
    168                         iomodel->FetchData(&transparam,&N,&M,"md.basalforcings.upperwater_melting_rate");
     168                        iomodel->FetchData(&transparam,&N,&M,"md.basalforcings.upperwater_melting_rate"); 
    169169                        if(N==1){
    170170                                _assert_(M==1);
    … …  
    176176                        }
    177177                        xDelete<IssmDouble>(transparam);
    178                         iomodel->FetchData(&transparam,&N,&M,"md.basalforcings.deepwater_elevation");
     178                        iomodel->FetchData(&transparam,&N,&M,"md.basalforcings.deepwater_elevation"); 
    179179                        if(N==1){
    180180                                _assert_(M==1);
    … …  
    183183                        else{
    184184                                _assert_(N==2);
    185                                 parameters->AddObject(new TransientParam(BasalforcingsDeepwaterElevationEnum,&transparam[0],&transparam[M],interp,M));
    186                         }
    187                         xDelete<IssmDouble>(transparam);
    188                         iomodel->FetchData(&transparam,&N,&M,"md.basalforcings.upperwater_elevation");
     185                                parameters->AddObject(new TransientParam(BasalforcingsDeepwaterElevationEnum,&transparam[0],&transparam[M],interp,M)); 
     186                        }
     187                        xDelete<IssmDouble>(transparam);
     188                        iomodel->FetchData(&transparam,&N,&M,"md.basalforcings.upperwater_elevation"); 
    189189                        if(N==1){
    190190                                _assert_(M==1);
    … …  
    226226                        parameters->AddObject(iomodel->CopyConstantObject("md.basalforcings.isplume",BasalforcingsPicoIsplumeEnum));
    227227                        iomodel->FetchData(&transparam,&M,&N,"md.basalforcings.farocean_temperature");
    228                         _assert_(M>=1 && N>=1);
     228                        _assert_(M>=1 && N>=1); 
    229229                        parameters->AddObject(new TransientArrayParam(BasalforcingsPicoFarOceantemperatureEnum,transparam,&transparam[N*(M-1)],interp,N,M));
    230230                        xDelete<IssmDouble>(transparam);
    231231                        iomodel->FetchData(&transparam,&M,&N,"md.basalforcings.farocean_salinity");
    232                         _assert_(M>=1 && N>=1);
     232                        _assert_(M>=1 && N>=1); 
    233233                        parameters->AddObject(new TransientArrayParam(BasalforcingsPicoFarOceansalinityEnum,transparam,&transparam[N*(M-1)],interp,N,M));
    234234                        xDelete<IssmDouble>(transparam);
    … …  
    237237                        parameters->AddObject(iomodel->CopyConstantObject("md.basalforcings.num_basins",BasalforcingsIsmip6NumBasinsEnum));
    238238                        parameters->AddObject(iomodel->CopyConstantObject("md.basalforcings.gamma_0",BasalforcingsIsmip6Gamma0Enum));
    239                         parameters->AddObject(iomodel->CopyConstantObject("md.basalforcings.islocal",BasalforcingsIsmip6IsLocalEnum));
     239                        parameters->AddObject(iomodel->CopyConstantObject("md.basalforcings.islocal",BasalforcingsIsmip6IsLocalEnum)); 
    240240                        iomodel->FetchData(&transparam,&M,&N,"md.basalforcings.delta_t");
    241241                        parameters->AddObject(new DoubleVecParam(BasalforcingsIsmip6DeltaTEnum,transparam,N));
    … …  
    279279        }
    280280        iomodel->FindConstant(&time,"md.timestepping.start_time");
    281         parameters->AddObject(new DoubleParam(TimeEnum,time));
    282         parameters->AddObject(new IntParam(StepEnum,0));
     281        parameters->AddObject(new DoubleParam(TimeEnum,time)); 
     282        parameters->AddObject(new IntParam(StepEnum,0)); 
    283283
    284284        /*By default, save all results*/
    … …  
    421421        iomodel->FindConstant(&hydrology_model,"md.hydrology.model");
    422422        if(hydrology_model==HydrologydcEnum){
    423                 IssmDouble sedcomp, sedporo, watcomp, rhofresh, g;
    424 
    425423                /*FIXME: this cshould go to Analysis!!!*/
    426                 /* parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.sediment_compressibility",HydrologydcSedimentCompressibilityEnum)); */
    427                 /* parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.water_compressibility",HydrologydcWaterCompressibilityEnum)); */
     424                parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.sediment_compressibility",HydrologydcSedimentCompressibilityEnum));
    428425                parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.sediment_porosity",HydrologydcSedimentPorosityEnum));
    429426                parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.sediment_thickness",HydrologydcSedimentThicknessEnum));
     427                parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.water_compressibility",HydrologydcWaterCompressibilityEnum));
    430428                parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.isefficientlayer",HydrologydcIsefficientlayerEnum));
    431 
    432                 iomodel->FindConstant(&sedcomp,"md.hydrology.sediment_compressibility");
    433                 iomodel->FindConstant(&sedporo,"md.hydrology.sediment_porosity");
    434                 iomodel->FindConstant(&watcomp,"md.hydrology.water_compressibility");
    435                 iomodel->FindConstant(&rhofresh,"md.materials.rho_freshwater");
    436                 iomodel->FindConstant(&g,"md.constants.g");
    437 
    438                 parameters->AddObject(new DoubleParam(HydrologydcSedimentLayerCompressibilityEnum,(watcomp + sedcomp/sedporo)));
    439                 parameters->AddObject(new DoubleParam(HydrologydcSedimentPoreWaterMassEnum,(rhofresh*g*sedporo)));
    440 
    441429
    442430                bool isefficientlayer;
    443431                iomodel->FindConstant(&isefficientlayer,"md.hydrology.isefficientlayer");
    444432                if(isefficientlayer){
    445                         IssmDouble eplcomp, eplporo;
    446                         /* parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.epl_compressibility",HydrologydcEplCompressibilityEnum)); */
    447                         /* parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.epl_porosity",HydrologydcEplPorosityEnum)); */
     433                        parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.epl_compressibility",HydrologydcEplCompressibilityEnum));
     434                        parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.epl_porosity",HydrologydcEplPorosityEnum));
    448435                        parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.epl_initial_thickness",HydrologydcEplInitialThicknessEnum));
    449436                        parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.epl_colapse_thickness",HydrologydcEplColapseThicknessEnum));
    450437                        parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.epl_max_thickness",HydrologydcEplMaxThicknessEnum));
    451438                        parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.epl_conductivity",HydrologydcEplConductivityEnum));
    452 
    453                         iomodel->FindConstant(&eplcomp,"md.hydrology.epl_compressibility");
    454                         iomodel->FindConstant(&eplporo,"md.hydrology.epl_porosity");
    455                         parameters->AddObject(new DoubleParam(HydrologydcEplLayerCompressibilityEnum,(watcomp + eplcomp/eplporo)));
    456                         parameters->AddObject(new DoubleParam(HydrologydcEplPoreWaterMassEnum,(rhofresh*g*eplporo)));
    457439                }
    458440        }
    … …  
    490472        if(mass_flux_present){
    491473
    492                 /*Fetch the mass flux segments necessary to compute the mass fluxes.  Build a DoubleMatArrayParam object out of them: */
     474                /*Fetch the mass flux segments necessary to compute the mass fluxes.  Build a DoubleMatArrayParam object out of them: */ 
    493475                iomodel->FetchData(&array,&mdims_array,&ndims_array,&mass_flux_num_profiles,"md.qmu.mass_flux_segments");
    494476                if(mass_flux_num_profiles==0)_error_("mass_flux_num_profiles is 0, when MassFlux computations were requested!");
    … …  
    536518                        xDelete<IssmDouble>(matrix);
    537519                }
    538                 xDelete<int>(mdims_array);
     520                xDelete<int>(mdims_array); 
    539521                xDelete<int>(ndims_array);
    540522                xDelete<IssmDouble*>(array);

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

    r25248 r25252  
    182182syn keyword cConstant HydrologyStorageEnum
    183183syn keyword cConstant HydrologydcEplColapseThicknessEnum
     184syn keyword cConstant HydrologydcEplCompressibilityEnum
    184185syn keyword cConstant HydrologydcEplConductivityEnum
    185186syn keyword cConstant HydrologydcEplInitialThicknessEnum
    186 syn keyword cConstant HydrologydcEplLayerCompressibilityEnum
    187187syn keyword cConstant HydrologydcEplMaxThicknessEnum
    188 syn keyword cConstant HydrologydcEplPoreWaterMassEnum
     188syn keyword cConstant HydrologydcEplPorosityEnum
    189189syn keyword cConstant HydrologydcEplThickCompEnum
    190190syn keyword cConstant HydrologydcEplflipLockEnum
    … …  
    195195syn keyword cConstant HydrologydcPenaltyLockEnum
    196196syn keyword cConstant HydrologydcRelTolEnum
     197syn keyword cConstant HydrologydcSedimentCompressibilityEnum
    197198syn keyword cConstant HydrologydcSedimentlimitEnum
    198199syn keyword cConstant HydrologydcSedimentlimitFlagEnum
    199 syn keyword cConstant HydrologydcSedimentLayerCompressibilityEnum
    200 syn keyword cConstant HydrologydcSedimentPoreWaterMassEnum
    201200syn keyword cConstant HydrologydcSedimentPorosityEnum
    202201syn keyword cConstant HydrologydcSedimentThicknessEnum
    203202syn keyword cConstant HydrologydcTransferFlagEnum
    204203syn keyword cConstant HydrologydcUnconfinedFlagEnum
     204syn keyword cConstant HydrologydcWaterCompressibilityEnum
    205205syn keyword cConstant HydrologyshreveStabilizationEnum
    206206syn keyword cConstant IcecapToEarthCommEnum

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

    r25247 r25252  
    176176        HydrologyStorageEnum,
    177177        HydrologydcEplColapseThicknessEnum,
     178        HydrologydcEplCompressibilityEnum,
    178179        HydrologydcEplConductivityEnum,
    179180        HydrologydcEplInitialThicknessEnum,
    180         HydrologydcEplLayerCompressibilityEnum,
    181181        HydrologydcEplMaxThicknessEnum,
    182         HydrologydcEplPoreWaterMassEnum,
     182        HydrologydcEplPorosityEnum,
    183183        HydrologydcEplThickCompEnum,
    184184        HydrologydcEplflipLockEnum,
    … …  
    189189        HydrologydcPenaltyLockEnum,
    190190        HydrologydcRelTolEnum,
     191        HydrologydcSedimentCompressibilityEnum,
    191192        HydrologydcSedimentlimitEnum,
    192193        HydrologydcSedimentlimitFlagEnum,
    193         HydrologydcSedimentLayerCompressibilityEnum,
    194         HydrologydcSedimentPoreWaterMassEnum,
    195194        HydrologydcSedimentPorosityEnum,
    196195        HydrologydcSedimentThicknessEnum,
    197196        HydrologydcTransferFlagEnum,
    198197        HydrologydcUnconfinedFlagEnum,
     198        HydrologydcWaterCompressibilityEnum,
    199199        HydrologyshreveStabilizationEnum,
    200200        IcecapToEarthCommEnum,

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

    r25248 r25252  
    184184                case HydrologyStorageEnum : return "HydrologyStorage";
    185185                case HydrologydcEplColapseThicknessEnum : return "HydrologydcEplColapseThickness";
     186                case HydrologydcEplCompressibilityEnum : return "HydrologydcEplCompressibility";
    186187                case HydrologydcEplConductivityEnum : return "HydrologydcEplConductivity";
    187188                case HydrologydcEplInitialThicknessEnum : return "HydrologydcEplInitialThickness";
    188                 case HydrologydcEplLayerCompressibilityEnum : return "HydrologydcEplLayerCompressibility";
    189189                case HydrologydcEplMaxThicknessEnum : return "HydrologydcEplMaxThickness";
    190                 case HydrologydcEplPoreWaterMassEnum : return "HydrologydcEplPoreWaterMass";
     190                case HydrologydcEplPorosityEnum : return "HydrologydcEplPorosity";
    191191                case HydrologydcEplThickCompEnum : return "HydrologydcEplThickComp";
    192192                case HydrologydcEplflipLockEnum : return "HydrologydcEplflipLock";
    … …  
    197197                case HydrologydcPenaltyLockEnum : return "HydrologydcPenaltyLock";
    198198                case HydrologydcRelTolEnum : return "HydrologydcRelTol";
     199                case HydrologydcSedimentCompressibilityEnum : return "HydrologydcSedimentCompressibility";
    199200                case HydrologydcSedimentlimitEnum : return "HydrologydcSedimentlimit";
    200201                case HydrologydcSedimentlimitFlagEnum : return "HydrologydcSedimentlimitFlag";
    201                 case HydrologydcSedimentLayerCompressibilityEnum : return "HydrologydcSedimentLayerCompressibility";
    202                 case HydrologydcSedimentPoreWaterMassEnum : return "HydrologydcSedimentPoreWaterMass";
    203202                case HydrologydcSedimentPorosityEnum : return "HydrologydcSedimentPorosity";
    204203                case HydrologydcSedimentThicknessEnum : return "HydrologydcSedimentThickness";
    205204                case HydrologydcTransferFlagEnum : return "HydrologydcTransferFlag";
    206205                case HydrologydcUnconfinedFlagEnum : return "HydrologydcUnconfinedFlag";
     206                case HydrologydcWaterCompressibilityEnum : return "HydrologydcWaterCompressibility";
    207207                case HydrologyshreveStabilizationEnum : return "HydrologyshreveStabilization";
    208208                case IcecapToEarthCommEnum : return "IcecapToEarthComm";

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

    r25248 r25252  
    187187              else if (strcmp(name,"HydrologyStorage")==0) return HydrologyStorageEnum;
    188188              else if (strcmp(name,"HydrologydcEplColapseThickness")==0) return HydrologydcEplColapseThicknessEnum;
     189              else if (strcmp(name,"HydrologydcEplCompressibility")==0) return HydrologydcEplCompressibilityEnum;
    189190              else if (strcmp(name,"HydrologydcEplConductivity")==0) return HydrologydcEplConductivityEnum;
    190191              else if (strcmp(name,"HydrologydcEplInitialThickness")==0) return HydrologydcEplInitialThicknessEnum;
    191               else if (strcmp(name,"HydrologydcEplLayerCompressibility")==0) return HydrologydcEplLayerCompressibilityEnum;
    192192              else if (strcmp(name,"HydrologydcEplMaxThickness")==0) return HydrologydcEplMaxThicknessEnum;
    193               else if (strcmp(name,"HydrologydcEplPoreWaterMass")==0) return HydrologydcEplPoreWaterMassEnum;
     193              else if (strcmp(name,"HydrologydcEplPorosity")==0) return HydrologydcEplPorosityEnum;
    194194              else if (strcmp(name,"HydrologydcEplThickComp")==0) return HydrologydcEplThickCompEnum;
    195195              else if (strcmp(name,"HydrologydcEplflipLock")==0) return HydrologydcEplflipLockEnum;
    … …  
    200200              else if (strcmp(name,"HydrologydcPenaltyLock")==0) return HydrologydcPenaltyLockEnum;
    201201              else if (strcmp(name,"HydrologydcRelTol")==0) return HydrologydcRelTolEnum;
     202              else if (strcmp(name,"HydrologydcSedimentCompressibility")==0) return HydrologydcSedimentCompressibilityEnum;
    202203              else if (strcmp(name,"HydrologydcSedimentlimit")==0) return HydrologydcSedimentlimitEnum;
    203204              else if (strcmp(name,"HydrologydcSedimentlimitFlag")==0) return HydrologydcSedimentlimitFlagEnum;
    204               else if (strcmp(name,"HydrologydcSedimentLayerCompressibility")==0) return HydrologydcSedimentLayerCompressibilityEnum;
    205               else if (strcmp(name,"HydrologydcSedimentPoreWaterMass")==0) return HydrologydcSedimentPoreWaterMassEnum;
    206205              else if (strcmp(name,"HydrologydcSedimentPorosity")==0) return HydrologydcSedimentPorosityEnum;
    207206              else if (strcmp(name,"HydrologydcSedimentThickness")==0) return HydrologydcSedimentThicknessEnum;
    208207              else if (strcmp(name,"HydrologydcTransferFlag")==0) return HydrologydcTransferFlagEnum;
    209208              else if (strcmp(name,"HydrologydcUnconfinedFlag")==0) return HydrologydcUnconfinedFlagEnum;
     209              else if (strcmp(name,"HydrologydcWaterCompressibility")==0) return HydrologydcWaterCompressibilityEnum;
    210210              else if (strcmp(name,"HydrologyshreveStabilization")==0) return HydrologyshreveStabilizationEnum;
    211211              else if (strcmp(name,"IcecapToEarthComm")==0) return IcecapToEarthCommEnum;
Note: See TracChangeset for help on using the changeset viewer.