Changeset 18068


Ignore:
Timestamp:
05/28/14 16:26:33 (11 years ago)
Author:
seroussi
Message:

NEW: reorganizing basal melting

Location:
issm/trunk-jpl
Files:
2 added
138 edited

Legend:

Unmodified
Added
Removed

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

    r18062 r18068  
    4141        iomodel->FetchDataToInput(elements,VxEnum);
    4242        iomodel->FetchDataToInput(elements,VyEnum);
    43         iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
     43        iomodel->FetchDataToInput(elements,BasalforcingsGroundediceMeltingRateEnum);
    4444        iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum);
    4545        iomodel->FetchDataToInput(elements,BalancethicknessThickeningRateEnum);
    … …  
    354354        /*Retrieve all inputs and parameters*/
    355355        element->GetVerticesCoordinates(&xyz_list);
    356         Input* mb_input   = element->GetInput(BasalforcingsMeltingRateEnum);       _assert_(mb_input);
     356        Input* mb_input   = element->GetInput(BasalforcingsGroundediceMeltingRateEnum);       _assert_(mb_input);
    357357        Input* ms_input   = element->GetInput(SurfaceforcingsMassBalanceEnum);     _assert_(ms_input);
    358358        Input* dhdt_input = element->GetInput(BalancethicknessThickeningRateEnum); _assert_(dhdt_input);
    … …  
    395395        /*Retrieve all inputs and parameters*/
    396396        element->GetVerticesCoordinates(&xyz_list);
    397         Input* mb_input   = element->GetInput(BasalforcingsMeltingRateEnum);       _assert_(mb_input);
     397        Input* mb_input   = element->GetInput(BasalforcingsGroundediceMeltingRateEnum);       _assert_(mb_input);
    398398        Input* ms_input   = element->GetInput(SurfaceforcingsMassBalanceEnum);     _assert_(ms_input);
    399399        Input* dhdt_input = element->GetInput(BalancethicknessThickeningRateEnum); _assert_(dhdt_input);
    … …  
    512512        element->GetVerticesCoordinates(&xyz_list);
    513513        element->GradientIndexing(&vertexpidlist[0],control_index);
    514         Input* thickness_input            = element->GetInput(ThicknessEnum);                          _assert_(thickness_input);
    515         Input* thicknessobs_input         = element->GetInput(InversionThicknessObsEnum);              _assert_(thicknessobs_input);
    516         Input* weights_input              = element->GetInput(InversionCostFunctionsCoefficientsEnum); _assert_(weights_input);
    517         Input* vx_input                   = element->GetInput(VxEnum);                                 _assert_(vx_input);
    518         Input* vy_input                   = element->GetInput(VyEnum);                                 _assert_(vy_input);
    519         Input* surface_mass_balance_input = element->GetInput(SurfaceforcingsMassBalanceEnum);         _assert_(surface_mass_balance_input);
    520         Input* basal_melting_input        = element->GetInput(BasalforcingsMeltingRateEnum);          _assert_(basal_melting_input);
    521         Input* dhdt_input                 = element->GetInput(BalancethicknessThickeningRateEnum);     _assert_(dhdt_input);
     514        Input* thickness_input            = element->GetInput(ThicknessEnum);                           _assert_(thickness_input);
     515        Input* thicknessobs_input         = element->GetInput(InversionThicknessObsEnum);               _assert_(thicknessobs_input);
     516        Input* weights_input              = element->GetInput(InversionCostFunctionsCoefficientsEnum);  _assert_(weights_input);
     517        Input* vx_input                   = element->GetInput(VxEnum);                                  _assert_(vx_input);
     518        Input* vy_input                   = element->GetInput(VyEnum);                                  _assert_(vy_input);
     519        Input* surface_mass_balance_input = element->GetInput(SurfaceforcingsMassBalanceEnum);          _assert_(surface_mass_balance_input);
     520        Input* basal_melting_input        = element->GetInput(BasalforcingsGroundediceMeltingRateEnum); _assert_(basal_melting_input);
     521        Input* dhdt_input                 = element->GetInput(BalancethicknessThickeningRateEnum);      _assert_(dhdt_input);
    522522
    523523        /* Start  looping on the number of gaussian points: */

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

    r18057 r18068  
    2929        iomodel->FetchDataToInput(elements,VxEnum);
    3030        iomodel->FetchDataToInput(elements,VyEnum);
    31         iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
     31        iomodel->FetchDataToInput(elements,BasalforcingsGroundediceMeltingRateEnum);
    3232        iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum);
    3333        iomodel->FetchDataToInput(elements,BalancethicknessThickeningRateEnum);
    … …  
    183183        /*Retrieve all inputs and parameters*/
    184184        basalelement->GetVerticesCoordinates(&xyz_list);
    185         Input* ms_input   = basalelement->GetInput(SurfaceforcingsMassBalanceEnum);     _assert_(ms_input);
    186         Input* mb_input   = basalelement->GetInput(BasalforcingsMeltingRateEnum);      _assert_(mb_input);
    187         Input* dhdt_input = basalelement->GetInput(BalancethicknessThickeningRateEnum); _assert_(dhdt_input);
    188         Input* H_input    = basalelement->GetInput(ThicknessEnum);                      _assert_(H_input);
     185        Input* ms_input   = basalelement->GetInput(SurfaceforcingsMassBalanceEnum);          _assert_(ms_input);
     186        Input* mb_input   = basalelement->GetInput(BasalforcingsGroundediceMeltingRateEnum); _assert_(mb_input);
     187        Input* dhdt_input = basalelement->GetInput(BalancethicknessThickeningRateEnum);      _assert_(dhdt_input);
     188        Input* H_input    = basalelement->GetInput(ThicknessEnum);                           _assert_(H_input);
    189189        IssmDouble h = basalelement->CharacteristicLength();
    190190

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

    r18057 r18068  
    7171        iomodel->FetchDataToInput(elements,BasalforcingsGeothermalfluxEnum);
    7272        iomodel->FetchDataToInput(elements,WatercolumnEnum);
    73         iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
     73        iomodel->FetchDataToInput(elements,BasalforcingsGroundediceMeltingRateEnum);
    7474        iomodel->FetchDataToInput(elements,VxEnum);
    7575        iomodel->FetchDataToInput(elements,VyEnum);
    … …  
    8080        if(dakota_analysis){
    8181                elements->InputDuplicate(TemperatureEnum,QmuTemperatureEnum);
    82                 elements->InputDuplicate(BasalforcingsMeltingRateEnum,QmuMeltingEnum);
     82                elements->InputDuplicate(BasalforcingsGroundediceMeltingRateEnum,QmuMeltingEnum);
    8383                elements->InputDuplicate(VxMeshEnum,QmuVxMeshEnum);
    8484                elements->InputDuplicate(VxMeshEnum,QmuVyMeshEnum);
    … …  
    965965        element->GetInputListOnVertices(pressure,PressureEnum);
    966966        element->GetInputListOnVertices(watercolumn,WatercolumnEnum);
    967         element->GetInputListOnVertices(basalmeltingrate,BasalforcingsMeltingRateEnum);
     967        element->GetInputListOnVertices(basalmeltingrate,BasalforcingsGroundediceMeltingRateEnum);
    968968
    969969        Gauss* gauss=element->NewGauss();
    … …  
    10451045        element->AddInput(EnthalpyEnum,enthalpy,P1Enum);
    10461046        element->AddInput(WatercolumnEnum,watercolumn,P1Enum);
    1047         element->AddInput(BasalforcingsMeltingRateEnum,basalmeltingrate,P1Enum);
     1047        element->AddInput(BasalforcingsGroundediceMeltingRateEnum,basalmeltingrate,P1Enum);
    10481048
    10491049        /*Clean up and return*/

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

    r18057 r18068  
    3131        iomodel->FetchDataToInput(elements,SurfaceEnum);
    3232        iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
    33         iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
    34         iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateCorrectionEnum,0.);
     33        iomodel->FetchDataToInput(elements,BasalforcingsGroundediceMeltingRateEnum);
     34        iomodel->FetchDataToInput(elements,BasalforcingsFloatingiceMeltingRateEnum);
    3535        iomodel->FetchDataToInput(elements,VxEnum);
    3636        iomodel->FetchDataToInput(elements,VyEnum);
    … …  
    232232        int         domaintype,dim;
    233233        IssmDouble  Jdet,dt;
    234         IssmDouble  mb,mb_correction,bed,vz;
     234        IssmDouble  gmb,fmb,mb,bed,phi,vz;
    235235        Element*    basalelement = NULL;
    236236        IssmDouble *xyz_list  = NULL;
    … …  
    266266        basalelement->GetVerticesCoordinates(&xyz_list);
    267267        basalelement->FindParam(&dt,TimesteppingTimeStepEnum);
    268         Input* mb_input            = basalelement->GetInput(BasalforcingsMeltingRateEnum);   _assert_(mb_input);
    269         Input* mb_correction_input = basalelement->GetInput(BasalforcingsMeltingRateCorrectionEnum);
    270         Input* base_input           = basalelement->GetInput(BaseEnum);                        _assert_(base_input);
     268        Input* groundedice_input   = basalelement->GetInput(MaskGroundediceLevelsetEnum);              _assert_(groundedice_input);
     269        Input* gmb_input           = basalelement->GetInput(BasalforcingsGroundediceMeltingRateEnum);  _assert_(gmb_input);
     270        Input* fmb_input           = basalelement->GetInput(BasalforcingsFloatingiceMeltingRateEnum);  _assert_(fmb_input);
     271        Input* base_input          = basalelement->GetInput(BaseEnum);                                 _assert_(base_input);
    271272        Input* vz_input      = NULL;
    272273        switch(dim){
    … …  
    276277        }
    277278
    278         /*Initialize mb_correction to 0, do not forget!:*/
    279279        /* Start  looping on the number of gaussian points: */
    280280        Gauss* gauss=basalelement->NewGauss(2);
    … …  
    286286
    287287                vz_input->GetInputValue(&vz,gauss);
    288                 mb_input->GetInputValue(&mb,gauss);
     288                gmb_input->GetInputValue(&gmb,gauss);
     289                fmb_input->GetInputValue(&fmb,gauss);
    289290                base_input->GetInputValue(&bed,gauss);
    290                 if(mb_correction_input)
    291                  mb_correction_input->GetInputValue(&mb_correction,gauss);
    292                 else
    293                  mb_correction=0.;
    294 
    295                 for(int i=0;i<numnodes;i++) pe->values[i]+=Jdet*gauss->weight*(bed+dt*(mb-mb_correction) + dt*vz)*basis[i];
     291                groundedice_input->GetInputValue(&phi,gauss);
     292                if(phi>0) mb=gmb;
     293                else mb=fmb;
     294
     295                for(int i=0;i<numnodes;i++) pe->values[i]+=Jdet*gauss->weight*(bed+dt*(mb) + dt*vz)*basis[i];
    296296        }
    297297

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

    r18057 r18068  
    8484        iomodel->FetchDataToInput(elements,BaseEnum);
    8585        iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
    86         iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
     86        iomodel->FetchDataToInput(elements,BasalforcingsGroundediceMeltingRateEnum);
    8787        iomodel->FetchDataToInput(elements,HydrologydcBasalMoulinInputEnum);
    8888        iomodel->FetchDataToInput(elements,SedimentHeadEnum);
    … …  
    307307        Input* thickness_input   = basalelement->GetInput(ThicknessEnum);
    308308        Input* base_input        = basalelement->GetInput(BaseEnum);
    309         Input* water_input       = basalelement->GetInput(BasalforcingsMeltingRateEnum);    _assert_(water_input);
    310         if(dt!= 0.){old_wh_input = basalelement->GetInput(SedimentHeadOldEnum);             _assert_(old_wh_input);}
     309        Input* water_input       = basalelement->GetInput(BasalforcingsGroundediceMeltingRateEnum); _assert_(water_input);
     310        if(dt!= 0.){old_wh_input = basalelement->GetInput(SedimentHeadOldEnum);                     _assert_(old_wh_input);}
    311311
    312312        IssmDouble sediment_storing    = SedimentStoring(basalelement);

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

    r18057 r18068  
    5050        iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
    5151        iomodel->FetchDataToInput(elements,MaskGroundediceLevelsetEnum);
    52         iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
     52        iomodel->FetchDataToInput(elements,BasalforcingsGroundediceMeltingRateEnum);
    5353        iomodel->FetchDataToInput(elements,WatercolumnEnum);
    5454
    … …  
    205205        element->GetVerticesCoordinates(&xyz_list);
    206206        element->FindParam(&dt,TimesteppingTimeStepEnum);
    207         Input* mb_input   = element->GetInput(BasalforcingsMeltingRateEnum); _assert_(mb_input);
    208         Input* oldw_input = element->GetInput(WaterColumnOldEnum);           _assert_(oldw_input);
     207        Input* mb_input   = element->GetInput(BasalforcingsGroundediceMeltingRateEnum); _assert_(mb_input);
     208        Input* oldw_input = element->GetInput(WaterColumnOldEnum);                      _assert_(oldw_input);
    209209
    210210        /*Initialize mb_correction to 0, do not forget!:*/

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

    r18057 r18068  
    6464        iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum);
    6565        iomodel->FetchDataToInput(elements,MaskGroundediceLevelsetEnum);
    66         iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
    67         iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateCorrectionEnum,0.);
     66        iomodel->FetchDataToInput(elements,BasalforcingsGroundediceMeltingRateEnum);
     67        iomodel->FetchDataToInput(elements,BasalforcingsFloatingiceMeltingRateEnum);
    6868        iomodel->FetchDataToInput(elements,VxEnum);
    6969        iomodel->FetchDataToInput(elements,VyEnum);
    … …  
    524524        /*Intermediaries */
    525525        IssmDouble  Jdet,dt;
    526         IssmDouble  ms,mb,mb_correction=0.,thickness;
     526        IssmDouble  ms,mb,gmb,fmb,thickness,phi;
    527527        IssmDouble* xyz_list = NULL;
    528528
    … …  
    537537        element->GetVerticesCoordinates(&xyz_list);
    538538        element->FindParam(&dt,TimesteppingTimeStepEnum);
    539         Input* mb_correction_input = element->GetInput(BasalforcingsMeltingRateCorrectionEnum);
    540         Input* mb_input            = element->GetInput(BasalforcingsMeltingRateEnum);     _assert_(mb_input);
    541         Input* ms_input            = element->GetInput(SurfaceforcingsMassBalanceEnum);   _assert_(ms_input);
    542         Input* thickness_input     = element->GetInput(ThicknessEnum);                    _assert_(thickness_input);
    543 
    544         /*Initialize mb_correction to 0, do not forget!:*/
     539        Input* gmb_input           = element->GetInput(BasalforcingsGroundediceMeltingRateEnum);  _assert_(gmb_input);
     540        Input* fmb_input           = element->GetInput(BasalforcingsFloatingiceMeltingRateEnum);  _assert_(fmb_input);
     541        Input* groundedice_input   = element->GetInput(MaskGroundediceLevelsetEnum);              _assert_(groundedice_input);
     542        Input* ms_input            = element->GetInput(SurfaceforcingsMassBalanceEnum);           _assert_(ms_input);
     543        Input* thickness_input     = element->GetInput(ThicknessEnum);                            _assert_(thickness_input);
     544
    545545        /* Start  looping on the number of gaussian points: */
    546546        Gauss* gauss=element->NewGauss(2);
    … …  
    552552
    553553                ms_input->GetInputValue(&ms,gauss);
    554                 mb_input->GetInputValue(&mb,gauss);
     554                gmb_input->GetInputValue(&gmb,gauss);
     555                fmb_input->GetInputValue(&fmb,gauss);
     556                groundedice_input->GetInputValue(&phi,gauss);
    555557                thickness_input->GetInputValue(&thickness,gauss);
    556                 if(mb_correction_input)
    557                  mb_correction_input->GetInputValue(&mb_correction,gauss);
    558 
    559                 for(int i=0;i<numnodes;i++) pe->values[i]+=Jdet*gauss->weight*(thickness+dt*(ms-mb-mb_correction))*basis[i];
     558                if(phi>0.) mb=gmb;
     559                else mb=fmb;
     560
     561                for(int i=0;i<numnodes;i++) pe->values[i]+=Jdet*gauss->weight*(thickness+dt*(ms-mb))*basis[i];
    560562        }
    561563
    … …  
    573575        /*Intermediaries */
    574576        IssmDouble  Jdet,dt;
    575         IssmDouble  ms,mb,mb_correction=0.,thickness;
     577        IssmDouble  ms,mb,gmb,fmb,thickness,phi;
    576578        IssmDouble* xyz_list = NULL;
    577579
    … …  
    586588        element->GetVerticesCoordinates(&xyz_list);
    587589        element->FindParam(&dt,TimesteppingTimeStepEnum);
    588         Input* mb_correction_input = element->GetInput(BasalforcingsMeltingRateCorrectionEnum);
    589         Input* mb_input            = element->GetInput(BasalforcingsMeltingRateEnum);     _assert_(mb_input);
    590         Input* ms_input            = element->GetInput(SurfaceforcingsMassBalanceEnum);   _assert_(ms_input);
    591         Input* thickness_input     = element->GetInput(ThicknessEnum);                    _assert_(thickness_input);
    592 
    593         /*Initialize mb_correction to 0, do not forget!:*/
     590        Input* gmb_input           = element->GetInput(BasalforcingsGroundediceMeltingRateEnum); _assert_(gmb_input);
     591        Input* fmb_input           = element->GetInput(BasalforcingsFloatingiceMeltingRateEnum); _assert_(fmb_input);
     592        Input* ms_input            = element->GetInput(SurfaceforcingsMassBalanceEnum);          _assert_(ms_input);
     593        Input* groundedice_input   = element->GetInput(MaskGroundediceLevelsetEnum);             _assert_(groundedice_input);
     594        Input* thickness_input     = element->GetInput(ThicknessEnum);                           _assert_(thickness_input);
     595
    594596        /* Start  looping on the number of gaussian points: */
    595597        Gauss* gauss=element->NewGauss(2);
    … …  
    601603
    602604                ms_input->GetInputValue(&ms,gauss);
    603                 mb_input->GetInputValue(&mb,gauss);
     605                gmb_input->GetInputValue(&gmb,gauss);
     606                fmb_input->GetInputValue(&fmb,gauss);
     607                groundedice_input->GetInputValue(&phi,gauss);
    604608                thickness_input->GetInputValue(&thickness,gauss);
    605                 if(mb_correction_input)
    606                  mb_correction_input->GetInputValue(&mb_correction,gauss);
    607 
    608                 for(int i=0;i<numnodes;i++) pe->values[i]+=Jdet*gauss->weight*(thickness+dt*(ms-mb-mb_correction))*basis[i];
     609                if(phi>0) mb=gmb;
     610                else mb=fmb;
     611
     612                for(int i=0;i<numnodes;i++) pe->values[i]+=Jdet*gauss->weight*(thickness+dt*(ms-mb))*basis[i];
    609613        }
    610614

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

    r18057 r18068  
    4343        iomodel->FetchDataToInput(elements,MaterialsRheologyBEnum);
    4444        iomodel->FetchDataToInput(elements,MaterialsRheologyNEnum);
    45         iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
     45        iomodel->FetchDataToInput(elements,BasalforcingsGroundediceMeltingRateEnum);
    4646        iomodel->FetchDataToInput(elements,PressureEnum);
    4747       
    … …  
    155155}/*}}}*/
    156156void MeltingAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/
    157         element->InputUpdateFromSolutionOneDof(solution,BasalforcingsMeltingRateEnum);
     157        element->InputUpdateFromSolutionOneDof(solution,BasalforcingsGroundediceMeltingRateEnum);
    158158}/*}}}*/
    159159void MeltingAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/

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

    r18057 r18068  
    231231        if(isFS){
    232232                iomodel->FetchDataToInput(elements,PressureEnum,0.);
    233                 iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum,0.);
     233                iomodel->FetchDataToInput(elements,BasalforcingsFloatingiceMeltingRateEnum,0.);
    234234                if(dakota_analysis)elements->InputDuplicate(PressureEnum,QmuPressureEnum);
    235235        }
    … …  
    36183618        element->FindParam(&shelf_dampening,StressbalanceShelfDampeningEnum);
    36193619        if(shelf_dampening) {
    3620                 Input*      mb_input=element->GetInput(BasalforcingsMeltingRateEnum); _assert_(mb_input);
     3620                Input*      mb_input=element->GetInput(BasalforcingsFloatingiceMeltingRateEnum); _assert_(mb_input);
    36213621                IssmDouble dt,mb,normal_b;
    36223622                element->FindParam(&dt,TimesteppingTimeStepEnum);

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

    r18057 r18068  
    4040        iomodel->FetchDataToInput(elements,ThicknessEnum);
    4141        iomodel->FetchDataToInput(elements,FrictionCoefficientEnum);
     42        iomodel->FetchDataToInput(elements,MaskGroundediceLevelsetEnum);
    4243        if(islevelset){
    4344                iomodel->FetchDataToInput(elements,IceMaskNodeActivationEnum);

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

    r18057 r18068  
    3838                iomodel->FetchDataToInput(elements,MeshVertexonsurfaceEnum);
    3939        }
    40         iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
     40        iomodel->FetchDataToInput(elements,BasalforcingsGroundediceMeltingRateEnum);
     41        iomodel->FetchDataToInput(elements,BasalforcingsFloatingiceMeltingRateEnum);
    4142        iomodel->FetchDataToInput(elements,VxEnum,0.);
    4243        iomodel->FetchDataToInput(elements,VyEnum,0.);
    … …  
    278279        IssmDouble *xyz_list_base = NULL;
    279280        IssmDouble  Jdet,slope[3];
    280         IssmDouble  vx,vy,vz=0.,dbdx,dbdy,basalmeltingvalue;
     281        IssmDouble  vx,vy,vz=0.,dbdx,dbdy;
     282        IssmDouble  gmb,fmb,phi,basalmeltingvalue;
    281283
    282284        if(!element->IsOnBase()) return NULL;
    … …  
    293295        element->GetVerticesCoordinatesBase(&xyz_list_base);
    294296        element->GetInputValue(&approximation,ApproximationEnum);
    295         Input* base_input=element->GetInput(BaseEnum);                                _assert_(base_input);
    296         Input* basal_melting_input=element->GetInput(BasalforcingsMeltingRateEnum); _assert_(basal_melting_input);
    297         Input* vx_input=element->GetInput(VxEnum);                                  _assert_(vx_input);
    298         Input* vy_input=element->GetInput(VyEnum);                                  _assert_(vy_input);
     297        Input* base_input=element->GetInput(BaseEnum);                                               _assert_(base_input);
     298        Input* groundedice_input=element->GetInput(MaskGroundediceLevelsetEnum);                     _assert_(groundedice_input);
     299        Input* groundedice_melting_input=element->GetInput(BasalforcingsGroundediceMeltingRateEnum); _assert_(groundedice_melting_input);
     300        Input* floatingice_melting_input=element->GetInput(BasalforcingsFloatingiceMeltingRateEnum); _assert_(floatingice_melting_input);
     301        Input* vx_input=element->GetInput(VxEnum);                                                   _assert_(vx_input);
     302        Input* vy_input=element->GetInput(VyEnum);                                                   _assert_(vy_input);
    299303        Input* vzFS_input=NULL;
    300304        if(approximation==HOFSApproximationEnum || approximation==SSAFSApproximationEnum){
    … …  
    307311                gauss->GaussPoint(ig);
    308312
    309                 basal_melting_input->GetInputValue(&basalmeltingvalue,gauss);
     313                groundedice_melting_input->GetInputValue(&gmb,gauss);
     314                floatingice_melting_input->GetInputValue(&fmb,gauss);
     315                groundedice_input->GetInputValue(&phi,gauss);
    310316                base_input->GetInputDerivativeValue(&slope[0],xyz_list,gauss);
    311317                vx_input->GetInputValue(&vx,gauss);
    … …  
    316322                dbdx=slope[0];
    317323                dbdy=slope[1];
     324                if(phi>0.) basalmeltingvalue=gmb;
     325                else basalmeltingvalue=fmb;
    318326
    319327                element->JacobianDeterminantBase(&Jdet,xyz_list_base,gauss);

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

    r18057 r18068  
    7777        if(dakota_analysis){
    7878                elements->InputDuplicate(TemperatureEnum,QmuTemperatureEnum);
    79                 elements->InputDuplicate(BasalforcingsMeltingRateEnum,QmuMeltingEnum);
     79                elements->InputDuplicate(BasalforcingsGroundediceMeltingRateEnum,QmuMeltingEnum);
    8080                elements->InputDuplicate(VxMeshEnum,QmuVxMeshEnum);
    8181                elements->InputDuplicate(VxMeshEnum,QmuVyMeshEnum);

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

    r18060 r18068  
    822822                                name==SurfaceSlopeYEnum ||
    823823                                name==SurfaceforcingsMassBalanceEnum ||
    824                                 name==BasalforcingsMeltingRateEnum ||
     824                                name==BasalforcingsGroundediceMeltingRateEnum ||
     825                                name==BasalforcingsFloatingiceMeltingRateEnum ||
    825826                                name==BasalforcingsGeothermalfluxEnum ||
    826827                                name==SurfaceAreaEnum||

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

    r18062 r18068  
    31613161
    31623162        int        i,migration_style;
    3163         bool       oldfloating;
    3164         bool       floatingelement = false;
    3165         bool       groundedelement = false;
    3166         IssmDouble bed_hydro,yts,gl_melting_rate;
     3163        IssmDouble bed_hydro,yts;
    31673164        IssmDouble rho_water,rho_ice,density;
    31683165        IssmDouble h[NUMVERTICES],s[NUMVERTICES],b[NUMVERTICES],r[NUMVERTICES];
    … …  
    31733170        /*Recover info at the vertices: */
    31743171        parameters->FindParam(&migration_style,GroundinglineMigrationEnum);
    3175         parameters->FindParam(&gl_melting_rate,GroundinglineMeltingRateEnum);
    31763172        parameters->FindParam(&yts,ConstantsYtsEnum);
    31773173        GetInputListOnVertices(&h[0],ThicknessEnum);
    … …  
    31833179        rho_ice     = matpar->GetRhoIce();
    31843180        density     = rho_ice/rho_water;
    3185         oldfloating = this->IsFloating(); //figure out if the element is floating before starting to change everything
    31863181
    31873182        /*go through vertices, and update inputs, considering them to be PentaVertex type: */
    … …  
    32283223        this->InputExtrude(MaskGroundediceLevelsetEnum);
    32293224
    3230         /*SubelementMigrationEnum: if one grounded, all grounded*/
    3231         if(migration_style==SubelementMigrationEnum || migration_style==SubelementMigration2Enum){
    3232                 for(i=0;i<NUMVERTICES;i++){
    3233                         if(phi[i]>0.){
    3234                                 groundedelement=true;
    3235                                 break;
    3236                         }
    3237                 }
    3238                 floatingelement=!groundedelement;
    3239         }
    3240         else{
    3241                 for(i=0;i<NUMVERTICES;i++){
    3242                         if(phi[i]<=0.){
    3243                                 floatingelement=true;
    3244                                 break;
    3245                         }
    3246                 }
    3247         }
    3248 
    3249    /*Add basal melting rate if element just ungrounded*/
    3250         if(!oldfloating && floatingelement==true){
    3251                 for(i=0;i<NUMVERTICES;i++)melting[i]=gl_melting_rate/yts;
    3252                 this->inputs->AddInput(new PentaInput(BasalforcingsMeltingRateEnum,&melting[0],P1Enum));
    3253         }
    3254 
    32553225        /*Update inputs*/
    32563226        this->inputs->AddInput(new PentaInput(SurfaceEnum,&s[0],P1Enum));

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

    r18062 r18068  
    29902990
    29912991        int        i,migration_style;
    2992         bool       oldfloating;
    2993         bool       floatingelement = false;
    29942992        bool       groundedelement = false;
    2995         IssmDouble bed_hydro,yts,gl_melting_rate;
     2993        IssmDouble bed_hydro,yts;
    29962994        IssmDouble rho_water,rho_ice,density;
    29972995        IssmDouble melting[NUMVERTICES],phi[NUMVERTICES];;
    … …  
    30002998        /*Recover info at the vertices: */
    30012999        parameters->FindParam(&migration_style,GroundinglineMigrationEnum);
    3002         parameters->FindParam(&gl_melting_rate,GroundinglineMeltingRateEnum);
    30033000        parameters->FindParam(&yts,ConstantsYtsEnum);
    30043001        GetInputListOnVertices(&h[0],ThicknessEnum);
    … …  
    30103007        rho_ice     = matpar->GetRhoIce();
    30113008        density     = rho_ice/rho_water;
    3012         oldfloating = this->IsFloating(); //figure out if element is floating before we start to change everything
    30133009
    30143010        if(migration_style == ContactEnum){
    … …  
    30233019                        }
    30243020                }
    3025 
    3026                 /*Add basal melting rate if element just ungrounded*/
    3027                 for(i=0;i<NUMVERTICES;i++){
    3028                         if(phi[i]<0.){
    3029                                 floatingelement=true;
    3030                                 break;
    3031                         }
    3032                 }
    3033                 if(!oldfloating && floatingelement==true){
    3034                         for(i=0;i<NUMVERTICES;i++) melting[i]=gl_melting_rate/yts;
    3035                         this->inputs->AddInput(new TriaInput(BasalforcingsMeltingRateEnum,&melting[0],P1Enum));
    3036                 }
    30373021
    30383022                /*Update inputs*/
    … …  
    30853069        this->inputs->AddInput(new TriaInput(MaskGroundediceLevelsetEnum,&phi[0],P1Enum));
    30863070
    3087         /*SubelementMigrationEnum: if one grounded, all grounded*/
    3088         if(migration_style==SubelementMigrationEnum || migration_style==SubelementMigration2Enum){
    3089                 for(i=0;i<NUMVERTICES;i++){
    3090                         if(phi[i]>0.){
    3091                                 groundedelement=true;
    3092                                 break;
    3093                         }
    3094                 }
    3095                 floatingelement=!groundedelement;
    3096         }
    3097         else{
    3098                 /*Otherwise: if one floating, all floating*/
    3099                 for(i=0;i<NUMVERTICES;i++){
    3100                         if(phi[i]<=0.){
    3101                                 floatingelement=true;
    3102                                 break;
    3103                         }
    3104                 }
    3105         }
    3106 
    3107         /*Add basal melting rate if element just ungrounded*/
    3108         if(!oldfloating && floatingelement==true){
    3109                 for(i=0;i<NUMVERTICES;i++)melting[i]=gl_melting_rate/yts;
    3110                 this->inputs->AddInput(new TriaInput(BasalforcingsMeltingRateEnum,&melting[0],P1Enum));
    3111         }
    3112 
    31133071        /*Update inputs*/
    31143072        this->inputs->AddInput(new TriaInput(SurfaceEnum,&s[0],P1Enum));

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

    r18064 r18068  
    11321132
    11331133        IssmDouble  weight,vx,vy,H,dvx[2],dvy[2],dH[2];
    1134         IssmDouble  temp,Jdet,dhdt,basal_melting,surface_mass_balance;
     1134        IssmDouble  temp,Jdet,dhdt,groundedice_melting,surface_mass_balance;
    11351135        IssmDouble* xyz_list = NULL;
    11361136        IssmDouble  dp[3];
    … …  
    11451145                /* Get node coordinates*/
    11461146                element->GetVerticesCoordinates(&xyz_list);
    1147                 Input* weights_input              = element->GetInput(InversionCostFunctionsCoefficientsEnum);   _assert_(weights_input);
    1148                 Input* thickness_input            = element->GetInput(ThicknessEnum); _assert_(thickness_input);
    1149                 Input* vx_input                   = element->GetInput(VxEnum);                                 _assert_(vx_input);
    1150                 Input* vy_input                   = element->GetInput(VyEnum);                                 _assert_(vy_input);
    1151                 Input* surface_mass_balance_input = element->GetInput(SurfaceforcingsMassBalanceEnum);         _assert_(surface_mass_balance_input);
    1152                 Input* basal_melting_input        = element->GetInput(BasalforcingsMeltingRateEnum);           _assert_(basal_melting_input);
    1153                 Input* dhdt_input                 = element->GetInput(BalancethicknessThickeningRateEnum);     _assert_(dhdt_input);
     1147                Input* weights_input                   = element->GetInput(InversionCostFunctionsCoefficientsEnum);   _assert_(weights_input);
     1148                Input* thickness_input                 = element->GetInput(ThicknessEnum); _assert_(thickness_input);
     1149                Input* vx_input                        = element->GetInput(VxEnum);                                  _assert_(vx_input);
     1150                Input* vy_input                        = element->GetInput(VyEnum);                                  _assert_(vy_input);
     1151                Input* surface_mass_balance_input      = element->GetInput(SurfaceforcingsMassBalanceEnum);          _assert_(surface_mass_balance_input);
     1152                Input* groundedice_melting_input       = element->GetInput(BasalforcingsGroundediceMeltingRateEnum); _assert_(groundedice_melting_input);
     1153                Input* dhdt_input                      = element->GetInput(BalancethicknessThickeningRateEnum);      _assert_(dhdt_input);
    11541154
    11551155                /* Start  looping on the number of gaussian points: */
    … …  
    11671167                        thickness_input->GetInputDerivativeValue(&dH[0],xyz_list,gauss);
    11681168                        surface_mass_balance_input->GetInputValue(&surface_mass_balance,gauss);
    1169                         basal_melting_input->GetInputValue(&basal_melting,gauss);
     1169                        groundedice_melting_input->GetInputValue(&groundedice_melting,gauss);
    11701170                        dhdt_input->GetInputValue(&dhdt,gauss);
    11711171                        vx_input->GetInputValue(&vx,gauss);
    … …  
    11751175
    11761176                        /*Balance thickness soft constraint J = 1/2 (div(Hv)-a)^2*/
    1177                         temp  = vx*dH[0]+vy*dH[1]+H*(dvx[0]+dvy[1]) - (surface_mass_balance-basal_melting-dhdt);
     1177                        temp  = vx*dH[0]+vy*dH[1]+H*(dvx[0]+dvy[1]) - (surface_mass_balance-groundedice_melting-dhdt);
    11781178                        J    +=weight*1/2*temp*temp*Jdet*gauss->weight;
    11791179                }

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

    r17045 r18068  
    3333                InputDuplicatex(femmodel,QmuVzMeshEnum,VzMeshEnum);
    3434                InputDuplicatex(femmodel,QmuTemperatureEnum,TemperatureEnum);
    35                 InputDuplicatex(femmodel,QmuMeltingEnum,BasalforcingsMeltingRateEnum);
     35                InputDuplicatex(femmodel,QmuMeltingEnum,BasalforcingsGroundediceMeltingRateEnum);
    3636                InputDuplicatex(femmodel,QmuMaterialsRheologyBEnum,MaterialsRheologyBEnum);
    3737                femmodel->SetCurrentConfiguration(ThermalAnalysisEnum);

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

    r17924 r18068  
    8686                        InputDuplicatex(femmodel,QmuVzMeshEnum,VzMeshEnum);
    8787                        InputDuplicatex(femmodel,QmuTemperatureEnum,TemperatureEnum);
    88                         InputDuplicatex(femmodel,QmuMeltingEnum,BasalforcingsMeltingRateEnum);
     88                        InputDuplicatex(femmodel,QmuMeltingEnum,BasalforcingsGroundediceMeltingRateEnum);
    8989                        InputDuplicatex(femmodel,QmuMaterialsRheologyBEnum,MaterialsRheologyBEnum);
    9090                        //Reset Thermal Constraints

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

    r18001 r18068  
    5858        parameters->AddObject(iomodel->CopyConstantObject(MeshAverageVertexConnectivityEnum));
    5959        parameters->AddObject(iomodel->CopyConstantObject(ConstantsReferencetemperatureEnum));
    60         parameters->AddObject(iomodel->CopyConstantObject(GroundinglineMeltingRateEnum));
    6160        parameters->AddObject(iomodel->CopyConstantObject(SettingsWaitonlockEnum));
    6261        parameters->AddObject(iomodel->CopyConstantObject(MeshNumberofelementsEnum));

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

    r18001 r18068  
    3939        BalancethicknessThickeningRateEnum,
    4040        BasalforcingsGeothermalfluxEnum,
    41         BasalforcingsMeltingRateCorrectionEnum,
    42         BasalforcingsMeltingRateEnum,
     41        BasalforcingsGroundediceMeltingRateEnum,
     42        BasalforcingsFloatingiceMeltingRateEnum,
     43        BasalforcingsDeepwaterMeltingRateEnum,
     44        BasalforcingsDeepwaterElevationEnum,
     45        BasalforcingsUpperwaterElevationEnum,
    4346        BedEnum,
    4447        BaseEnum,
    … …  
    499502        FractionIncrementEnum,
    500503        FrictionEnum,
    501         GroundinglineMeltingRateEnum,
    502504        InternalEnum,
    503505        MassFluxEnum,

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

    r18001 r18068  
    4747                case BalancethicknessThickeningRateEnum : return "BalancethicknessThickeningRate";
    4848                case BasalforcingsGeothermalfluxEnum : return "BasalforcingsGeothermalflux";
    49                 case BasalforcingsMeltingRateCorrectionEnum : return "BasalforcingsMeltingRateCorrection";
    50                 case BasalforcingsMeltingRateEnum : return "BasalforcingsMeltingRate";
     49                case BasalforcingsGroundediceMeltingRateEnum : return "BasalforcingsGroundediceMeltingRate";
     50                case BasalforcingsFloatingiceMeltingRateEnum : return "BasalforcingsFloatingiceMeltingRate";
     51                case BasalforcingsDeepwaterMeltingRateEnum : return "BasalforcingsDeepwaterMeltingRate";
     52                case BasalforcingsDeepwaterElevationEnum : return "BasalforcingsDeepwaterElevation";
     53                case BasalforcingsUpperwaterElevationEnum : return "BasalforcingsUpperwaterElevation";
    5154                case BedEnum : return "Bed";
    5255                case BaseEnum : return "Base";
    … …  
    490493                case FractionIncrementEnum : return "FractionIncrement";
    491494                case FrictionEnum : return "Friction";
    492                 case GroundinglineMeltingRateEnum : return "GroundinglineMeltingRate";
    493495                case InternalEnum : return "Internal";
    494496                case MassFluxEnum : return "MassFlux";

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

    r18001 r18068  
    4747              else if (strcmp(name,"BalancethicknessThickeningRate")==0) return BalancethicknessThickeningRateEnum;
    4848              else if (strcmp(name,"BasalforcingsGeothermalflux")==0) return BasalforcingsGeothermalfluxEnum;
    49               else if (strcmp(name,"BasalforcingsMeltingRateCorrection")==0) return BasalforcingsMeltingRateCorrectionEnum;
    50               else if (strcmp(name,"BasalforcingsMeltingRate")==0) return BasalforcingsMeltingRateEnum;
     49              else if (strcmp(name,"BasalforcingsGroundediceMeltingRate")==0) return BasalforcingsGroundediceMeltingRateEnum;
     50              else if (strcmp(name,"BasalforcingsFloatingiceMeltingRate")==0) return BasalforcingsFloatingiceMeltingRateEnum;
     51              else if (strcmp(name,"BasalforcingsDeepwaterMeltingRate")==0) return BasalforcingsDeepwaterMeltingRateEnum;
     52              else if (strcmp(name,"BasalforcingsDeepwaterElevation")==0) return BasalforcingsDeepwaterElevationEnum;
     53              else if (strcmp(name,"BasalforcingsUpperwaterElevation")==0) return BasalforcingsUpperwaterElevationEnum;
    5154              else if (strcmp(name,"Bed")==0) return BedEnum;
    5255              else if (strcmp(name,"Base")==0) return BaseEnum;
    … …  
    134137              else if (strcmp(name,"HydrologydcPenaltyFactor")==0) return HydrologydcPenaltyFactorEnum;
    135138              else if (strcmp(name,"HydrologydcPenaltyLock")==0) return HydrologydcPenaltyLockEnum;
    136               else if (strcmp(name,"HydrologydcBasalMoulinInput")==0) return HydrologydcBasalMoulinInputEnum;
    137               else if (strcmp(name,"HydrologyLayer")==0) return HydrologyLayerEnum;
    138               else if (strcmp(name,"HydrologySediment")==0) return HydrologySedimentEnum;
    139139         else stage=2;
    140140   }
    141141   if(stage==2){
    142               if (strcmp(name,"HydrologyEfficient")==0) return HydrologyEfficientEnum;
     142              if (strcmp(name,"HydrologydcBasalMoulinInput")==0) return HydrologydcBasalMoulinInputEnum;
     143              else if (strcmp(name,"HydrologyLayer")==0) return HydrologyLayerEnum;
     144              else if (strcmp(name,"HydrologySediment")==0) return HydrologySedimentEnum;
     145              else if (strcmp(name,"HydrologyEfficient")==0) return HydrologyEfficientEnum;
    143146              else if (strcmp(name,"HydrologySedimentKmax")==0) return HydrologySedimentKmaxEnum;
    144147              else if (strcmp(name,"IndependentObject")==0) return IndependentObjectEnum;
    … …  
    257260              else if (strcmp(name,"QmuPartition")==0) return QmuPartitionEnum;
    258261              else if (strcmp(name,"QmuResponsedescriptors")==0) return QmuResponsedescriptorsEnum;
    259               else if (strcmp(name,"QmuVariabledescriptors")==0) return QmuVariabledescriptorsEnum;
    260               else if (strcmp(name,"QmuMaterialsRheologyB")==0) return QmuMaterialsRheologyBEnum;
    261               else if (strcmp(name,"RiftsNumrifts")==0) return RiftsNumriftsEnum;
    262262         else stage=3;
    263263   }
    264264   if(stage==3){
    265               if (strcmp(name,"RiftsRiftstruct")==0) return RiftsRiftstructEnum;
     265              if (strcmp(name,"QmuVariabledescriptors")==0) return QmuVariabledescriptorsEnum;
     266              else if (strcmp(name,"QmuMaterialsRheologyB")==0) return QmuMaterialsRheologyBEnum;
     267              else if (strcmp(name,"RiftsNumrifts")==0) return RiftsNumriftsEnum;
     268              else if (strcmp(name,"RiftsRiftstruct")==0) return RiftsRiftstructEnum;
    266269              else if (strcmp(name,"SettingsResultsOnNodes")==0) return SettingsResultsOnNodesEnum;
    267270              else if (strcmp(name,"SettingsIoGather")==0) return SettingsIoGatherEnum;
    … …  
    380383              else if (strcmp(name,"MasstransportAnalysis")==0) return MasstransportAnalysisEnum;
    381384              else if (strcmp(name,"MasstransportSolution")==0) return MasstransportSolutionEnum;
    382               else if (strcmp(name,"FreeSurfaceBaseAnalysis")==0) return FreeSurfaceBaseAnalysisEnum;
    383               else if (strcmp(name,"FreeSurfaceTopAnalysis")==0) return FreeSurfaceTopAnalysisEnum;
    384               else if (strcmp(name,"SurfaceNormalVelocity")==0) return SurfaceNormalVelocityEnum;
    385385         else stage=4;
    386386   }
    387387   if(stage==4){
    388               if (strcmp(name,"ExtrudeFromBaseAnalysis")==0) return ExtrudeFromBaseAnalysisEnum;
     388              if (strcmp(name,"FreeSurfaceBaseAnalysis")==0) return FreeSurfaceBaseAnalysisEnum;
     389              else if (strcmp(name,"FreeSurfaceTopAnalysis")==0) return FreeSurfaceTopAnalysisEnum;
     390              else if (strcmp(name,"SurfaceNormalVelocity")==0) return SurfaceNormalVelocityEnum;
     391              else if (strcmp(name,"ExtrudeFromBaseAnalysis")==0) return ExtrudeFromBaseAnalysisEnum;
    389392              else if (strcmp(name,"ExtrudeFromTopAnalysis")==0) return ExtrudeFromTopAnalysisEnum;
    390393              else if (strcmp(name,"DepthAverageAnalysis")==0) return DepthAverageAnalysisEnum;
    … …  
    499502              else if (strcmp(name,"FractionIncrement")==0) return FractionIncrementEnum;
    500503              else if (strcmp(name,"Friction")==0) return FrictionEnum;
    501               else if (strcmp(name,"GroundinglineMeltingRate")==0) return GroundinglineMeltingRateEnum;
    502504              else if (strcmp(name,"Internal")==0) return InternalEnum;
    503505              else if (strcmp(name,"MassFlux")==0) return MassFluxEnum;
    504506              else if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum;
    505507              else if (strcmp(name,"Misfit")==0) return MisfitEnum;
    506               else if (strcmp(name,"Pressure")==0) return PressureEnum;
    507               else if (strcmp(name,"PressurePicard")==0) return PressurePicardEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"QmuPressure")==0) return QmuPressureEnum;
     511              if (strcmp(name,"Pressure")==0) return PressureEnum;
     512              else if (strcmp(name,"PressurePicard")==0) return PressurePicardEnum;
     513              else if (strcmp(name,"QmuPressure")==0) return QmuPressureEnum;
    512514              else if (strcmp(name,"QmuVx")==0) return QmuVxEnum;
    513515              else if (strcmp(name,"QmuVy")==0) return QmuVyEnum;
    … …  
    627629              else if (strcmp(name,"MisfitModelEnum")==0) return MisfitModelEnumEnum;
    628630              else if (strcmp(name,"MisfitObservation")==0) return MisfitObservationEnum;
    629               else if (strcmp(name,"MisfitObservationEnum")==0) return MisfitObservationEnumEnum;
    630               else if (strcmp(name,"MisfitTimeinterpolation")==0) return MisfitTimeinterpolationEnum;
    631631         else stage=6;
    632632   }
    633633   if(stage==6){
    634               if (strcmp(name,"MisfitWeights")==0) return MisfitWeightsEnum;
     634              if (strcmp(name,"MisfitObservationEnum")==0) return MisfitObservationEnumEnum;
     635              else if (strcmp(name,"MisfitTimeinterpolation")==0) return MisfitTimeinterpolationEnum;
     636              else if (strcmp(name,"MisfitWeights")==0) return MisfitWeightsEnum;
    635637              else if (strcmp(name,"MisfitWeightsEnum")==0) return MisfitWeightsEnumEnum;
    636638              else if (strcmp(name,"SurfaceObservation")==0) return SurfaceObservationEnum;

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

    r17720 r18068  
    66classdef basalforcings
    77        properties (SetAccess=public)
    8                 melting_rate             = NaN;
    9                 melting_rate_correction  = NaN;
    10                 geothermalflux           = NaN;
     8                groundedice_melting_rate  = NaN;
     9                floatingice_melting_rate  = NaN;
     10                geothermalflux            = NaN;
    1111        end
    1212        methods
    … …  
    1515            fprintf(fid, '%s\n', '<!-- basalforcings -->');
    1616                         fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',    '<parameter key ="melting_rate" type="',            class(obj.melting_rate),'" default="',              num2str(obj.melting_rate),'">',              '     <section name="basalforcings" />','     <help> basal melting rate (positive if melting) [m/yr] </help>','</parameter>');
    17              fprintf(fid,'%s%s%s%s%s\n%s\n%s\n%s\n',    '<parameter key ="melting_rate_correction" type="', class(obj.melting_rate_correction),'" default="',   num2str(obj.melting_rate_correction),'">',   '     <section name="basalforcings" />','     <help> additional melting applied to compensate for dh/dt [m/yr] </help>','</parameter>');
    1817             fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',        '<parameter key ="geothermalflux" type="',          class(obj.geothermalflux),'" default="',            num2str(obj.geothermalflux),'">',            '     <section name="basalforcings" />','     <help> geothermal heat flux [W/m^2] </help>','</parameter>');
    1918             
    … …  
    2928                function self = initialize(self,md) % {{{
    3029
    31                         if isnan(self.melting_rate),
    32                                 self.melting_rate=zeros(md.mesh.numberofvertices,1);
    33                                 disp('      no basalforcings.melting_rate specified: values set as zero');
     30                        if isnan(self.groundedice_melting_rate),
     31                                self.groundedice_melting_rate=zeros(md.mesh.numberofvertices,1);
     32                                disp('      no basalforcings.groundedice_melting_rate specified: values set as zero');
     33                        end
     34
     35                        if isnan(self.floatingice_melting_rate),
     36                                self.floatingice_melting_rate=zeros(md.mesh.numberofvertices,1);
     37                                disp('      no basalforcings.floatingice_melting_rate specified: values set as zero');
    3438                        end
    3539
    … …  
    4145
    4246                        if ismember(MasstransportAnalysisEnum(),analyses) & ~(solution==TransientSolutionEnum() & md.transient.ismasstransport==0),
    43                                 md = checkfield(md,'fieldname','basalforcings.melting_rate','NaN',1,'forcing',1);
     47                                md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'forcing',1);
     48                                md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'forcing',1);
    4449                        end
    4550                        if ismember(BalancethicknessAnalysisEnum(),analyses),
    46                                 md = checkfield(md,'fieldname','basalforcings.melting_rate','NaN',1,'size',[md.mesh.numberofvertices 1]);
     51                                md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'size',[md.mesh.numberofvertices 1]);
     52                                md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'size',[md.mesh.numberofvertices 1]);
    4753                        end
    4854                        if ismember(ThermalAnalysisEnum(),analyses) & ~(solution==TransientSolutionEnum() & md.transient.isthermal==0),
    49                                 md = checkfield(md,'fieldname','basalforcings.melting_rate','NaN',1,'forcing',1);
     55                                md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'forcing',1);
     56                                md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'forcing',1);
    5057                                md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'forcing',1,'>=',0);
    5158                        end
    … …  
    5461                        disp(sprintf('   basal forcings parameters:'));
    5562
    56                         fielddisplay(obj,'melting_rate','basal melting rate (positive if melting) [m/yr]');
    57                         fielddisplay(obj,'melting_rate_correction','additional melting applied to compensate for dh/dt [m/yr]');
     63                        fielddisplay(obj,'groundedice_melting_rate','basal melting rate (positive if melting) [m/yr]');
     64                        fielddisplay(obj,'floatingice_melting_rate','basal melting rate (positive if melting) [m/yr]');
    5865                        fielddisplay(obj,'geothermalflux','geothermal heat flux [W/m^2]');
    5966
    … …  
    6370                        yts=365.0*24.0*3600.0;
    6471
    65                         WriteData(fid,'object',obj,'fieldname','melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)
    66                         WriteData(fid,'object',obj,'fieldname','melting_rate_correction','format','DoubleMat','mattype',1,'scale',1./yts);
     72                        WriteData(fid,'object',obj,'fieldname','groundedice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)
     73                        WriteData(fid,'object',obj,'fieldname','floatingice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)
    6774                        WriteData(fid,'object',obj,'fieldname','geothermalflux','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1);
    6875                end % }}}

  • issm/trunk-jpl/src/m/classes/basalforcings.py

    r17497 r18068  
    1414
    1515        def __init__(self): # {{{
    16                 self.melting_rate             = float('NaN')
    17                 self.melting_rate_correction  = float('NaN')
    18                 self.geothermalflux           = float('NaN')
     16                self.groundedice_melting_rate  = float('NaN')
     17                self.floatingice_melting_rate  = float('NaN')
     18                self.geothermalflux            = float('NaN')
    1919
    2020                #set defaults
    … …  
    2525                string="   basal forcings parameters:"
    2626
    27                 string="%s\n%s"%(string,fielddisplay(self,"melting_rate","basal melting rate (positive if melting) [m/yr]"))
    28                 string="%s\n%s"%(string,fielddisplay(self,"melting_rate_correction","additional melting applied to compensate for dh/dt [m/yr]"))
     27                string="%s\n%s"%(string,fielddisplay(self,"groundedice_melting_rate","basal melting rate (positive if melting) [m/yr]"))
     28                string="%s\n%s"%(string,fielddisplay(self,"floatingice_melting_rate","basal melting rate (positive if melting) [m/yr]"))
    2929                string="%s\n%s"%(string,fielddisplay(self,"geothermalflux","geothermal heat flux [W/m^2]"))
    3030                return string
    … …  
    3232        def initialize(self,md): # {{{
    3333
    34                 if numpy.all(numpy.isnan(self.melting_rate)):
    35                         self.melting_rate=numpy.zeros((md.mesh.numberofvertices,1))
    36                         print "      no basalforcings.melting_rate specified: values set as zero"
     34                if numpy.all(numpy.isnan(self.groundedice_melting_rate)):
     35                        self.groundedice_melting_rate=numpy.zeros((md.mesh.numberofvertices,1))
     36                        print "      no basalforcings.groundedice_melting_rate specified: values set as zero"
     37
     38                if numpy.all(numpy.isnan(self.floatingice_melting_rate)):
     39                        self.floatingice_melting_rate=numpy.zeros((md.mesh.numberofvertices,1))
     40                        print "      no basalforcings.floatingice_melting_rate specified: values set as zero"
    3741
    3842                return self
    … …  
    4448
    4549                if MasstransportAnalysisEnum() in analyses and not (solution==TransientSolutionEnum() and not md.transient.ismasstransport):
    46                         md = checkfield(md,'fieldname','basalforcings.melting_rate','NaN',1,'forcing',1)
     50                        md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'forcing',1)
     51                        md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'forcing',1)
    4752
    4853                if BalancethicknessAnalysisEnum() in analyses:
    49                         md = checkfield(md,'fieldname','basalforcings.melting_rate','NaN',1,'size',[md.mesh.numberofvertices])
     54                        md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'size',[md.mesh.numberofvertices])
     55                        md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'size',[md.mesh.numberofvertices])
    5056
    5157                if ThermalAnalysisEnum() in analyses and not (solution==TransientSolutionEnum() and not md.transient.isthermal):
    52                         md = checkfield(md,'fieldname','basalforcings.melting_rate','NaN',1,'forcing',1)
     58                        md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'forcing',1)
     59                        md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'forcing',1)
    5360                        md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'forcing',1,'>=',0)
    5461
    … …  
    5966                yts=365.0*24.0*3600.0
    6067
    61                 WriteData(fid,'object',self,'fieldname','melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)
    62                 WriteData(fid,'object',self,'fieldname','melting_rate_correction','format','DoubleMat','mattype',1,'scale',1./yts)
     68                WriteData(fid,'object',self,'fieldname','groundedice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)
     69                WriteData(fid,'object',self,'fieldname','floatingice_melting_rate','format','DoubleMat','mattype',1,'scale',1./yts,'forcinglength',md.mesh.numberofvertices+1)
    6370                WriteData(fid,'object',self,'fieldname','geothermalflux','format','DoubleMat','mattype',1,'forcinglength',md.mesh.numberofvertices+1)
    6471        # }}}

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

    r17941 r18068  
    77        properties (SetAccess=public)
    88                migration    = '';
    9                 melting_rate = NaN;
    109        end
    1110        methods
    … …  
    2322            fprintf(fid, '%s\n%s\n','       <option value="None" type="string" default="false"></option>','</parameter>');
    2423
    25             fprintf(fid,'%s%s%s%s%s\n%s\n%s\n',    '<parameter key ="melting_rate" type="',          class(obj.melting_rate),'" default="',            convert2str(obj.melting_rate),'">',     '     <section name="groundingline" />','     <help> melting rate applied when previously grounded parts start floating [m/yr] </help>','</parameter>');
    2624            fprintf(fid,'%s\n%s\n','</frame>');
    2725        end % }}}
    … …  
    3836                        %Type of migration
    3937                        obj.migration='None';
    40 
    41                         %basal melting rate correction:
    42                         obj.melting_rate=0;
    4338
    4439                end % }}}
    … …  
    6459                        disp(sprintf('   grounding line migration parameters:'));
    6560                        fielddisplay(obj,'migration','type of grounding line migration: ''SoftMigration'',''AggressiveMigration'' or ''None''');
    66                         fielddisplay(obj,'melting_rate','melting rate applied when previously grounded parts start floating [m/yr]');
    6761
    6862                end % }}}
    6963                function marshall(obj,md,fid) % {{{
    7064                        WriteData(fid,'data',StringToEnum(obj.migration),'enum',GroundinglineMigrationEnum(),'format','Integer');
    71                         WriteData(fid,'object',obj,'fieldname','melting_rate','format','Double');
    7265                end % }}}
    7366        end

  • issm/trunk-jpl/src/m/classes/groundingline.py

    r17941 r18068  
    1717        def __init__(self): # {{{
    1818                self.migration=''
    19                 self.melting_rate=float('NaN')
    2019
    2120                #set defaults
    … …  
    2726
    2827                string="%s\n%s"%(string,fielddisplay(self,'migration','type of grounding line migration: ''SoftMigration'',''AggressiveMigration'',''SubelementMigration'',''SubelementMigration2'',''Contact'',''None'''))
    29                 string="%s\n%s"%(string,fielddisplay(self,'melting_rate','melting rate applied when previously grounded parts start floating [m/yr]'))
    3028                return string
    3129                #}}}   
    … …  
    3432                #Type of migration
    3533                self.migration='None'
    36 
    37                 #basal melting rate correction:
    38                 self.melting_rate=0;
    3934
    4035                return self
    … …  
    5752        def marshall(self,md,fid):    # {{{
    5853                WriteData(fid,'data',StringToEnum(self.migration)[0],'enum',GroundinglineMigrationEnum(),'format','Integer')
    59                 WriteData(fid,'object',self,'fieldname','melting_rate','format','Double')
    6054        # }}}

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

    r17720 r18068  
    4343                        md = checkfield(md,'fieldname','mask.groundedice_levelset','size',[md.mesh.numberofvertices 1]);
    4444                        md = checkfield(md,'fieldname','mask.ice_levelset'        ,'size',[md.mesh.numberofvertices 1]);
    45                         %isice=(md.mask.ice_levelset>0);
    46                         %if any(sum(isice(md.mesh.elements),2)==0),
    47                 %               warning('elements with no ice not implemented yet, each element should have at least one vertex with md.mask.ice_levelset > 0');
    48                 %       end
     45                        isice=(md.mask.ice_levelset<=0);
     46                        if sum(isice)==0,
     47                                warning('no ice present in the domain');
     48                        end
     49                        if max(md.mask.ice_levelset)<0,
     50                                warning('no ice front provided');
     51                        end
    4952                end % }}}
    5053                function disp(obj) % {{{

  • issm/trunk-jpl/src/m/classes/mask.py

    r17497 r18068  
    3434
    3535                md = checkfield(md,'fieldname','mask.ice_levelset'        ,'size',[md.mesh.numberofvertices])
    36                 #isice=numpy.array(md.mask.ice_levelset<0,int)
    37                 #totallyicefree=(numpy.sum(isice[md.mesh.elements-1],axis=1)==0).astype(int)
    38                 #if any(totallyicefree):
    39                 #       raise TypeError("elements with no ice not implemented yet, each element should have at least one vertex with md.mask.ice_levelset > 0")
     36                isice=numpy.array(md.mask.ice_levelset<=0,int)
     37                if numpy.sum(isice)==0:
     38                        raise TypeError("no ice present in the domain")
    4039
    4140                return md

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

    r17991 r18068  
    221221
    222222                        %special for thermal modeling:
    223                         md.basalforcings.melting_rate=project2d(md,md.basalforcings.melting_rate,1);
     223                        md.basalforcings.groundedice_melting_rate=project2d(md,md.basalforcings.melting_rate,1);
     224                        md.basalforcings.floatingice_melting_rate=project2d(md,md.basalforcings.melting_rate,1);
    224225                        md.basalforcings.geothermalflux=project2d(md,md.basalforcings.geothermalflux,1); %bedrock only gets geothermal flux
    225226
    … …  
    800801
    801802                        %special for thermal modeling:
    802                         md.basalforcings.melting_rate=project3d(md,'vector',md.basalforcings.melting_rate,'type','node','layer',1);
     803                        md.basalforcings.groundedice_melting_rate=project3d(md,'vector',md.basalforcings.groundedice_melting_rate,'type','node','layer',1);
     804                        md.basalforcings.floatingice_melting_rate=project3d(md,'vector',md.basalforcings.floatingice_melting_rate,'type','node','layer',1);
    803805                        if ~isnan(md.basalforcings.geothermalflux)
    804806                                md.basalforcings.geothermalflux=project3d(md,'vector',md.basalforcings.geothermalflux,'type','node','layer',1); %bedrock only gets geothermal flux
    … …  
    826828                        if isfield(structmd,'q'), md.friction.q=structmd.p; end
    827829                        if isfield(structmd,'melting'), md.basalforcings.melting_rate=structmd.melting; end
    828                         if isfield(structmd,'melting_rate'), md.basalforcings.melting_rate=structmd.melting_rate; end
     830                        if isfield(structmd,'melting_rate'), md.basalforcings.floatingice_melting_rate=structmd.melting_rate; end
    829831                        if isfield(structmd,'accumulation'), md.surfaceforcings.mass_balance=structmd.accumulation; end
    830832                        if isfield(structmd,'numberofgrids'), md.mesh.numberofvertices=structmd.numberofgrids; end
    … …  
    840842                        if isfield(structmd,'yts'), md.constants.yts=structmd.yts; end
    841843                        if isfield(structmd,'surface_mass_balance'), md.surfaceforcings.mass_balance=structmd.surface_mass_balance; end
    842                         if isfield(structmd,'basal_melting_rate'), md.basalforcings.melting_rate=structmd.basal_melting_rate; end
    843                         if isfield(structmd,'basal_melting_rate_correction'), md.basalforcings.melting_rate_correction=structmd.basal_melting_rate_correction; end
     844                        if isfield(structmd,'basal_melting_rate'), md.basalforcings.floatingice_melting_rate=structmd.basal_melting_rate; end
    844845                        if isfield(structmd,'geothermalflux'), md.basalforcings.geothermalflux=structmd.geothermalflux; end
    845846                        if isfield(structmd,'drag'), md.friction.coefficient=structmd.drag; end

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

    r18006 r18068  
    697697
    698698                #special for thermal modeling:
    699                 md.basalforcings.melting_rate=project3d(md,'vector',md.basalforcings.melting_rate,'type','node','layer',1)
     699                md.basalforcings.groundedice_melting_rate=project3d(md,'vector',md.basalforcings.groundedice_melting_rate,'type','node','layer',1)
     700                md.basalforcings.floatingice_melting_rate=project3d(md,'vector',md.basalforcings.floatingice_melting_rate,'type','node','layer',1)
    700701                if not numpy.any(numpy.isnan(md.basalforcings.geothermalflux)):
    701702                        md.basalforcings.geothermalflux=project3d(md,'vector',md.basalforcings.geothermalflux,'type','node','layer',1)    #bedrock only gets geothermal flux
    … …  
    779780
    780781                #special for thermal modeling:
    781                 md.basalforcings.melting_rate=project2d(md,md.basalforcings.melting_rate,1)
     782                md.basalforcings.groundedice_melting_rate=project2d(md,md.basalforcings.groundedice_melting_rate,1)
     783                md.basalforcings.floatingice_melting_rate=project2d(md,md.basalforcings.floatingice_melting_rate,1)
    782784                md.basalforcings.geothermalflux=project2d(md,md.basalforcings.geothermalflux,1) #bedrock only gets geothermal flux
    783785

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

    r17931 r18068  
    5151
    5252                        if self.isenthalpy,
    53                                 list = {'Enthalpy','Temperature','Waterfraction','Watercolumn','BasalforcingsMeltingRate'};
     53                                list = {'Enthalpy','Temperature','Waterfraction','Watercolumn','BasalforcingsGroundediceMeltingRate'};
    5454                        else
    55                                 list = {'Temperature','BasalforcingsMeltingRate'};
     55                                list = {'Temperature','BasalforcingsGroundediceMeltingRate'};
    5656                        end
    5757

  • issm/trunk-jpl/src/m/classes/thermal.py

    r17686 r18068  
    4444
    4545                if self.isenthalpy:
    46                         return ['Enthalpy','Temperature','Waterfraction','Watercolumn','BasalforcingsMeltingRate']
     46                        return ['Enthalpy','Temperature','Waterfraction','Watercolumn','BasalforcingsGroundediceMeltingRate']
    4747                else:
    48                         return ['Temperature','BasalforcingsMeltingRate']
     48                        return ['Temperature','BasalforcingsGroundediceMeltingRate']
    4949
    5050        #}}}

  • issm/trunk-jpl/src/m/contrib/hack/tres.m

    r17686 r18068  
    6767        md.initialization.pressure=md.results.SteadystateSolution.Pressure;
    6868        md.initialization.temperature=md.results.SteadystateSolution.Temperature;
    69         md.basalforcings.melting_rate=md.results.SteadystateSolution.BasalforcingsMeltingRate;
     69        md.basalforcings.groundedice_melting_rate=md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate;
    7070
    7171        if md.inversion.iscontrol==1,
    … …  
    7777elseif strcmpi(string,'thermal'),
    7878        md.initialization.temperature=md.results.ThermalSolution.Temperature;
    79         md.basalforcings.melting_rate=md.results.ThermalSolution.BasalMeltingRate;
     79        md.basalforcings.groundedice_melting_rate=md.results.ThermalSolution.BasalGroundediceMeltingRate;
    8080elseif strcmpi(string,'hydrology'),
    8181        md.initialization.watercolumn=md.results.HydrologySolution.Watercolumn;

  • issm/trunk-jpl/src/m/enum/EnumDefinitions.py

    r18000 r18068  
    3939def BalancethicknessThickeningRateEnum(): return StringToEnum("BalancethicknessThickeningRate")[0]
    4040def BasalforcingsGeothermalfluxEnum(): return StringToEnum("BasalforcingsGeothermalflux")[0]
    41 def BasalforcingsMeltingRateCorrectionEnum(): return StringToEnum("BasalforcingsMeltingRateCorrection")[0]
    42 def BasalforcingsMeltingRateEnum(): return StringToEnum("BasalforcingsMeltingRate")[0]
     41def BasalforcingsGroundediceMeltingRateEnum(): return StringToEnum("BasalforcingsGroundediceMeltingRate")[0]
     42def BasalforcingsFloatingiceMeltingRateEnum(): return StringToEnum("BasalforcingsFloatingiceMeltingRate")[0]
     43def BasalforcingsDeepwaterMeltingRateEnum(): return StringToEnum("BasalforcingsDeepwaterMeltingRate")[0]
     44def BasalforcingsDeepwaterElevationEnum(): return StringToEnum("BasalforcingsDeepwaterElevation")[0]
     45def BasalforcingsUpperwaterElevationEnum(): return StringToEnum("BasalforcingsUpperwaterElevation")[0]
    4346def BedEnum(): return StringToEnum("Bed")[0]
    4447def BaseEnum(): return StringToEnum("Base")[0]
    … …  
    482485def FractionIncrementEnum(): return StringToEnum("FractionIncrement")[0]
    483486def FrictionEnum(): return StringToEnum("Friction")[0]
    484 def GroundinglineMeltingRateEnum(): return StringToEnum("GroundinglineMeltingRate")[0]
    485487def InternalEnum(): return StringToEnum("Internal")[0]
    486488def MassFluxEnum(): return StringToEnum("MassFlux")[0]

  • issm/trunk-jpl/src/m/mech/steadystateiceshelftemp.m

    r17367 r18068  
    1212%        The model md must also contain the fields:
    1313%        md.geometry.thickness
    14 %        md.basalforcings.melting_rate (positive for melting, negative for freezing)
     14%        md.basalforcings.floatingice_melting_rate (positive for melting, negative for freezing)
    1515
    1616%   Usage:
    … …  
    3838
    3939%vertical velocity of ice shelf, calculated from melting rate
    40 wi=md.materials.rho_water/md.materials.rho_ice.*md.basalforcings.melting_rate;
     40wi=md.materials.rho_water/md.materials.rho_ice.*md.basalforcings.floatingice_melting_rate;
    4141
    4242%temperature profile is linear if melting rate is zero, depth-averaged temp is simple average in this case

  • issm/trunk-jpl/src/m/mech/steadystateiceshelftemp.py

    r15832 r18068  
    1313        The model md must also contain the fields:
    1414        md.geometry.thickness
    15         md.basalforcings.melting_rate (positive for melting, negative for freezing)
     15        md.basalforcings.floatingice_melting_rate (positive for melting, negative for freezing)
    1616
    1717   Usage:
    … …  
    3737       
    3838        #vertical velocity of ice shelf, calculated from melting rate
    39         wi=md.materials.rho_water/md.materials.rho_ice*md.basalforcings.melting_rate
     39        wi=md.materials.rho_water/md.materials.rho_ice*md.basalforcings.floatingice_melting_rate
    4040       
    4141        #temperature profile is linear if melting rate is zero, depth-averaged temp is simple average in this case

  • issm/trunk-jpl/test/NightlyRun/test108.m

    r15565 r18068  
    99
    1010%Fields and tolerances to track changes
    11 field_names     ={'Temperature','BasalforcingsMeltingRate'};
     11field_names     ={'Temperature','BasalforcingsGroundediceMeltingRate'};
    1212field_tolerances={1e-13,1e-5};
    1313field_values={...
    1414        (md.results.ThermalSolution.Temperature),...
    15         (md.results.ThermalSolution.BasalforcingsMeltingRate),...
     15        (md.results.ThermalSolution.BasalforcingsGroundediceMeltingRate),...
    1616        };

  • issm/trunk-jpl/test/NightlyRun/test108.py

    r15565 r18068  
    1818
    1919#Fields and tolerances to track changes
    20 field_names     =['Temperature','BasalforcingsMeltingRate']
     20field_names     =['Temperature','BasalforcingsGroundediceMeltingRate']
    2121field_tolerances=[1e-13,1e-5]
    2222field_values=[\
    2323        md.results.ThermalSolution.Temperature,\
    24         md.results.ThermalSolution.BasalforcingsMeltingRate,\
     24        md.results.ThermalSolution.BasalforcingsGroundediceMeltingRate,\
    2525        ]

  • issm/trunk-jpl/test/NightlyRun/test109.m

    r15771 r18068  
    1212
    1313%Fields and tolerances to track changes
    14 field_names     ={'Temperature','BasalforcingsMeltingRate'};
     14field_names     ={'Temperature','BasalforcingsGroundediceMeltingRate'};
    1515field_tolerances={1e-13,1e-13};
    1616field_values={...
    1717        (md.results.TransientSolution(1).Temperature),...
    18         (md.results.TransientSolution(1).BasalforcingsMeltingRate),...
     18        (md.results.TransientSolution(1).BasalforcingsGroundediceMeltingRate),...
    1919        };

  • issm/trunk-jpl/test/NightlyRun/test109.py

    r15771 r18068  
    2121
    2222#Fields and tolerances to track changes
    23 field_names     =['Temperature','BasalforcingsMeltingRate']
     23field_names     =['Temperature','BasalforcingsGroundediceMeltingRate']
    2424field_tolerances=[1e-13,1e-13]
    2525field_values=[\
    2626        md.results.TransientSolution[0].Temperature,\
    27         md.results.TransientSolution[0].BasalforcingsMeltingRate,\
     27        md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\
    2828        ]

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

    r17555 r18068  
    1010%Fields and tolerances to track changes
    1111field_names={...
    12         'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface2','Thickness1','Temperature1','BasalforcingsMeltingRate1','Volume1', ...
    13         'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2','Volume2', ...
    14         'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3','Volume3'};
     12        'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface2','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1','Volume1', ...
     13        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2','Volume2', ...
     14        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3','Volume3'};
    1515field_tolerances={...
    1616        1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,1e-13,...
    … …  
    2727        (md.results.TransientSolution(1).Thickness),...
    2828        (md.results.TransientSolution(1).Temperature),...
    29         (md.results.TransientSolution(1).BasalforcingsMeltingRate),...
     29        (md.results.TransientSolution(1).BasalforcingsGroundediceMeltingRate),...
    3030        (md.results.TransientSolution(1).IceVolume),...
    3131        (md.results.TransientSolution(2).Vx),...
    … …  
    3838        (md.results.TransientSolution(2).Thickness),...
    3939        (md.results.TransientSolution(2).Temperature),...
    40         (md.results.TransientSolution(2).BasalforcingsMeltingRate),...
     40        (md.results.TransientSolution(2).BasalforcingsGroundediceMeltingRate),...
    4141        (md.results.TransientSolution(2).IceVolume),...
    4242        (md.results.TransientSolution(3).Vx),...
    … …  
    4949        (md.results.TransientSolution(3).Thickness),...
    5050        (md.results.TransientSolution(3).Temperature),...
    51         (md.results.TransientSolution(3).BasalforcingsMeltingRate),...
     51        (md.results.TransientSolution(3).BasalforcingsGroundediceMeltingRate),...
    5252        (md.results.TransientSolution(3).IceVolume),...
    5353        };

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

    r17555 r18068  
    1919#Fields and tolerances to track changes
    2020field_names=[\
    21         'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface2','Thickness1','Temperature1','BasalforcingsMeltingRate1','Volume1', \
    22         'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2','Volume2', \
    23         'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3','Volume3']
     21        'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface2','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1','Volume1', \
     22        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2','Volume2', \
     23        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3','Volume3']
    2424field_tolerances=[\
    2525        1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,1e-13,\
    … …  
    3636        md.results.TransientSolution[0].Thickness,\
    3737        md.results.TransientSolution[0].Temperature,\
    38         md.results.TransientSolution[0].BasalforcingsMeltingRate,\
     38        md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\
    3939        md.results.TransientSolution[0].IceVolume,\
    4040        md.results.TransientSolution[1].Vx,\
    … …  
    4747        md.results.TransientSolution[1].Thickness,\
    4848        md.results.TransientSolution[1].Temperature,\
    49         md.results.TransientSolution[1].BasalforcingsMeltingRate,\
     49        md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\
    5050        md.results.TransientSolution[1].IceVolume,\
    5151        md.results.TransientSolution[2].Vx,\
    … …  
    5858        md.results.TransientSolution[2].Thickness,\
    5959        md.results.TransientSolution[2].Temperature,\
    60         md.results.TransientSolution[2].BasalforcingsMeltingRate,\
     60        md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate,\
    6161        md.results.TransientSolution[2].IceVolume,\
    6262        ]

  • issm/trunk-jpl/test/NightlyRun/test1208.m

    r17610 r18068  
    3030
    3131%Fields and tolerances to track changes
    32 field_names     ={'Vx','Vy','Vz','Vel','Pressure','Thickness','Base','Surface','Temperature','BasalforcingsMeltingRate'};
     32field_names     ={'Vx','Vy','Vz','Vel','Pressure','Thickness','Base','Surface','Temperature','BasalforcingsGroundediceMeltingRate'};
    3333field_tolerances={1e-08,1e-08,1e-07,1e-08,1e-08,1e-08,1e-08,1e-08,1e-07,3e-07};
    3434field_values={...
    … …  
    4242        (md.results.TransientSolution(end).Surface),...
    4343        (md.results.TransientSolution(end).Temperature),...
    44         (md.results.TransientSolution(end).BasalforcingsMeltingRate),...
     44        (md.results.TransientSolution(end).BasalforcingsGroundediceMeltingRate),...
    4545        };

  • issm/trunk-jpl/test/NightlyRun/test1208.py

    r17610 r18068  
    4343
    4444#Fields and tolerances to track changes
    45 field_names     =['Vx','Vy','Vz','Vel','Pressure','Thickness','Base','Surface','Temperature','BasalforcingsMeltingRate']
     45field_names     =['Vx','Vy','Vz','Vel','Pressure','Thickness','Base','Surface','Temperature','BasalforcingsGroundediceMeltingRate']
    4646field_tolerances=[1e-08,1e-08,1e-07,1e-08,1e-08,1e-08,1e-08,1e-08,1e-07,1e-07]
    4747field_values=[\
    … …  
    5555        md.results.TransientSolution[-1].Surface,\
    5656        md.results.TransientSolution[-1].Temperature,\
    57         md.results.TransientSolution[-1].BasalforcingsMeltingRate,\
     57        md.results.TransientSolution[-1].BasalforcingsGroundediceMeltingRate,\
    5858        ]

  • issm/trunk-jpl/test/NightlyRun/test1301.m

    r16512 r18068  
    2929
    3030%plot results
    31 comp_melting=md.results.ThermalSolution.BasalforcingsMeltingRate;
     31comp_melting=md.results.ThermalSolution.BasalforcingsGroundediceMeltingRate;
    3232relative=abs((comp_melting-melting)./melting)*100.;
    3333relative(find(comp_melting==melting))=0.;

  • issm/trunk-jpl/test/NightlyRun/test1301.py

    r15565 r18068  
    4343
    4444#plot results
    45 comp_melting=md.results.ThermalSolution.BasalforcingsMeltingRate
     45comp_melting=md.results.ThermalSolution.BasalforcingsGroundediceMeltingRate
    4646relative=numpy.abs((comp_melting-melting)/melting)*100.
    4747relative[numpy.nonzero(comp_melting==melting)[0]]=0.

  • issm/trunk-jpl/test/NightlyRun/test206.m

    r17747 r18068  
    99
    1010%Fields and tolerances to track changes
    11 field_names     ={'Temperature','BasalforcingsMeltingRate'};
     11field_names     ={'Temperature','BasalforcingsGroundediceMeltingRate'};
    1212field_tolerances={1e-13,5e-6};
    1313field_values={...
    1414        (md.results.ThermalSolution.Temperature),...
    15         (md.results.ThermalSolution.BasalforcingsMeltingRate),...
     15        (md.results.ThermalSolution.BasalforcingsGroundediceMeltingRate),...
    1616        };

  • issm/trunk-jpl/test/NightlyRun/test206.py

    r17747 r18068  
    2222# Fields and tolerances to track changes
    2323
    24 field_names     =['Temperature','BasalforcingsMeltingRate']
     24field_names     =['Temperature','BasalforcingsGroundediceMeltingRate']
    2525field_tolerances=[1e-13,5e-6]
    2626field_values=[\
    2727        md.results.ThermalSolution.Temperature,\
    28         md.results.ThermalSolution.BasalforcingsMeltingRate,\
     28        md.results.ThermalSolution.BasalforcingsGroundediceMeltingRate,\
    2929        ]

  • issm/trunk-jpl/test/NightlyRun/test207.m

    r15771 r18068  
    1212
    1313%Fields and tolerances to track changes
    14 field_names     ={'Temperature1','BasalforcingsMeltingRate1','Temperature2','BasalforcingsMeltingRate2','Temperature3','BasalforcingsMeltingRate3'};
     14field_names     ={'Temperature1','BasalforcingsGroundediceMeltingRate1','Temperature2','BasalforcingsGroundediceMeltingRate2','Temperature3','BasalforcingsGroundediceMeltingRate3'};
    1515field_tolerances={1e-13,1e-6,1e-13,1e-6,1e-13,1e-6};
    1616field_values={...
    1717        (md.results.TransientSolution(1).Temperature),...
    18         (md.results.TransientSolution(1).BasalforcingsMeltingRate),...
     18        (md.results.TransientSolution(1).BasalforcingsGroundediceMeltingRate),...
    1919        (md.results.TransientSolution(2).Temperature),...
    20         (md.results.TransientSolution(2).BasalforcingsMeltingRate),...
     20        (md.results.TransientSolution(2).BasalforcingsGroundediceMeltingRate),...
    2121        (md.results.TransientSolution(3).Temperature),...
    22         (md.results.TransientSolution(3).BasalforcingsMeltingRate),...
     22        (md.results.TransientSolution(3).BasalforcingsGroundediceMeltingRate),...
    2323        };

  • issm/trunk-jpl/test/NightlyRun/test207.py

    r17499 r18068  
    2323
    2424# Fields and tolerances to track changes
    25 field_names     =['Temperature1','BasalforcingsMeltingRate1','Temperature2','BasalforcingsMeltingRate2','Temperature3','BasalforcingsMeltingRate3']
     25field_names     =['Temperature1','BasalforcingsGroundediceMeltingRate1','Temperature2','BasalforcingsGroundediceMeltingRate2','Temperature3','BasalforcingsGroundediceMeltingRate3']
    2626field_tolerances=[1e-13,1e-6,1e-13,1e-6,1e-13,1e-6]
    2727field_values=[\
    2828        md.results.TransientSolution[0].Temperature,\
    29         md.results.TransientSolution[0].BasalforcingsMeltingRate,\
     29        md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\
    3030        md.results.TransientSolution[1].Temperature,\
    31         md.results.TransientSolution[1].BasalforcingsMeltingRate,\
     31        md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\
    3232        md.results.TransientSolution[2].Temperature,\
    33         md.results.TransientSolution[2].BasalforcingsMeltingRate,\
     33        md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate,\
    3434        ]

  • issm/trunk-jpl/test/NightlyRun/test209.m

    r17787 r18068  
    88
    99%Fields and tolerances to track changes
    10 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ...
    11         'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ...
    12         'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'};
     10field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', ...
     11        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2', ...
     12        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3'};
    1313field_tolerances={...
    1414        1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,...
    … …  
    2525        (md.results.TransientSolution(1).Thickness),...
    2626        (md.results.TransientSolution(1).Temperature),...
    27         (md.results.TransientSolution(1).BasalforcingsMeltingRate),...
     27        (md.results.TransientSolution(1).BasalforcingsGroundediceMeltingRate),...
    2828        (md.results.TransientSolution(2).Vx),...
    2929        (md.results.TransientSolution(2).Vy),...
    … …  
    3535        (md.results.TransientSolution(2).Thickness),...
    3636        (md.results.TransientSolution(2).Temperature),...
    37         (md.results.TransientSolution(2).BasalforcingsMeltingRate),...
     37        (md.results.TransientSolution(2).BasalforcingsGroundediceMeltingRate),...
    3838        (md.results.TransientSolution(3).Vx),...
    3939        (md.results.TransientSolution(3).Vy),...
    … …  
    4545        (md.results.TransientSolution(3).Thickness),...
    4646        (md.results.TransientSolution(3).Temperature),...
    47         (md.results.TransientSolution(3).BasalforcingsMeltingRate),...
     47        (md.results.TransientSolution(3).BasalforcingsGroundediceMeltingRate),...
    4848        };

  • issm/trunk-jpl/test/NightlyRun/test209.py

    r17787 r18068  
    2121# Fields and tolerances to track changes
    2222
    23 field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', \
    24         'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', \
    25         'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3']
     23field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', \
     24        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2', \
     25        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3']
    2626field_tolerances=[\
    2727        1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,\
    … …  
    3939        md.results.TransientSolution[0].Thickness,\
    4040        md.results.TransientSolution[0].Temperature,\
    41         md.results.TransientSolution[0].BasalforcingsMeltingRate,\
     41        md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\
    4242        md.results.TransientSolution[1].Vx,\
    4343        md.results.TransientSolution[1].Vy,\
    … …  
    4949        md.results.TransientSolution[1].Thickness,\
    5050        md.results.TransientSolution[1].Temperature,\
    51         md.results.TransientSolution[1].BasalforcingsMeltingRate,\
     51        md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\
    5252        md.results.TransientSolution[2].Vx,\
    5353        md.results.TransientSolution[2].Vy,\
    … …  
    5959        md.results.TransientSolution[2].Thickness,\
    6060        md.results.TransientSolution[2].Temperature,\
    61         md.results.TransientSolution[2].BasalforcingsMeltingRate,\
     61        md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate,\
    6262        ]

  • issm/trunk-jpl/test/NightlyRun/test210.m

    r17555 r18068  
    88
    99%Fields and tolerances to track changes
    10 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ...
    11                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ...
    12                                            'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'};
     10field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', ...
     11                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2', ...
     12                                           'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3'};
    1313field_tolerances={...
    1414        1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,...
    … …  
    2525        (md.results.TransientSolution(1).Thickness),...
    2626        (md.results.TransientSolution(1).Temperature),...
    27         (md.results.TransientSolution(1).BasalforcingsMeltingRate),...
     27        (md.results.TransientSolution(1).BasalforcingsGroundediceMeltingRate),...
    2828        (md.results.TransientSolution(2).Vx),...
    2929        (md.results.TransientSolution(2).Vy),...
    … …  
    3535        (md.results.TransientSolution(2).Thickness),...
    3636        (md.results.TransientSolution(2).Temperature),...
    37         (md.results.TransientSolution(2).BasalforcingsMeltingRate),...
     37        (md.results.TransientSolution(2).BasalforcingsGroundediceMeltingRate),...
    3838        (md.results.TransientSolution(3).Vx),...
    3939        (md.results.TransientSolution(3).Vy),...
    … …  
    4545        (md.results.TransientSolution(3).Thickness),...
    4646        (md.results.TransientSolution(3).Temperature),...
    47         (md.results.TransientSolution(3).BasalforcingsMeltingRate),...
     47        (md.results.TransientSolution(3).BasalforcingsGroundediceMeltingRate),...
    4848        };

  • issm/trunk-jpl/test/NightlyRun/test210.py

    r17555 r18068  
    2121# Fields and tolerances to track changes
    2222
    23 field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', \
    24                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', \
    25                                            'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3']
     23field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', \
     24                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2', \
     25                                           'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3']
    2626field_tolerances=[\
    2727        1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,\
    … …  
    3838        md.results.TransientSolution[0].Thickness,\
    3939        md.results.TransientSolution[0].Temperature,\
    40         md.results.TransientSolution[0].BasalforcingsMeltingRate,\
     40        md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\
    4141        md.results.TransientSolution[1].Vx,\
    4242        md.results.TransientSolution[1].Vy,\
    … …  
    4848        md.results.TransientSolution[1].Thickness,\
    4949        md.results.TransientSolution[1].Temperature,\
    50         md.results.TransientSolution[1].BasalforcingsMeltingRate,\
     50        md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\
    5151        md.results.TransientSolution[2].Vx,\
    5252        md.results.TransientSolution[2].Vy,\
    … …  
    5858        md.results.TransientSolution[2].Thickness,\
    5959        md.results.TransientSolution[2].Temperature,\
    60         md.results.TransientSolution[2].BasalforcingsMeltingRate,\
     60        md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate,\
    6161        ]

  • issm/trunk-jpl/test/NightlyRun/test211.m

    r17916 r18068  
    1010%Fields and tolerances to track changes
    1111field_names={...
    12         'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ...
    13         'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ...
    14         'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'};
     12        'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', ...
     13        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2', ...
     14        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3'};
    1515field_tolerances={...
    1616        2e-08,2e-08,1e-06,2e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,...
    … …  
    2727        (md.results.TransientSolution(1).Thickness),...
    2828        (md.results.TransientSolution(1).Temperature),...
    29         (md.results.TransientSolution(1).BasalforcingsMeltingRate),...
     29        (md.results.TransientSolution(1).BasalforcingsGroundediceMeltingRate),...
    3030        (md.results.TransientSolution(2).Vx),...
    3131        (md.results.TransientSolution(2).Vy),...
    … …  
    3737        (md.results.TransientSolution(2).Thickness),...
    3838        (md.results.TransientSolution(2).Temperature),...
    39         (md.results.TransientSolution(2).BasalforcingsMeltingRate),...
     39        (md.results.TransientSolution(2).BasalforcingsGroundediceMeltingRate),...
    4040        (md.results.TransientSolution(3).Vx),...
    4141        (md.results.TransientSolution(3).Vy),...
    … …  
    4747        (md.results.TransientSolution(3).Thickness),...
    4848        (md.results.TransientSolution(3).Temperature),...
    49         (md.results.TransientSolution(3).BasalforcingsMeltingRate),...
     49        (md.results.TransientSolution(3).BasalforcingsGroundediceMeltingRate),...
    5050        };

  • issm/trunk-jpl/test/NightlyRun/test211.py

    r17916 r18068  
    2323
    2424field_names=[\
    25         'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', \
    26         'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', \
    27         'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3']
     25        'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', \
     26        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2', \
     27        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3']
    2828field_tolerances=[\
    2929        2e-08,2e-08,1e-06,2e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,\
    … …  
    4040        md.results.TransientSolution[0].Thickness,\
    4141        md.results.TransientSolution[0].Temperature,\
    42         md.results.TransientSolution[0].BasalforcingsMeltingRate,\
     42        md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\
    4343        md.results.TransientSolution[1].Vx,\
    4444        md.results.TransientSolution[1].Vy,\
    … …  
    5050        md.results.TransientSolution[1].Thickness,\
    5151        md.results.TransientSolution[1].Temperature,\
    52         md.results.TransientSolution[1].BasalforcingsMeltingRate,\
     52        md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\
    5353        md.results.TransientSolution[2].Vx,\
    5454        md.results.TransientSolution[2].Vy,\
    … …  
    6060        md.results.TransientSolution[2].Thickness,\
    6161        md.results.TransientSolution[2].Temperature,\
    62         md.results.TransientSolution[2].BasalforcingsMeltingRate,\
     62        md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate,\
    6363        ]

  • issm/trunk-jpl/test/NightlyRun/test224.m

    r17555 r18068  
    99
    1010%Fields and tolerances to track changes
    11 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ...
    12         'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ...
    13         'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'};
     11field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', ...
     12        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2', ...
     13        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3'};
    1414field_tolerances={...
    1515        1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,...
    … …  
    2626        (md.results.TransientSolution(1).Thickness),...
    2727        (md.results.TransientSolution(1).Temperature),...
    28         (md.results.TransientSolution(1).BasalforcingsMeltingRate),...
     28        (md.results.TransientSolution(1).BasalforcingsGroundediceMeltingRate),...
    2929        (md.results.TransientSolution(2).Vx),...
    3030        (md.results.TransientSolution(2).Vy),...
    … …  
    3636        (md.results.TransientSolution(2).Thickness),...
    3737        (md.results.TransientSolution(2).Temperature),...
    38         (md.results.TransientSolution(2).BasalforcingsMeltingRate),...
     38        (md.results.TransientSolution(2).BasalforcingsGroundediceMeltingRate),...
    3939        (md.results.TransientSolution(3).Vx),...
    4040        (md.results.TransientSolution(3).Vy),...
    … …  
    4646        (md.results.TransientSolution(3).Thickness),...
    4747        (md.results.TransientSolution(3).Temperature),...
    48         (md.results.TransientSolution(3).BasalforcingsMeltingRate),...
     48        (md.results.TransientSolution(3).BasalforcingsGroundediceMeltingRate),...
    4949        };

  • issm/trunk-jpl/test/NightlyRun/test224.py

    r17555 r18068  
    1818
    1919#Fields and tolerances to track changes
    20 field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', \
    21         'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', \
    22         'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3']
     20field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', \
     21        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2', \
     22        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3']
    2323field_tolerances=[\
    2424        1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,\
    … …  
    3535        md.results.TransientSolution[0].Thickness,\
    3636        md.results.TransientSolution[0].Temperature,\
    37         md.results.TransientSolution[0].BasalforcingsMeltingRate,\
     37        md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\
    3838        md.results.TransientSolution[1].Vx,\
    3939        md.results.TransientSolution[1].Vy,\
    … …  
    4545        md.results.TransientSolution[1].Thickness,\
    4646        md.results.TransientSolution[1].Temperature,\
    47         md.results.TransientSolution[1].BasalforcingsMeltingRate,\
     47        md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\
    4848        md.results.TransientSolution[2].Vx,\
    4949        md.results.TransientSolution[2].Vy,\
    … …  
    5555        md.results.TransientSolution[2].Thickness,\
    5656        md.results.TransientSolution[2].Temperature,\
    57         md.results.TransientSolution[2].BasalforcingsMeltingRate,\
     57        md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate,\
    5858        ]

  • issm/trunk-jpl/test/NightlyRun/test225.m

    r17590 r18068  
    1010
    1111%Fields and tolerances to track changes
    12 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ...
    13         'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ...
    14         'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'};
     12field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', ...
     13        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2', ...
     14        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3'};
    1515field_tolerances={...
    1616        1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,...
    … …  
    2727        (md.results.TransientSolution(1).Thickness),...
    2828        (md.results.TransientSolution(1).Temperature),...
    29         (md.results.TransientSolution(1).BasalforcingsMeltingRate),...
     29        (md.results.TransientSolution(1).BasalforcingsGroundediceMeltingRate),...
    3030        (md.results.TransientSolution(2).Vx),...
    3131        (md.results.TransientSolution(2).Vy),...
    … …  
    3737        (md.results.TransientSolution(2).Thickness),...
    3838        (md.results.TransientSolution(2).Temperature),...
    39         (md.results.TransientSolution(2).BasalforcingsMeltingRate),...
     39        (md.results.TransientSolution(2).BasalforcingsGroundediceMeltingRate),...
    4040        (md.results.TransientSolution(3).Vx),...
    4141        (md.results.TransientSolution(3).Vy),...
    … …  
    4747        (md.results.TransientSolution(3).Thickness),...
    4848        (md.results.TransientSolution(3).Temperature),...
    49         (md.results.TransientSolution(3).BasalforcingsMeltingRate),...
     49        (md.results.TransientSolution(3).BasalforcingsGroundediceMeltingRate),...
    5050        };

  • issm/trunk-jpl/test/NightlyRun/test225.py

    r17590 r18068  
    2020
    2121#Fields and tolerances to track changes
    22 field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', \
    23         'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', \
    24         'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3']
     22field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', \
     23        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2', \
     24        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3']
    2525field_tolerances=[\
    2626        1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,\
    … …  
    3737        md.results.TransientSolution[0].Thickness,\
    3838        md.results.TransientSolution[0].Temperature,\
    39         md.results.TransientSolution[0].BasalforcingsMeltingRate,\
     39        md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\
    4040        md.results.TransientSolution[1].Vx,\
    4141        md.results.TransientSolution[1].Vy,\
    … …  
    4747        md.results.TransientSolution[1].Thickness,\
    4848        md.results.TransientSolution[1].Temperature,\
    49         md.results.TransientSolution[1].BasalforcingsMeltingRate,\
     49        md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\
    5050        md.results.TransientSolution[2].Vx,\
    5151        md.results.TransientSolution[2].Vy,\
    … …  
    5757        md.results.TransientSolution[2].Thickness,\
    5858        md.results.TransientSolution[2].Temperature,\
    59         md.results.TransientSolution[2].BasalforcingsMeltingRate,\
     59        md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate,\
    6060        ]

  • issm/trunk-jpl/test/NightlyRun/test227.m

    r17555 r18068  
    1010
    1111%Fields and tolerances to track changes
    12 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ...
    13         'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ...
    14         'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'};
     12field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', ...
     13        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2', ...
     14        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3'};
    1515field_tolerances={...
    1616        1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,...
    … …  
    2727        (md.results.TransientSolution(1).Thickness),...
    2828        (md.results.TransientSolution(1).Temperature),...
    29         (md.results.TransientSolution(1).BasalforcingsMeltingRate),...
     29        (md.results.TransientSolution(1).BasalforcingsGroundediceMeltingRate),...
    3030        (md.results.TransientSolution(2).Vx),...
    3131        (md.results.TransientSolution(2).Vy),...
    … …  
    3737        (md.results.TransientSolution(2).Thickness),...
    3838        (md.results.TransientSolution(2).Temperature),...
    39         (md.results.TransientSolution(2).BasalforcingsMeltingRate),...
     39        (md.results.TransientSolution(2).BasalforcingsGroundediceMeltingRate),...
    4040        (md.results.TransientSolution(3).Vx),...
    4141        (md.results.TransientSolution(3).Vy),...
    … …  
    4747        (md.results.TransientSolution(3).Thickness),...
    4848        (md.results.TransientSolution(3).Temperature),...
    49         (md.results.TransientSolution(3).BasalforcingsMeltingRate),...
     49        (md.results.TransientSolution(3).BasalforcingsGroundediceMeltingRate),...
    5050        };

  • issm/trunk-jpl/test/NightlyRun/test227.py

    r17555 r18068  
    1919
    2020#Fields and tolerances to track changes
    21 field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', \
    22         'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', \
    23         'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3']
     21field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', \
     22        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2', \
     23        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3']
    2424field_tolerances=[\
    2525        1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,\
    … …  
    3636        md.results.TransientSolution[0].Thickness,\
    3737        md.results.TransientSolution[0].Temperature,\
    38         md.results.TransientSolution[0].BasalforcingsMeltingRate,\
     38        md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\
    3939        md.results.TransientSolution[1].Vx,\
    4040        md.results.TransientSolution[1].Vy,\
    … …  
    4646        md.results.TransientSolution[1].Thickness,\
    4747        md.results.TransientSolution[1].Temperature,\
    48         md.results.TransientSolution[1].BasalforcingsMeltingRate,\
     48        md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\
    4949        md.results.TransientSolution[2].Vx,\
    5050        md.results.TransientSolution[2].Vy,\
    … …  
    5656        md.results.TransientSolution[2].Thickness,\
    5757        md.results.TransientSolution[2].Temperature,\
    58         md.results.TransientSolution[2].BasalforcingsMeltingRate,\
     58        md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate,\
    5959        ]

  • issm/trunk-jpl/test/NightlyRun/test232.m

    r15771 r18068  
    1515
    1616%Fields and tolerances to track changes
    17 field_names     ={'Temperature1','BasalforcingsMeltingRate1','Temperature2','BasalforcingsMeltingRate2','Temperature3','BasalforcingsMeltingRate3','Temperature4','BasalforcingsMeltingRate4'};
     17field_names     ={'Temperature1','BasalforcingsGroundediceMeltingRate1','Temperature2','BasalforcingsGroundediceMeltingRate2','Temperature3','BasalforcingsGroundediceMeltingRate3','Temperature4','BasalforcingsGroundediceMeltingRate4'};
    1818field_tolerances={1e-13,1e-6,1e-13,1e-6,1e-13,1e-6,1e-13,1e-6};
    1919field_values={...
    2020        (md.results.TransientSolution(1).Temperature),...
    21         (md.results.TransientSolution(1).BasalforcingsMeltingRate),...
     21        (md.results.TransientSolution(1).BasalforcingsGroundediceMeltingRate),...
    2222        (md.results.TransientSolution(2).Temperature),...
    23         (md.results.TransientSolution(2).BasalforcingsMeltingRate),...
     23        (md.results.TransientSolution(2).BasalforcingsGroundediceMeltingRate),...
    2424        (md.results.TransientSolution(3).Temperature),...
    25         (md.results.TransientSolution(3).BasalforcingsMeltingRate),...
     25        (md.results.TransientSolution(3).BasalforcingsGroundediceMeltingRate),...
    2626        (md.results.TransientSolution(4).Temperature),...
    27         (md.results.TransientSolution(4).BasalforcingsMeltingRate),...
     27        (md.results.TransientSolution(4).BasalforcingsGroundediceMeltingRate),...
    2828        };

  • issm/trunk-jpl/test/NightlyRun/test232.py

    r15771 r18068  
    2525
    2626#Fields and tolerances to track changes
    27 field_names     =['Temperature1','BasalforcingsMeltingRate1','Temperature2','BasalforcingsMeltingRate2','Temperature3','BasalforcingsMeltingRate3','Temperature4','BasalforcingsMeltingRate4']
     27field_names     =['Temperature1','BasalforcingsGroundediceMeltingRate1','Temperature2','BasalforcingsGroundediceMeltingRate2','Temperature3','BasalforcingsGroundediceMeltingRate3','Temperature4','BasalforcingsGroundediceMeltingRate4']
    2828field_tolerances=[1e-13,1e-6,1e-13,1e-6,1e-13,1e-6,1e-13,1e-6]
    2929field_values=[\
    3030        md.results.TransientSolution[0].Temperature,\
    31         md.results.TransientSolution[0].BasalforcingsMeltingRate,\
     31        md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\
    3232        md.results.TransientSolution[1].Temperature,\
    33         md.results.TransientSolution[1].BasalforcingsMeltingRate,\
     33        md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\
    3434        md.results.TransientSolution[2].Temperature,\
    35         md.results.TransientSolution[2].BasalforcingsMeltingRate,\
     35        md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate,\
    3636        md.results.TransientSolution[3].Temperature,\
    37         md.results.TransientSolution[3].BasalforcingsMeltingRate,\
     37        md.results.TransientSolution[3].BasalforcingsGroundediceMeltingRate,\
    3838        ]

  • issm/trunk-jpl/test/NightlyRun/test233.m

    r17747 r18068  
    1111
    1212%Fields and tolerances to track changes
    13 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ...
    14         'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ...
    15         'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3', ...
    16         'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','Temperature4','BasalforcingsMeltingRate4'};
     13field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', ...
     14        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2', ...
     15        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3', ...
     16        'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','Temperature4','BasalforcingsGroundediceMeltingRate4'};
    1717field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09, ...
    1818        1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06, ...
    … …  
    2929        (md.results.TransientSolution(1).Thickness),...
    3030        (md.results.TransientSolution(1).Temperature),...
    31         (md.results.TransientSolution(1).BasalforcingsMeltingRate),...
     31        (md.results.TransientSolution(1).BasalforcingsGroundediceMeltingRate),...
    3232        (md.results.TransientSolution(2).Vx),...
    3333        (md.results.TransientSolution(2).Vy),...
    … …  
    3939        (md.results.TransientSolution(2).Thickness),...
    4040        (md.results.TransientSolution(2).Temperature),...
    41         (md.results.TransientSolution(2).BasalforcingsMeltingRate),...
     41        (md.results.TransientSolution(2).BasalforcingsGroundediceMeltingRate),...
    4242        (md.results.TransientSolution(3).Vx),...
    4343        (md.results.TransientSolution(3).Vy),...
    … …  
    4949        (md.results.TransientSolution(3).Thickness),...
    5050        (md.results.TransientSolution(3).Temperature),...
    51         (md.results.TransientSolution(3).BasalforcingsMeltingRate),...
     51        (md.results.TransientSolution(3).BasalforcingsGroundediceMeltingRate),...
    5252        (md.results.TransientSolution(4).Vx),...
    5353        (md.results.TransientSolution(4).Vy),...
    … …  
    5959        (md.results.TransientSolution(4).Thickness),...
    6060        (md.results.TransientSolution(4).Temperature),...
    61         (md.results.TransientSolution(4).BasalforcingsMeltingRate),...
     61        (md.results.TransientSolution(4).BasalforcingsGroundediceMeltingRate),...
    6262        };

  • issm/trunk-jpl/test/NightlyRun/test233.py

    r17747 r18068  
    2121
    2222#Fields and tolerances to track changes
    23 field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', \
    24         'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', \
    25         'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3', \
    26         'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','Temperature4','BasalforcingsMeltingRate4']
     23field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', \
     24        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2', \
     25        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3', \
     26        'Vx4','Vy4','Vz4','Vel4','Pressure4','Bed4','Surface4','Thickness4','Temperature4','BasalforcingsGroundediceMeltingRate4']
    2727field_tolerances=[1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09, \
    2828        1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06, \
    … …  
    3939        md.results.TransientSolution[0].Thickness,\
    4040        md.results.TransientSolution[0].Temperature,\
    41         md.results.TransientSolution[0].BasalforcingsMeltingRate,\
     41        md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\
    4242        md.results.TransientSolution[1].Vx,\
    4343        md.results.TransientSolution[1].Vy,\
    … …  
    4949        md.results.TransientSolution[1].Thickness,\
    5050        md.results.TransientSolution[1].Temperature,\
    51         md.results.TransientSolution[1].BasalforcingsMeltingRate,\
     51        md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\
    5252        md.results.TransientSolution[2].Vx,\
    5353        md.results.TransientSolution[2].Vy,\
    … …  
    5959        md.results.TransientSolution[2].Thickness,\
    6060        md.results.TransientSolution[2].Temperature,\
    61         md.results.TransientSolution[2].BasalforcingsMeltingRate,\
     61        md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate,\
    6262        md.results.TransientSolution[3].Vx,\
    6363        md.results.TransientSolution[3].Vy,\
    … …  
    6969        md.results.TransientSolution[3].Thickness,\
    7070        md.results.TransientSolution[3].Temperature,\
    71         md.results.TransientSolution[3].BasalforcingsMeltingRate,\
     71        md.results.TransientSolution[3].BasalforcingsGroundediceMeltingRate,\
    7272        ]

  • issm/trunk-jpl/test/NightlyRun/test237.m

    r17555 r18068  
    5454
    5555%Fields and tolerances to track changes
    56 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ...
    57                                                 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ...
    58                                                 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'};
     56field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', ...
     57                                                'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2', ...
     58                                                'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3'};
    5959field_tolerances={...
    6060        1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,1e-8,1e-8,1e-13,1e-8,...
    … …  
    7171        (md.results.TransientSolution(1).Thickness),...
    7272        (md.results.TransientSolution(1).Temperature),...
    73         (md.results.TransientSolution(1).BasalforcingsMeltingRate),...
     73        (md.results.TransientSolution(1).BasalforcingsGroundediceMeltingRate),...
    7474        (md.results.TransientSolution(1).SurfaceforcingsMonthlytemperatures),...
    7575        (md.results.TransientSolution(1).SurfaceforcingsMassBalance),...
    … …  
    8383        (md.results.TransientSolution(2).Thickness),...
    8484        (md.results.TransientSolution(2).Temperature),...
    85         (md.results.TransientSolution(2).BasalforcingsMeltingRate),...
     85        (md.results.TransientSolution(2).BasalforcingsGroundediceMeltingRate),...
    8686        (md.results.TransientSolution(2).SurfaceforcingsMonthlytemperatures),...
    8787        (md.results.TransientSolution(2).SurfaceforcingsMassBalance),...
    … …  
    9595        (md.results.TransientSolution(3).Thickness),...
    9696        (md.results.TransientSolution(3).Temperature),...
    97         (md.results.TransientSolution(3).BasalforcingsMeltingRate),...
     97        (md.results.TransientSolution(3).BasalforcingsGroundediceMeltingRate),...
    9898        (md.results.TransientSolution(3).SurfaceforcingsMonthlytemperatures),...
    9999        (md.results.TransientSolution(3).SurfaceforcingsMassBalance),...

  • issm/trunk-jpl/test/NightlyRun/test237.py

    r17601 r18068  
    6666
    6767#Fields and tolerances to track changes
    68 field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', \
    69                                                 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', \
    70                                                 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3']
     68field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', \
     69                                                'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2', \
     70                                                'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3']
    7171field_tolerances=[\
    7272        1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,1e-8,1e-13,1e-13,1e-8,\
    … …  
    8383        md.results.TransientSolution[0].Thickness,\
    8484        md.results.TransientSolution[0].Temperature,\
    85         md.results.TransientSolution[0].BasalforcingsMeltingRate,\
     85        md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\
    8686        md.results.TransientSolution[0].SurfaceforcingsMonthlytemperatures,\
    8787        md.results.TransientSolution[0].SurfaceforcingsMassBalance,\
    … …  
    9595        md.results.TransientSolution[1].Thickness,\
    9696        md.results.TransientSolution[1].Temperature,\
    97         md.results.TransientSolution[1].BasalforcingsMeltingRate,\
     97        md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\
    9898        md.results.TransientSolution[1].SurfaceforcingsMonthlytemperatures,\
    9999        md.results.TransientSolution[1].SurfaceforcingsMassBalance,\
    … …  
    107107        md.results.TransientSolution[2].Thickness,\
    108108        md.results.TransientSolution[2].Temperature,\
    109         md.results.TransientSolution[2].BasalforcingsMeltingRate,\
     109        md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate,\
    110110        md.results.TransientSolution[2].SurfaceforcingsMonthlytemperatures,\
    111111        md.results.TransientSolution[2].SurfaceforcingsMassBalance,\

  • issm/trunk-jpl/test/NightlyRun/test3008.m

    r16192 r18068  
    1212
    1313%Fields and tolerances to track changes
    14 field_names     ={'Temperature','BasalforcingsMeltingRate'};
     14field_names     ={'Temperature','BasalforcingsGroundediceMeltingRate'};
    1515field_tolerances={1e-13,1e-13};
    1616field_values={...
    1717        (md.results.ThermalSolution.Temperature),...
    18         (md.results.ThermalSolution.BasalforcingsMeltingRate),...
     18        (md.results.ThermalSolution.BasalforcingsGroundediceMeltingRate),...
    1919        };

  • issm/trunk-jpl/test/NightlyRun/test3008.py

    r16192 r18068  
    2020
    2121#Fields and tolerances to track changes
    22 field_names     =['Temperature','BasalforcingsMeltingRate']
     22field_names     =['Temperature','BasalforcingsGroundediceMeltingRate']
    2323field_tolerances=[1e-13,1e-13]
    2424field_values=[\
    2525        md.results.ThermalSolution.Temperature,\
    26         md.results.ThermalSolution.BasalforcingsMeltingRate,\
     26        md.results.ThermalSolution.BasalforcingsGroundediceMeltingRate,\
    2727        ]

  • issm/trunk-jpl/test/NightlyRun/test3009.m

    r16192 r18068  
    1515
    1616%Fields and tolerances to track changes
    17 field_names     ={'Temperature','BasalforcingsMeltingRate'};
     17field_names     ={'Temperature','BasalforcingsGroundediceMeltingRate'};
    1818field_tolerances={1e-13,1e-13};
    1919field_values={...
    2020        (md.results.TransientSolution(1).Temperature),...
    21         (md.results.TransientSolution(1).BasalforcingsMeltingRate),...
     21        (md.results.TransientSolution(1).BasalforcingsGroundediceMeltingRate),...
    2222        };

  • issm/trunk-jpl/test/NightlyRun/test3009.py

    r16192 r18068  
    2323
    2424#Fields and tolerances to track changes
    25 field_names     =['Temperature','BasalforcingsMeltingRate']
     25field_names     =['Temperature','BasalforcingsGroundediceMeltingRate']
    2626field_tolerances=[1e-13,1e-13]
    2727field_values=[\
    2828        md.results.TransientSolution[0].Temperature,\
    29         md.results.TransientSolution[0].BasalforcingsMeltingRate,\
     29        md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\
    3030        ]

  • issm/trunk-jpl/test/NightlyRun/test3108.m

    r16194 r18068  
    1212
    1313%Fields and tolerances to track changes
    14 field_names     ={'Temperature','BasalforcingsMeltingRate'};
     14field_names     ={'Temperature','BasalforcingsGroundediceMeltingRate'};
    1515field_tolerances={1e-13,1e-13};
    1616field_values={...
    1717        (md.results.ThermalSolution.Temperature),...
    18         (md.results.ThermalSolution.BasalforcingsMeltingRate),...
     18        (md.results.ThermalSolution.BasalforcingsGroundediceMeltingRate),...
    1919        };

  • issm/trunk-jpl/test/NightlyRun/test3108.py

    r16194 r18068  
    2020
    2121#Fields and tolerances to track changes
    22 field_names     =['Temperature','BasalforcingsMeltingRate']
     22field_names     =['Temperature','BasalforcingsGroundediceMeltingRate']
    2323field_tolerances=[1e-13,1e-13]
    2424field_values=[\
    2525        md.results.ThermalSolution.Temperature,\
    26         md.results.ThermalSolution.BasalforcingsMeltingRate,\
     26        md.results.ThermalSolution.BasalforcingsGroundediceMeltingRate,\
    2727        ]

  • issm/trunk-jpl/test/NightlyRun/test3109.m

    r16194 r18068  
    1515
    1616%Fields and tolerances to track changes
    17 field_names     ={'Temperature','BasalforcingsMeltingRate'};
     17field_names     ={'Temperature','BasalforcingsGroundediceMeltingRate'};
    1818field_tolerances={1e-13,1e-13};
    1919field_values={...
    2020        (md.results.TransientSolution(1).Temperature),...
    21         (md.results.TransientSolution(1).BasalforcingsMeltingRate),...
     21        (md.results.TransientSolution(1).BasalforcingsGroundediceMeltingRate),...
    2222        };

  • issm/trunk-jpl/test/NightlyRun/test3109.py

    r16194 r18068  
    2323
    2424#Fields and tolerances to track changes
    25 field_names     =['Temperature','BasalforcingsMeltingRate']
     25field_names     =['Temperature','BasalforcingsGroundediceMeltingRate']
    2626field_tolerances=[1e-13,1e-13]
    2727field_values=[\
    2828        md.results.TransientSolution[0].Temperature,\
    29         md.results.TransientSolution[0].BasalforcingsMeltingRate,\
     29        md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\
    3030        ]

  • issm/trunk-jpl/test/NightlyRun/test312.m

    r15565 r18068  
    99
    1010%Fields and tolerances to track changes
    11 field_names     ={'Temperature','BasalforcingsMeltingRate'};
     11field_names     ={'Temperature','BasalforcingsGroundediceMeltingRate'};
    1212field_tolerances={1e-13,1e-8};
    1313field_values={...
    1414        (md.results.ThermalSolution.Temperature),...
    15         (md.results.ThermalSolution.BasalforcingsMeltingRate),...
     15        (md.results.ThermalSolution.BasalforcingsGroundediceMeltingRate),...
    1616        };

  • issm/trunk-jpl/test/NightlyRun/test312.py

    r15565 r18068  
    1818
    1919#Fields and tolerances to track changes
    20 field_names     =['Temperature','BasalforcingsMeltingRate']
     20field_names     =['Temperature','BasalforcingsGroundediceMeltingRate']
    2121field_tolerances=[1e-13,1e-8]
    2222field_values=[\
    2323        md.results.ThermalSolution.Temperature,\
    24         md.results.ThermalSolution.BasalforcingsMeltingRate,\
     24        md.results.ThermalSolution.BasalforcingsGroundediceMeltingRate,\
    2525        ]

  • issm/trunk-jpl/test/NightlyRun/test313.m

    r15771 r18068  
    1313
    1414%Fields and tolerances to track changes
    15 field_names     ={'Temperature','BasalforcingsMeltingRate'};
     15field_names     ={'Temperature','BasalforcingsGroundediceMeltingRate'};
    1616field_tolerances={1e-13,1e-13};
    1717field_values={...
    1818        (md.results.TransientSolution(1).Temperature),...
    19         (md.results.TransientSolution(1).BasalforcingsMeltingRate),...
     19        (md.results.TransientSolution(1).BasalforcingsGroundediceMeltingRate),...
    2020        };

  • issm/trunk-jpl/test/NightlyRun/test313.py

    r15771 r18068  
    2222
    2323#Fields and tolerances to track changes
    24 field_names     =['Temperature','BasalforcingsMeltingRate']
     24field_names     =['Temperature','BasalforcingsGroundediceMeltingRate']
    2525field_tolerances=[1e-13,1e-13]
    2626field_values=[\
    2727        md.results.TransientSolution[0].Temperature,\
    28         md.results.TransientSolution[0].BasalforcingsMeltingRate,\
     28        md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\
    2929        ]

  • issm/trunk-jpl/test/NightlyRun/test315.m

    r17813 r18068  
    88
    99%Fields and tolerances to track changes
    10 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1',...
    11         'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2',...
    12         'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'};
     10field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1',...
     11        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2',...
     12        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3'};
    1313field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...,
    1414        1e-10,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
    … …  
    2424        (md.results.TransientSolution(1).Thickness),...
    2525        (md.results.TransientSolution(1).Temperature),...
    26         (md.results.TransientSolution(1).BasalforcingsMeltingRate),...
     26        (md.results.TransientSolution(1).BasalforcingsGroundediceMeltingRate),...
    2727        (md.results.TransientSolution(2).Vx),...
    2828        (md.results.TransientSolution(2).Vy),...
    … …  
    3434        (md.results.TransientSolution(2).Thickness),...
    3535        (md.results.TransientSolution(2).Temperature),...
    36         (md.results.TransientSolution(2).BasalforcingsMeltingRate),...
     36        (md.results.TransientSolution(2).BasalforcingsGroundediceMeltingRate),...
    3737        (md.results.TransientSolution(3).Vx),...
    3838        (md.results.TransientSolution(3).Vy),...
    … …  
    4444        (md.results.TransientSolution(3).Thickness),...
    4545        (md.results.TransientSolution(3).Temperature),...
    46         (md.results.TransientSolution(3).BasalforcingsMeltingRate),...
     46        (md.results.TransientSolution(3).BasalforcingsGroundediceMeltingRate),...
    4747        };

  • issm/trunk-jpl/test/NightlyRun/test315.py

    r17813 r18068  
    1717
    1818#Fields and tolerances to track changes
    19 field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1',\
    20         'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2',\
    21         'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3']
     19field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1',\
     20        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2',\
     21        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3']
    2222field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\
    2323        1e-10,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\
    … …  
    3333        md.results.TransientSolution[0].Thickness,\
    3434        md.results.TransientSolution[0].Temperature,\
    35         md.results.TransientSolution[0].BasalforcingsMeltingRate,\
     35        md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\
    3636        md.results.TransientSolution[1].Vx,\
    3737        md.results.TransientSolution[1].Vy,\
    … …  
    4343        md.results.TransientSolution[1].Thickness,\
    4444        md.results.TransientSolution[1].Temperature,\
    45         md.results.TransientSolution[1].BasalforcingsMeltingRate,\
     45        md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\
    4646        md.results.TransientSolution[2].Vx,\
    4747        md.results.TransientSolution[2].Vy,\
    … …  
    5353        md.results.TransientSolution[2].Thickness,\
    5454        md.results.TransientSolution[2].Temperature,\
    55         md.results.TransientSolution[2].BasalforcingsMeltingRate,\
     55        md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate,\
    5656        ]

  • issm/trunk-jpl/test/NightlyRun/test317.m

    r17555 r18068  
    88
    99%Fields and tolerances to track changes
    10 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1',...
    11         'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2',...
    12         'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'};
     10field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1',...
     11        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2',...
     12        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3'};
    1313field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,...
    1414        1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,...
    … …  
    2424        (md.results.TransientSolution(1).Thickness),...
    2525        (md.results.TransientSolution(1).Temperature),...
    26         (md.results.TransientSolution(1).BasalforcingsMeltingRate),...
     26        (md.results.TransientSolution(1).BasalforcingsGroundediceMeltingRate),...
    2727        (md.results.TransientSolution(2).Vx),...
    2828        (md.results.TransientSolution(2).Vy),...
    … …  
    3434        (md.results.TransientSolution(2).Thickness),...
    3535        (md.results.TransientSolution(2).Temperature),...
    36         (md.results.TransientSolution(2).BasalforcingsMeltingRate),...
     36        (md.results.TransientSolution(2).BasalforcingsGroundediceMeltingRate),...
    3737        (md.results.TransientSolution(3).Vx),...
    3838        (md.results.TransientSolution(3).Vy),...
    … …  
    4444        (md.results.TransientSolution(3).Thickness),...
    4545        (md.results.TransientSolution(3).Temperature),...
    46         (md.results.TransientSolution(3).BasalforcingsMeltingRate),...
     46        (md.results.TransientSolution(3).BasalforcingsGroundediceMeltingRate),...
    4747        };

  • issm/trunk-jpl/test/NightlyRun/test317.py

    r17555 r18068  
    1717
    1818#Fields and tolerances to track changes
    19 field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1',\
    20         'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2',\
    21         'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3']
     19field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1',\
     20        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2',\
     21        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3']
    2222field_tolerances=[1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,\
    2323                1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,\
    … …  
    3333        md.results.TransientSolution[0].Thickness,\
    3434        md.results.TransientSolution[0].Temperature,\
    35         md.results.TransientSolution[0].BasalforcingsMeltingRate,\
     35        md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\
    3636        md.results.TransientSolution[1].Vx,\
    3737        md.results.TransientSolution[1].Vy,\
    … …  
    4343        md.results.TransientSolution[1].Thickness,\
    4444        md.results.TransientSolution[1].Temperature,\
    45         md.results.TransientSolution[1].BasalforcingsMeltingRate,\
     45        md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\
    4646        md.results.TransientSolution[2].Vx,\
    4747        md.results.TransientSolution[2].Vy,\
    … …  
    5353        md.results.TransientSolution[2].Thickness,\
    5454        md.results.TransientSolution[2].Temperature,\
    55         md.results.TransientSolution[2].BasalforcingsMeltingRate,\
     55        md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate,\
    5656        ]

  • issm/trunk-jpl/test/NightlyRun/test318.m

    r17060 r18068  
    99
    1010%Fields and tolerances to track changes
    11 field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'};
     11field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsGroundediceMeltingRate'};
    1212field_tolerances={1e-13,1e-13,4e-10,1e-10,1e-13,1e-11,1e-6};
    1313field_values={...
    … …  
    1818        (md.results.SteadystateSolution.Pressure),...
    1919        (md.results.SteadystateSolution.Temperature),...
    20         (md.results.SteadystateSolution.BasalforcingsMeltingRate),...
     20        (md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate),...
    2121        };

  • issm/trunk-jpl/test/NightlyRun/test318.py

    r16075 r18068  
    1818
    1919#Fields and tolerances to track changes
    20 field_names     =['Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate']
     20field_names     =['Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsGroundediceMeltingRate']
    2121field_tolerances=[1e-13,1e-13,1.5e-10,1e-10,1e-13,1e-11,1e-6]
    2222field_values=[\
    … …  
    2727        md.results.SteadystateSolution.Pressure,\
    2828        md.results.SteadystateSolution.Temperature,\
    29         md.results.SteadystateSolution.BasalforcingsMeltingRate,\
     29        md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate,\
    3030        ]

  • issm/trunk-jpl/test/NightlyRun/test324.m

    r17555 r18068  
    1010
    1111%Fields and tolerances to track changes
    12 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1',...
    13         'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2'};
    14         %'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'};
     12field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1',...
     13        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2'};
     14        %'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3'};
    1515field_tolerances={1e-13,  1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...,
    1616        5*1e-11,1e-13,1.5e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    … …  
    2626        (md.results.TransientSolution(1).Thickness),...
    2727        (md.results.TransientSolution(1).Temperature),...
    28         (md.results.TransientSolution(1).BasalforcingsMeltingRate),...
     28        (md.results.TransientSolution(1).BasalforcingsGroundediceMeltingRate),...
    2929        (md.results.TransientSolution(2).Vx),...
    3030        (md.results.TransientSolution(2).Vy),...
    … …  
    3636        (md.results.TransientSolution(2).Thickness),...
    3737        (md.results.TransientSolution(2).Temperature),...
    38         (md.results.TransientSolution(2).BasalforcingsMeltingRate),...
     38        (md.results.TransientSolution(2).BasalforcingsGroundediceMeltingRate),...
    3939%       (md.results.TransientSolution(3).Vx),...
    4040%       (md.results.TransientSolution(3).Vy),...
    … …  
    4646%       (md.results.TransientSolution(3).Thickness),...
    4747%       (md.results.TransientSolution(3).Temperature),...
    48 %       (md.results.TransientSolution(3).BasalforcingsMeltingRate),...
     48%       (md.results.TransientSolution(3).BasalforcingsGroundediceMeltingRate),...
    4949        };

  • issm/trunk-jpl/test/NightlyRun/test324.py

    r17555 r18068  
    2020
    2121#Fields and tolerances to track changes
    22 field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1',\
    23         'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2']
    24         #'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3']
     22field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1',\
     23        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2']
     24        #'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3']
    2525field_tolerances=[1e-13,  1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\
    2626        5*1e-11,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,\
    … …  
    3636        md.results.TransientSolution[0].Thickness,\
    3737        md.results.TransientSolution[0].Temperature,\
    38         md.results.TransientSolution[0].BasalforcingsMeltingRate,\
     38        md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\
    3939        md.results.TransientSolution[1].Vx,\
    4040        md.results.TransientSolution[1].Vy,\
    … …  
    4646        md.results.TransientSolution[1].Thickness,\
    4747        md.results.TransientSolution[1].Temperature,\
    48         md.results.TransientSolution[1].BasalforcingsMeltingRate,\
     48        md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\
    4949#       md.results.TransientSolution[2].Vx,\
    5050#       md.results.TransientSolution[2].Vy,\
    … …  
    5656#       md.results.TransientSolution[2].Thickness,\
    5757#       md.results.TransientSolution[2].Temperature,\
    58 #       md.results.TransientSolution[2].BasalforcingsMeltingRate,\
     58#       md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate,\
    5959        ]

  • issm/trunk-jpl/test/NightlyRun/test332.m

    r17734 r18068  
    1515pos=find(md.mesh.y==0);
    1616md.hydrology.spcsediment_head(pos)=0.0;
    17 md.basalforcings.melting_rate = 2.0*ones(md.mesh.numberofvertices,1);
     17md.basalforcings.groundedice_melting_rate = 2.0*ones(md.mesh.numberofvertices,1);
     18md.basalforcings.floatingice_melting_rate = 0.0*ones(md.mesh.numberofvertices,1);
    1819md.hydrology.sediment_transmitivity=3*ones(md.mesh.numberofvertices,1);
    1920md.timestepping.time_step=0;

  • issm/trunk-jpl/test/NightlyRun/test333.m

    r17752 r18068  
    1313md.initialization.sediment_head=0.0*ones(md.mesh.numberofvertices,1);
    1414md.hydrology.spcsediment_head=NaN*ones(md.mesh.numberofvertices,1);
    15 md.basalforcings.melting_rate = 2.0*ones(md.mesh.numberofvertices,1);
     15md.basalforcings.groundedice_melting_rate = 2.0*ones(md.mesh.numberofvertices,1);
     16md.basalforcings.floatingice_melting_rate = 0.0*ones(md.mesh.numberofvertices,1);
    1617md.hydrology.sediment_transmitivity=3*ones(md.mesh.numberofvertices,1);
    1718
    … …  
    2021md.hydrology.spcepl_head=NaN*ones(md.mesh.numberofvertices,1);
    2122md.hydrology.mask_eplactive_node=0*ones(md.mesh.numberofvertices,1);
    22 md.basalforcings.melting_rate = 2.0*ones(md.mesh.numberofvertices,1);
    2323md.hydrology.epl_conductivity=30;
    2424md.hydrology.epl_initial_thickness=1;

  • issm/trunk-jpl/test/NightlyRun/test334.m

    r17734 r18068  
    1515pos=find(md.mesh.y==0);
    1616md.hydrology.spcsediment_head(pos)=0.0;
    17 md.basalforcings.melting_rate = 2.0*ones(md.mesh.numberofvertices,1);
     17md.basalforcings.groundedice_melting_rate = 2.0*ones(md.mesh.numberofvertices,1);
     18md.basalforcings.floatingice_melting_rate = 0.0*ones(md.mesh.numberofvertices,1);
    1819md.hydrology.sediment_transmitivity= 3.0*ones(md.mesh.numberofvertices,1);
    1920md.timestepping.time_step=0;

  • issm/trunk-jpl/test/NightlyRun/test335.m

    r17752 r18068  
    1313md.initialization.sediment_head=0.0*ones(md.mesh.numberofvertices,1);
    1414md.hydrology.spcsediment_head=NaN*ones(md.mesh.numberofvertices,1);
    15 md.basalforcings.melting_rate = 2.0*ones(md.mesh.numberofvertices,1);
     15md.basalforcings.groundedice_melting_rate = 2.0*ones(md.mesh.numberofvertices,1);
     16md.basalforcings.floatingice_melting_rate = 0.0*ones(md.mesh.numberofvertices,1);
    1617md.hydrology.sediment_transmitivity=3*ones(md.mesh.numberofvertices,1);
    1718
    … …  
    2021md.hydrology.spcepl_head=NaN*ones(md.mesh.numberofvertices,1);
    2122md.hydrology.mask_eplactive_node=0*ones(md.mesh.numberofvertices,1);
    22 md.basalforcings.melting_rate = 2.0*ones(md.mesh.numberofvertices,1);
    2323md.hydrology.epl_conductivity=30;
    2424md.hydrology.epl_initial_thickness=1;

  • issm/trunk-jpl/test/NightlyRun/test406.m

    r15565 r18068  
    99
    1010%Fields and tolerances to track changes
    11 field_names     ={'Temperature','BasalforcingsMeltingRate'};
     11field_names     ={'Temperature','BasalforcingsGroundediceMeltingRate'};
    1212field_tolerances={1e-13,1e-5};
    1313field_values={...
    1414        (md.results.ThermalSolution.Temperature),...
    15         (md.results.ThermalSolution.BasalforcingsMeltingRate),...
     15        (md.results.ThermalSolution.BasalforcingsGroundediceMeltingRate),...
    1616        };

  • issm/trunk-jpl/test/NightlyRun/test406.py

    r15565 r18068  
    1919
    2020#Fields and tolerances to track changes
    21 field_names     =['Temperature','BasalforcingsMeltingRate']
     21field_names     =['Temperature','BasalforcingsGroundediceMeltingRate']
    2222field_tolerances=[1e-13,1e-5]
    2323field_values=[\
    2424        md.results.ThermalSolution.Temperature,\
    25         md.results.ThermalSolution.BasalforcingsMeltingRate,\
     25        md.results.ThermalSolution.BasalforcingsGroundediceMeltingRate,\
    2626        ]

  • issm/trunk-jpl/test/NightlyRun/test407.m

    r15771 r18068  
    1212
    1313%Fields and tolerances to track changes
    14 field_names     ={'Temperature','BasalforcingsMeltingRate'};
     14field_names     ={'Temperature','BasalforcingsGroundediceMeltingRate'};
    1515field_tolerances={1e-13,1e-13};
    1616field_values={...
    1717        (md.results.TransientSolution(1).Temperature),...
    18         (md.results.TransientSolution(1).BasalforcingsMeltingRate),...
     18        (md.results.TransientSolution(1).BasalforcingsGroundediceMeltingRate),...
    1919        };

  • issm/trunk-jpl/test/NightlyRun/test407.py

    r15771 r18068  
    2222
    2323#Fields and tolerances to track changes
    24 field_names     =['Temperature','BasalforcingsMeltingRate']
     24field_names     =['Temperature','BasalforcingsGroundediceMeltingRate']
    2525field_tolerances=[1e-13,1e-13]
    2626field_values=[\
    2727        md.results.TransientSolution[0].Temperature,\
    28         md.results.TransientSolution[0].BasalforcingsMeltingRate,\
     28        md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\
    2929        ]

  • issm/trunk-jpl/test/NightlyRun/test409.m

    r17555 r18068  
    88
    99%Fields and tolerances to track changes
    10 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ...
    11                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', ...
    12                                            'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'};
     10field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', ...
     11                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2', ...
     12                                           'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3'};
    1313field_tolerances={...
    1414        1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,...
    … …  
    2525        (md.results.TransientSolution(1).Thickness),...
    2626        (md.results.TransientSolution(1).Temperature),...
    27         (md.results.TransientSolution(1).BasalforcingsMeltingRate),...
     27        (md.results.TransientSolution(1).BasalforcingsGroundediceMeltingRate),...
    2828        (md.results.TransientSolution(2).Vx),...
    2929        (md.results.TransientSolution(2).Vy),...
    … …  
    3535        (md.results.TransientSolution(2).Thickness),...
    3636        (md.results.TransientSolution(2).Temperature),...
    37         (md.results.TransientSolution(2).BasalforcingsMeltingRate),...
     37        (md.results.TransientSolution(2).BasalforcingsGroundediceMeltingRate),...
    3838        (md.results.TransientSolution(3).Vx),...
    3939        (md.results.TransientSolution(3).Vy),...
    … …  
    4545        (md.results.TransientSolution(3).Thickness),...
    4646        (md.results.TransientSolution(3).Temperature),...
    47         (md.results.TransientSolution(3).BasalforcingsMeltingRate),...
     47        (md.results.TransientSolution(3).BasalforcingsGroundediceMeltingRate),...
    4848        };

  • issm/trunk-jpl/test/NightlyRun/test409.py

    r17555 r18068  
    1818
    1919#Fields and tolerances to track changes
    20 field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', \
    21                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', \
    22                                            'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3']
     20field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', \
     21                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2', \
     22                                           'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3']
    2323field_tolerances=[\
    2424        1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,\
    … …  
    3535        md.results.TransientSolution[0].Thickness,\
    3636        md.results.TransientSolution[0].Temperature,\
    37         md.results.TransientSolution[0].BasalforcingsMeltingRate,\
     37        md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\
    3838        md.results.TransientSolution[1].Vx,\
    3939        md.results.TransientSolution[1].Vy,\
    … …  
    4545        md.results.TransientSolution[1].Thickness,\
    4646        md.results.TransientSolution[1].Temperature,\
    47         md.results.TransientSolution[1].BasalforcingsMeltingRate,\
     47        md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\
    4848        md.results.TransientSolution[2].Vx,\
    4949        md.results.TransientSolution[2].Vy,\
    … …  
    5555        md.results.TransientSolution[2].Thickness,\
    5656        md.results.TransientSolution[2].Temperature,\
    57         md.results.TransientSolution[2].BasalforcingsMeltingRate,\
     57        md.results.TransientSolution[2].BasalforcingsGroundediceMeltingRate,\
    5858        ]

  • issm/trunk-jpl/test/NightlyRun/test410.m

    r17747 r18068  
    99
    1010%Fields and tolerances to track changes
    11 field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'};
     11field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsGroundediceMeltingRate'};
    1212field_tolerances={1e-09,1e-09,1e-08,3e-10,1e-13,3e-10,1e-06};
    1313field_values={...
    … …  
    1818        (md.results.SteadystateSolution.Pressure),...
    1919        (md.results.SteadystateSolution.Temperature),...
    20         (md.results.SteadystateSolution.BasalforcingsMeltingRate),...
     20        (md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate),...
    2121        };

  • issm/trunk-jpl/test/NightlyRun/test410.py

    r17747 r18068  
    1919
    2020#Fields and tolerances to track changes
    21 field_names     =['Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate']
     21field_names     =['Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsGroundediceMeltingRate']
    2222field_tolerances=[1e-09,1e-09,1e-08,1e-09,1e-13,3e-10,1e-06]
    2323field_values=[\
    … …  
    2828        md.results.SteadystateSolution.Pressure,\
    2929        md.results.SteadystateSolution.Temperature,\
    30         md.results.SteadystateSolution.BasalforcingsMeltingRate,\
     30        md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate,\
    3131        ]

  • issm/trunk-jpl/test/NightlyRun/test411.m

    r15599 r18068  
    99
    1010%Fields and tolerances to track changes
    11 field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'};
     11field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsGroundediceMeltingRate'};
    1212field_tolerances={2e-09,1e-09,1e-08,1e-09,1e-09,1e-08,1e-05
    1313};
    … …  
    1919        (md.results.SteadystateSolution.Pressure),...
    2020        (md.results.SteadystateSolution.Temperature),...
    21         (md.results.SteadystateSolution.BasalforcingsMeltingRate),...
     21        (md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate),...
    2222        };

  • issm/trunk-jpl/test/NightlyRun/test411.py

    r16472 r18068  
    1919
    2020#Fields and tolerances to track changes
    21 field_names     =['Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate']
     21field_names     =['Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsGroundediceMeltingRate']
    2222field_tolerances=[1e-09,1e-09,1e-08,1e-09,1e-09,1e-08,1e-05
    2323]
    … …  
    2929        md.results.SteadystateSolution.Pressure,\
    3030        md.results.SteadystateSolution.Temperature,\
    31         md.results.SteadystateSolution.BasalforcingsMeltingRate,\
     31        md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate,\
    3232        ]

  • issm/trunk-jpl/test/NightlyRun/test415.m

    r18026 r18068  
    2323
    2424%Fields and tolerances to track changes
    25 field_names     ={'Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy','Vz','Temperature','BasalforcingsMeltingRate'};
     25field_names     ={'Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy','Vz','Temperature','BasalforcingsGroundediceMeltingRate'};
    2626field_tolerances={1e-09,1e-9,2e-10,1e-13,1e-09,1e-09,1e-09,1e-8,1e-09,1e-6};
    2727field_values={...
    … …  
    3535        (md.results.SteadystateSolution.Vz),...
    3636        (md.results.SteadystateSolution.Temperature),...
    37         (md.results.SteadystateSolution.BasalforcingsMeltingRate)
     37        (md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate)
    3838};

  • issm/trunk-jpl/test/NightlyRun/test415.py

    r18026 r18068  
    3535
    3636#Fields and tolerances to track changes
    37 field_names     =['Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy','Vz','Temperature','BasalforcingsMeltingRate']
     37field_names     =['Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy','Vz','Temperature','BasalforcingsGroundediceMeltingRate']
    3838field_tolerances=[1e-9,1e-9,2e-10,1e-13,1e-09,1e-09,1e-09,1e-8,1e-09,1e-6]
    3939field_values=[\
    … …  
    4747        md.results.SteadystateSolution.Vz,\
    4848        md.results.SteadystateSolution.Temperature,\
    49         md.results.SteadystateSolution.BasalforcingsMeltingRate
     49        md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate
    5050]

  • issm/trunk-jpl/test/NightlyRun/test416.m

    r16307 r18068  
    2323
    2424%Fields and tolerances to track changes
    25 field_names     ={'Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy','Vz','Temperature','BasalforcingsMeltingRate'};
     25field_names     ={'Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy','Vz','Temperature','BasalforcingsGroundediceMeltingRate'};
    2626field_tolerances={1e-08,1e-07,1e-08,1e-08,1e-08,1e-08,1e-08,1e-07,1e-08,1e-05};
    2727field_values={...
    … …  
    3535        (md.results.SteadystateSolution.Vz),...
    3636        (md.results.SteadystateSolution.Temperature),...
    37         (md.results.SteadystateSolution.BasalforcingsMeltingRate)
     37        (md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate)
    3838};

  • issm/trunk-jpl/test/NightlyRun/test416.py

    r16307 r18068  
    3535
    3636#Fields and tolerances to track changes
    37 field_names     =['Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy','Vz','Temperature','BasalforcingsMeltingRate']
     37field_names     =['Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy','Vz','Temperature','BasalforcingsGroundediceMeltingRate']
    3838field_tolerances=[1e-08,1e-07,1e-08,1e-08,1e-08,1e-08,1e-08,1e-07,1e-08,1e-05]
    3939field_values=[\
    … …  
    4747        md.results.SteadystateSolution.Vz,\
    4848        md.results.SteadystateSolution.Temperature,\
    49         md.results.SteadystateSolution.BasalforcingsMeltingRate
     49        md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate
    5050]

  • issm/trunk-jpl/test/NightlyRun/test435.m

    r18026 r18068  
    3131md.friction.p=3*ones(md.mesh.numberofelements,1);
    3232md.surfaceforcings.mass_balance(:)=1;
    33 md.basalforcings.melting_rate(:)=0;
     33md.basalforcings.groundedice_melting_rate(:)=0;
     34md.basalforcings.floatingice_melting_rate(:)=0;
    3435md.transient.isthermal=0;
    3536md.transient.isstressbalance=1;

  • issm/trunk-jpl/test/NightlyRun/test505.m

    r17555 r18068  
    88
    99%Fields and tolerances to track changes
    10 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ...
    11                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2'};
     10field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', ...
     11                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2'};
    1212field_tolerances={1e-12,1e-12,3e-10,1e-12,1e-13,1e-11,5e-12,9e-12,1e-13,5e-9,...
    1313                                                5e-11,5e-11,1e-10,2e-11,7e-12,1e-11,1e-11,5e-12,1e-11,2e-8};
    … …  
    2222        (md.results.TransientSolution(1).Thickness),...
    2323        (md.results.TransientSolution(1).Temperature),...
    24         (md.results.TransientSolution(1).BasalforcingsMeltingRate),...
     24        (md.results.TransientSolution(1).BasalforcingsGroundediceMeltingRate),...
    2525        (md.results.TransientSolution(2).Vx),...
    2626        (md.results.TransientSolution(2).Vy),...
    … …  
    3232        (md.results.TransientSolution(2).Thickness),...
    3333        (md.results.TransientSolution(2).Temperature),...
    34         (md.results.TransientSolution(2).BasalforcingsMeltingRate),...
     34        (md.results.TransientSolution(2).BasalforcingsGroundediceMeltingRate),...
    3535        };

  • issm/trunk-jpl/test/NightlyRun/test505.py

    r17555 r18068  
    1717
    1818# Fields and tolerances to track changes
    19 field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', \
    20                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2']
     19field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', \
     20                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2']
    2121field_tolerances=[1e-12,1e-12,1e-10,1e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13, \
    2222                                                1e-13,1e-12,1e-10,1e-12,1e-13,1e-11,1e-11,2e-12,1e-11,1e-8]
    … …  
    3131        md.results.TransientSolution[0].Thickness,\
    3232        md.results.TransientSolution[0].Temperature,\
    33         md.results.TransientSolution[0].BasalforcingsMeltingRate,\
     33        md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\
    3434        md.results.TransientSolution[1].Vx,\
    3535        md.results.TransientSolution[1].Vy,\
    … …  
    4141        md.results.TransientSolution[1].Thickness,\
    4242        md.results.TransientSolution[1].Temperature,\
    43         md.results.TransientSolution[1].BasalforcingsMeltingRate,\
     43        md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\
    4444        ]

  • issm/trunk-jpl/test/NightlyRun/test506.m

    r17555 r18068  
    88
    99%Fields and tolerances to track changes
    10 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ...
    11                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2'};
     10field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', ...
     11                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2'};
    1212field_tolerances={1e-10,1e-10,1e-10,1e-10,1e-12,1e-11,2e-12,1e-11,1e-12,1e-09,...
    1313                                                1e-11,1e-11,1e-09,1e-11,1e-11,1e-10,1e-11,1e-10,1e-11,2e-08};
    … …  
    2222        (md.results.TransientSolution(1).Thickness),...
    2323        (md.results.TransientSolution(1).Temperature),...
    24         (md.results.TransientSolution(1).BasalforcingsMeltingRate),...
     24        (md.results.TransientSolution(1).BasalforcingsGroundediceMeltingRate),...
    2525        (md.results.TransientSolution(2).Vx),...
    2626        (md.results.TransientSolution(2).Vy),...
    … …  
    3232        (md.results.TransientSolution(2).Thickness),...
    3333        (md.results.TransientSolution(2).Temperature),...
    34         (md.results.TransientSolution(2).BasalforcingsMeltingRate),...
     34        (md.results.TransientSolution(2).BasalforcingsGroundediceMeltingRate),...
    3535        };

  • issm/trunk-jpl/test/NightlyRun/test506.py

    r17555 r18068  
    1717
    1818# Fields and tolerances to track changes
    19 field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', \
    20                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2']
     19field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', \
     20                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2']
    2121field_tolerances=[1e-10,1e-10,1e-10,1e-10,1e-12,1e-11,2e-12,1e-11,1e-12,1e-09,\
    2222                                                1e-11,1e-11,1e-09,1e-11,1e-11,1e-10,1e-11,1e-10,1e-11,2e-08]
    … …  
    3131        md.results.TransientSolution[0].Thickness,\
    3232        md.results.TransientSolution[0].Temperature,\
    33         md.results.TransientSolution[0].BasalforcingsMeltingRate,\
     33        md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\
    3434        md.results.TransientSolution[1].Vx,\
    3535        md.results.TransientSolution[1].Vy,\
    … …  
    4141        md.results.TransientSolution[1].Thickness,\
    4242        md.results.TransientSolution[1].Temperature,\
    43         md.results.TransientSolution[1].BasalforcingsMeltingRate,\
     43        md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\
    4444        ]

  • issm/trunk-jpl/test/NightlyRun/test507.m

    r17555 r18068  
    88
    99%Fields and tolerances to track changes
    10 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', ...
    11                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2'};
     10field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', ...
     11                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2'};
    1212field_tolerances={1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06,1e-06,1e-06,1e-06,1e-06,1e-06,1e-06,1e-06,3e-06,1e-06};
    1313field_values={...
    … …  
    2121        (md.results.TransientSolution(1).Thickness),...
    2222        (md.results.TransientSolution(1).Temperature),...
    23         (md.results.TransientSolution(1).BasalforcingsMeltingRate),...
     23        (md.results.TransientSolution(1).BasalforcingsGroundediceMeltingRate),...
    2424        (md.results.TransientSolution(2).Vx),...
    2525        (md.results.TransientSolution(2).Vy),...
    … …  
    3131        (md.results.TransientSolution(2).Thickness),...
    3232        (md.results.TransientSolution(2).Temperature),...
    33         (md.results.TransientSolution(2).BasalforcingsMeltingRate),...
     33        (md.results.TransientSolution(2).BasalforcingsGroundediceMeltingRate),...
    3434        };

  • issm/trunk-jpl/test/NightlyRun/test507.py

    r17555 r18068  
    1717
    1818# Fields and tolerances to track changes
    19 field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', \
    20                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2']
     19field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', \
     20                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2']
    2121field_tolerances=[1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06,1e-06,1e-06,1e-06,1e-06,1e-06,1e-06,1e-06,1e-06,1e-06]
    2222field_values=[\
    … …  
    3030        md.results.TransientSolution[0].Thickness,\
    3131        md.results.TransientSolution[0].Temperature,\
    32         md.results.TransientSolution[0].BasalforcingsMeltingRate,\
     32        md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\
    3333        md.results.TransientSolution[1].Vx,\
    3434        md.results.TransientSolution[1].Vy,\
    … …  
    4040        md.results.TransientSolution[1].Thickness,\
    4141        md.results.TransientSolution[1].Temperature,\
    42         md.results.TransientSolution[1].BasalforcingsMeltingRate,\
     42        md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\
    4343        ]

  • issm/trunk-jpl/test/NightlyRun/test508.m

    r16952 r18068  
    99
    1010%Fields and tolerances to track changes
    11 field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'};
     11field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsGroundediceMeltingRate'};
    1212field_tolerances={5e-08,3e-08,5e-08,3e-08,1e-09,2e-07,8e-07};
    1313field_values={...
    … …  
    1818        (md.results.SteadystateSolution.Pressure),...
    1919        (md.results.SteadystateSolution.Temperature),...
    20         (md.results.SteadystateSolution.BasalforcingsMeltingRate),...
     20        (md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate),...
    2121        };

  • issm/trunk-jpl/test/NightlyRun/test508.py

    r16946 r18068  
    1818
    1919# Fields and tolerances to track changes
    20 field_names     =['Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate']
     20field_names     =['Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsGroundediceMeltingRate']
    2121field_tolerances=[5e-08,1.6e-08,5e-08,1.6e-08,1e-09,6e-08,5e-07]
    2222field_values=[\
    … …  
    2727        md.results.SteadystateSolution.Pressure,\
    2828        md.results.SteadystateSolution.Temperature,\
    29         md.results.SteadystateSolution.BasalforcingsMeltingRate,\
     29        md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate,\
    3030        ]

  • issm/trunk-jpl/test/NightlyRun/test509.m

    r15565 r18068  
    1010
    1111%Fields and tolerances to track changes
    12 field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'};
     12field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsGroundediceMeltingRate'};
    1313field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06
    1414};
    … …  
    2020        (md.results.SteadystateSolution.Pressure),...
    2121        (md.results.SteadystateSolution.Temperature),...
    22         (md.results.SteadystateSolution.BasalforcingsMeltingRate),...
     22        (md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate),...
    2323        };

  • issm/trunk-jpl/test/NightlyRun/test509.py

    r15565 r18068  
    1919
    2020# Fields and tolerances to track changes
    21 field_names     =['Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate']
     21field_names     =['Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsGroundediceMeltingRate']
    2222field_tolerances=[1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06]
    2323field_values=[\
    … …  
    2828        md.results.SteadystateSolution.Pressure,\
    2929        md.results.SteadystateSolution.Temperature,\
    30         md.results.SteadystateSolution.BasalforcingsMeltingRate,\
     30        md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate,\
    3131        ]

  • issm/trunk-jpl/test/NightlyRun/test510.m

    r15565 r18068  
    99
    1010%Fields and tolerances to track changes
    11 field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate'};
     11field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsGroundediceMeltingRate'};
    1212field_tolerances={1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06};
    1313field_values={...
    … …  
    1818        (md.results.SteadystateSolution.Pressure),...
    1919        (md.results.SteadystateSolution.Temperature),...
    20         (md.results.SteadystateSolution.BasalforcingsMeltingRate),...
     20        (md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate),...
    2121        };

  • issm/trunk-jpl/test/NightlyRun/test510.py

    r15565 r18068  
    1818
    1919# Fields and tolerances to track changes
    20 field_names     =['Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsMeltingRate']
     20field_names     =['Vx','Vy','Vz','Vel','Pressure','Temperature','BasalforcingsGroundediceMeltingRate']
    2121field_tolerances=[1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06]
    2222field_values=[\
    … …  
    2727        md.results.SteadystateSolution.Pressure,\
    2828        md.results.SteadystateSolution.Temperature,\
    29         md.results.SteadystateSolution.BasalforcingsMeltingRate,\
     29        md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate,\
    3030        ]

  • issm/trunk-jpl/test/NightlyRun/test513.m

    r17927 r18068  
    2424
    2525%Fields and tolerances to track changes
    26 field_names     ={'Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy','Vz','Temperature','BasalforcingsMeltingRate'};
     26field_names     ={'Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy','Vz','Temperature','BasalforcingsGroundediceMeltingRate'};
    2727field_tolerances={2e-10,2e-10,1e-10,1e-10,3e-6,3e-6,3e-6,3e-6,2e-6,2e-06};
    2828field_values={...
    … …  
    3636        (md.results.SteadystateSolution.Vz),...
    3737        (md.results.SteadystateSolution.Temperature),...
    38         (md.results.SteadystateSolution.BasalforcingsMeltingRate)
     38        (md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate)
    3939};

  • issm/trunk-jpl/test/NightlyRun/test513.py

    r17927 r18068  
    3535
    3636# Fields and tolerances to track changes
    37 field_names     =['Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy','Vz','Temperature','BasalforcingsMeltingRate']
     37field_names     =['Gradient','Misfits','FrictionCoefficient','Pressure','Vel','Vx','Vy','Vz','Temperature','BasalforcingsGroundediceMeltingRate']
    3838field_tolerances=[2e-10,2e-10,1e-10,1e-10,3e-6,3e-6,3e-6,3e-6,2e-6,2e-06]
    3939field_values=[\
    … …  
    4747        md.results.SteadystateSolution.Vz,\
    4848        md.results.SteadystateSolution.Temperature,\
    49         md.results.SteadystateSolution.BasalforcingsMeltingRate
     49        md.results.SteadystateSolution.BasalforcingsGroundediceMeltingRate
    5050]

  • issm/trunk-jpl/test/NightlyRun/test515.m

    r16945 r18068  
    1313
    1414%Fields and tolerances to track changes
    15 field_names     ={'Temperature1','BasalforcingsMeltingRate1', ...
    16                                       'Temperature2','BasalforcingsMeltingRate2'};
     15field_names     ={'Temperature1','BasalforcingsGroundediceMeltingRate1', ...
     16                                      'Temperature2','BasalforcingsGroundediceMeltingRate2'};
    1717field_tolerances={1e-13,1e-8,1e-13,3e-8};
    1818field_values={...
    1919        (md.results.TransientSolution(1).Temperature),...
    20         (md.results.TransientSolution(1).BasalforcingsMeltingRate),...
     20        (md.results.TransientSolution(1).BasalforcingsGroundediceMeltingRate),...
    2121        (md.results.TransientSolution(2).Temperature),...
    22         (md.results.TransientSolution(2).BasalforcingsMeltingRate),...
     22        (md.results.TransientSolution(2).BasalforcingsGroundediceMeltingRate),...
    2323        };

  • issm/trunk-jpl/test/NightlyRun/test515.py

    r16938 r18068  
    2222
    2323# Fields and tolerances to track changes
    24 field_names     =['Temperature1','BasalforcingsMeltingRate1', \
    25                                       'Temperature2','BasalforcingsMeltingRate2']
     24field_names     =['Temperature1','BasalforcingsGroundediceMeltingRate1', \
     25                                      'Temperature2','BasalforcingsGroundediceMeltingRate2']
    2626field_tolerances=[1e-13,1e-8,1e-13,2e-8]
    2727field_values=[\
    2828        md.results.TransientSolution[0].Temperature,\
    29         md.results.TransientSolution[0].BasalforcingsMeltingRate,\
     29        md.results.TransientSolution[0].BasalforcingsGroundediceMeltingRate,\
    3030        md.results.TransientSolution[1].Temperature,\
    31         md.results.TransientSolution[1].BasalforcingsMeltingRate,\
     31        md.results.TransientSolution[1].BasalforcingsGroundediceMeltingRate,\
    3232        ]

  • issm/trunk-jpl/test/NightlyRun/test516.m

    r15565 r18068  
    1111
    1212%Fields and tolerances to track changes
    13 field_names     ={'Temperature','BasalforcingsMeltingRate'};
     13field_names     ={'Temperature','BasalforcingsGroundediceMeltingRate'};
    1414field_tolerances={1e-11,1e-11};
    1515field_values={...
    1616        (md.results.ThermalSolution.Temperature),...
    17         (md.results.ThermalSolution.BasalforcingsMeltingRate),...
     17        (md.results.ThermalSolution.BasalforcingsGroundediceMeltingRate),...
    1818        };

  • issm/trunk-jpl/test/NightlyRun/test516.py

    r15565 r18068  
    2121
    2222#Fields and tolerances to track changes
    23 field_names     =['Temperature','BasalforcingsMeltingRate']
     23field_names     =['Temperature','BasalforcingsGroundediceMeltingRate']
    2424field_tolerances=[1e-11,1e-11]
    2525field_values=[\
    2626        md.results.ThermalSolution.Temperature,\
    27         md.results.ThermalSolution.BasalforcingsMeltingRate,\
     27        md.results.ThermalSolution.BasalforcingsGroundediceMeltingRate,\
    2828        ]

  • issm/trunk-jpl/test/NightlyRun/test703.m

    r17974 r18068  
    4343md.stressbalance.shelf_dampening=1;
    4444md.surfaceforcings.mass_balance=zeros(md.mesh.numberofvertices,1);
    45 md.basalforcings.melting_rate=zeros(md.mesh.numberofvertices,1);
     45md.basalforcings.groundedice_melting_rate=zeros(md.mesh.numberofvertices,1);
     46md.basalforcings.floatingice_melting_rate=zeros(md.mesh.numberofvertices,1);
    4647md.basalforcings.geothermalflux=zeros(md.mesh.numberofvertices,1);
    4748posb=find((md.mesh.x>0) & md.mesh.vertexonbase);
    48 md.basalforcings.melting_rate(posb)=18;
     49md.basalforcings.groundedice_melting_rate(posb)=18;
     50md.basalforcings.floatingice_melting_rate(posb)=18;
    4951md.initialization.vx=zeros(md.mesh.numberofvertices,1);
    5052md.initialization.vy=zeros(md.mesh.numberofvertices,1);

  • issm/trunk-jpl/test/Par/79North.par

    r17769 r18068  
    2828
    2929%Ice shelf melting and surface mass balance
    30 md.basalforcings.melting_rate=zeros(md.mesh.numberofvertices,1);
    31 md.basalforcings.melting_rate(find(md.mask.groundedice_levelset<0.))=0.;
     30md.basalforcings.floatingice_melting_rate=zeros(md.mesh.numberofvertices,1);
     31md.basalforcings.floatingice_melting_rate(find(md.mask.groundedice_levelset<0.))=0.;
     32md.basalforcings.groundedice_melting_rate=zeros(md.mesh.numberofvertices,1);
    3233md.surfaceforcings.mass_balance=15.*ones(md.mesh.numberofvertices,1);
    3334

  • issm/trunk-jpl/test/Par/79North.py

    r17769 r18068  
    4040
    4141#Ice shelf melting and surface mass balance
    42 md.basalforcings.melting_rate=numpy.zeros((md.mesh.numberofvertices,1))
    43 md.basalforcings.melting_rate[numpy.nonzero(md.mask.groundedice_levelset<0.)[0]]=0.
     42md.basalforcings.floatingice_melting_rate=numpy.zeros((md.mesh.numberofvertices,1))
     43md.basalforcings.floatingice_melting_rate[numpy.nonzero(md.mask.groundedice_levelset<0.)[0]]=0.
     44md.basalforcings.groundedice_melting_rate=numpy.zeros((md.mesh.numberofvertices,1))
    4445md.surfaceforcings.mass_balance=15*numpy.ones((md.mesh.numberofvertices,1))
    4546

  • issm/trunk-jpl/test/Par/RoundSheetShelf.par

    r17769 r18068  
    6363%Surface mass balance and basal melting
    6464md.surfaceforcings.mass_balance=-10.*ones(md.mesh.numberofvertices,1);
    65 md.basalforcings.melting_rate=zeros(md.mesh.numberofvertices,1);
    66 pos=find(md.mask.groundedice_levelset>0.);md.basalforcings.melting_rate(pos)=10.;
     65md.basalforcings.groundedice_melting_rate=zeros(md.mesh.numberofvertices,1);
     66pos=find(md.mask.groundedice_levelset>0.);md.basalforcings.groundedice_melting_rate(pos)=10.;
     67md.basalforcings.floatingice_melting_rate=zeros(md.mesh.numberofvertices,1);
    6768md.basalforcings.geothermalflux=ones(md.mesh.numberofvertices,1);
    6869

  • issm/trunk-jpl/test/Par/RoundSheetShelf.py

    r17942 r18068  
    7070#Surface mass balance and basal melting
    7171md.surfaceforcings.mass_balance=-10.*numpy.ones((md.mesh.numberofvertices,1))
    72 md.basalforcings.melting_rate=numpy.zeros((md.mesh.numberofvertices,1))
     72md.basalforcings.groundedice_melting_rate=numpy.zeros((md.mesh.numberofvertices,1))
    7373pos=numpy.nonzero(md.mask.groundedice_levelset>0.)[0]
    74 md.basalforcings.melting_rate[pos]=10.
     74md.basalforcings.groudedice_melting_rate[pos]=10.
     75md.basalforcings.floatingice_melting_rate=numpy.zeros((md.mesh.numberofvertices,1))
    7576md.basalforcings.geothermalflux=numpy.ones((md.mesh.numberofvertices,1))
    7677

  • issm/trunk-jpl/test/Par/SquareEISMINT.par

    r17769 r18068  
    2828disp('      creating surface mass balance');
    2929md.surfaceforcings.mass_balance=0.2*ones(md.mesh.numberofvertices,1); %0m/a
    30 md.basalforcings.melting_rate=0.*ones(md.mesh.numberofvertices,1); %0m/a
     30md.basalforcings.floatingice_melting_rate=0.*ones(md.mesh.numberofvertices,1); %0m/a
     31md.basalforcings.groundedice_melting_rate=0.*ones(md.mesh.numberofvertices,1); %0m/a
    3132
    3233disp('      boundary conditions');

  • issm/trunk-jpl/test/Par/SquareEISMINT.py

    r17769 r18068  
    3131print "      creating surface mass balance"
    3232md.surfaceforcings.mass_balance=0.2*numpy.ones((md.mesh.numberofvertices,1))    #0m/a
    33 md.basalforcings.melting_rate=0.*numpy.ones((md.mesh.numberofvertices,1))    #0m/a
     33md.basalforcings.floatingice_melting_rate=0.*numpy.ones((md.mesh.numberofvertices,1))    #0m/a
     34md.basalforcings.groundedice_melting_rate=0.*numpy.ones((md.mesh.numberofvertices,1))    #0m/a
    3435
    3536print "      boundary conditions"

  • issm/trunk-jpl/test/Par/SquareSheetShelf.par

    r17769 r18068  
    3434%Accumulation and melting
    3535md.surfaceforcings.mass_balance=10.*ones(md.mesh.numberofvertices,1);
    36 md.basalforcings.melting_rate=5.*ones(md.mesh.numberofvertices,1);
     36md.basalforcings.groundedice_melting_rate=5.*ones(md.mesh.numberofvertices,1);
     37md.basalforcings.floatingice_melting_rate=5.*ones(md.mesh.numberofvertices,1);
    3738
    3839%Friction

  • issm/trunk-jpl/test/Par/SquareSheetShelf.py

    r17769 r18068  
    4545#Accumulation and melting
    4646md.surfaceforcings.mass_balance=10.*numpy.ones((md.mesh.numberofvertices,1))
    47 md.basalforcings.melting_rate=5.*numpy.ones((md.mesh.numberofvertices,1))
     47md.basalforcings.groundedice_melting_rate=5.*numpy.ones((md.mesh.numberofvertices,1))
     48md.basalforcings.floatingice_melting_rate=5.*numpy.ones((md.mesh.numberofvertices,1))
    4849
    4950#Friction

  • issm/trunk-jpl/test/Par/SquareShelfConstrained.par

    r17769 r18068  
    3131%Surface mass balance and basal melting
    3232md.surfaceforcings.mass_balance=10*ones(md.mesh.numberofvertices,1);
    33 md.basalforcings.melting_rate=5*ones(md.mesh.numberofvertices,1);
     33md.basalforcings.floatingice_melting_rate=5*ones(md.mesh.numberofvertices,1);
     34md.basalforcings.groundedice_melting_rate=5*ones(md.mesh.numberofvertices,1);
    3435
    3536%Friction

  • issm/trunk-jpl/test/Par/SquareShelfConstrained.py

    r17769 r18068  
    4242#Surface mass balance and basal melting
    4343md.surfaceforcings.mass_balance=10.*numpy.ones((md.mesh.numberofvertices,1))
    44 md.basalforcings.melting_rate=5.*numpy.ones((md.mesh.numberofvertices,1))
     44md.basalforcings.groundedice_melting_rate=5.*numpy.ones((md.mesh.numberofvertices,1))
     45md.basalforcings.floatingice_melting_rate=5.*numpy.ones((md.mesh.numberofvertices,1))
    4546
    4647#Friction

  • issm/trunk-jpl/test/Par/SquareThermal.par

    r17769 r18068  
    2929disp('      creating surface mass balance');
    3030md.surfaceforcings.mass_balance=ones(md.mesh.numberofvertices,1)/md.constants.yts; %1m/a
    31 md.basalforcings.melting_rate=0.*ones(md.mesh.numberofvertices,1)/md.constants.yts; %1m/a
     31md.basalforcings.groundedice_melting_rate=0.*ones(md.mesh.numberofvertices,1)/md.constants.yts; %1m/a
     32md.basalforcings.floatingice_melting_rate=0.*ones(md.mesh.numberofvertices,1)/md.constants.yts; %1m/a
    3233
    3334%Deal with boundary conditions:

  • issm/trunk-jpl/test/Par/ValleyGlacierShelf.par

    r17769 r18068  
    5050%Surface mass balance and basal melting
    5151md.surfaceforcings.mass_balance = 0.3*ones(md.mesh.numberofvertices,1);
    52 md.basalforcings.melting_rate = md.surfaceforcings.mass_balance;
     52md.basalforcings.floatingice_melting_rate = md.surfaceforcings.mass_balance;
     53md.basalforcings.groundedice_melting_rate = md.surfaceforcings.mass_balance;
    5354
    5455%Friction
Note: See TracChangeset for help on using the changeset viewer.