Changeset 8392


Ignore:
Timestamp:
05/23/11 11:52:10 (14 years ago)
Author:
schlegel
Message:

change melting rate to basal melting rate for clarity

Location:
issm/trunk
Files:
114 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/examples/Bumps/Bump1_surface_bed/Square.par

    r7810 r8392  
    2121        md.eps_abs=10; %m/yr
    2222        md.penalty_offset=4;
    23         md.penalty_melting=10^7;
     23        md.penalty_basal_melting=10^7;
    2424        if md.numberofgrids<1000000,
    2525        md.sparsity=.001;
    … …  
    7070        disp('      creating accumulation rates');
    7171        md.accumulation_rate=ones(md.numberofgrids,1)/md.yts; %1m/a
    72         md.melting_rate=0*ones(md.numberofgrids,1)/md.yts; %1m/a
     72        md.basal_melting_rate=0*ones(md.numberofgrids,1)/md.yts; %1m/a
    7373
    7474        %Deal with boundary conditions:

  • issm/trunk/examples/Bumps/Bump1_surface_bed/runme.m

    r8294 r8392  
    1313        md.vy=PatchToVec(md.results.DiagnosticSolution.Vy);
    1414        md.accumulation_rate(:)=0;
    15         md.melting_rate(:)=0;
     15        md.basal_melting_rate(:)=0;
    1616        md.thickness(:)=1;
    1717        md.bed=md.surface-md.thickness;

  • issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h

    r8376 r8392  
    226226        MeltingOffsetEnum,
    227227        GroundingLineMeltingRateEnum,
    228         MeltingRateEnum,
     228        BasalMeltingRateEnum,
    229229        MisfitEnum,
    230230        NodeOnBedEnum,
    … …  
    341341        GravityEnum,
    342342        ThermalConductivityEnum,
    343         MeltingRateCorrectionEnum,
    344         MeltingRateCorrectionApplyEnum,
     343        BasalMeltingRateCorrectionEnum,
     344        BasalMeltingRateCorrectionApplyEnum,
    345345        MixedLayerCapacityEnum,
    346346        ThermalExchangeVelocityEnum,

  • issm/trunk/src/c/EnumDefinitions/EnumToModelField.cpp

    r8371 r8392  
    2424                case GroundingLineMigrationEnum : return "gl_migration";
    2525                case AccumulationRateEnum: return "accumulation_rate";
    26                 case MeltingRateEnum: return "melting_rate";
     26                case BasalMeltingRateEnum: return "basal_melting_rate";
    2727                default : _error_("No model field is associated to enum %s",EnumToStringx(en));
    2828        }

  • issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp

    r8376 r8392  
    194194                case MeltingOffsetEnum : return "MeltingOffset";
    195195                case GroundingLineMeltingRateEnum : return "GroundingLineMeltingRate";
    196                 case MeltingRateEnum : return "MeltingRate";
     196                case BasalMeltingRateEnum : return "BasalMeltingRate";
    197197                case MisfitEnum : return "Misfit";
    198198                case NodeOnBedEnum : return "NodeOnBed";
    … …  
    295295                case GravityEnum : return "Gravity";
    296296                case ThermalConductivityEnum : return "ThermalConductivity";
    297                 case MeltingRateCorrectionEnum : return "MeltingRateCorrection";
    298                 case MeltingRateCorrectionApplyEnum : return "MeltingRateCorrectionApply";
     297                case BasalMeltingRateCorrectionEnum : return "BasalMeltingRateCorrection";
     298                case BasalMeltingRateCorrectionApplyEnum : return "BasalMeltingRateCorrectionApply";
    299299                case MixedLayerCapacityEnum : return "MixedLayerCapacity";
    300300                case ThermalExchangeVelocityEnum : return "ThermalExchangeVelocity";

  • issm/trunk/src/c/modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp

    r8330 r8392  
    2929        IoModelFetchData(&iomodel->vx,NULL,NULL,iomodel_handle,"vx");
    3030        IoModelFetchData(&iomodel->vy,NULL,NULL,iomodel_handle,"vy");
    31         IoModelFetchData(&iomodel->melting_rate,NULL,NULL,iomodel_handle,"melting_rate");
     31        IoModelFetchData(&iomodel->basal_melting_rate,NULL,NULL,iomodel_handle,"basal_melting_rate");
    3232        IoModelFetchData(&iomodel->accumulation_rate,NULL,NULL,iomodel_handle,"accumulation_rate");
    3333        IoModelFetchData(&iomodel->dhdt,NULL,NULL,iomodel_handle,"dhdt");
    … …  
    5858        xfree((void**)&iomodel->vx);
    5959        xfree((void**)&iomodel->vy);
    60         xfree((void**)&iomodel->melting_rate);
     60        xfree((void**)&iomodel->basal_melting_rate);
    6161        xfree((void**)&iomodel->accumulation_rate);
    6262}

  • issm/trunk/src/c/modules/ModelProcessorx/Balancevelocities/UpdateElementsBalancevelocities.cpp

    r8330 r8392  
    2929        IoModelFetchData(&iomodel->vx,NULL,NULL,iomodel_handle,"vx");
    3030        IoModelFetchData(&iomodel->vy,NULL,NULL,iomodel_handle,"vy");
    31         IoModelFetchData(&iomodel->melting_rate,NULL,NULL,iomodel_handle,"melting_rate");
     31        IoModelFetchData(&iomodel->basal_melting_rate,NULL,NULL,iomodel_handle,"basal_melting_rate");
    3232        IoModelFetchData(&iomodel->accumulation_rate,NULL,NULL,iomodel_handle,"accumulation_rate");
    3333
    … …  
    5959        xfree((void**)&iomodel->vy);
    6060        xfree((void**)&iomodel->vz);
    61         xfree((void**)&iomodel->melting_rate);
     61        xfree((void**)&iomodel->basal_melting_rate);
    6262        xfree((void**)&iomodel->accumulation_rate);
    6363}

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

    r8335 r8392  
    6565        parameters->AddObject(new DoubleParam(HeatCapacityEnum,iomodel->heatcapacity));
    6666        parameters->AddObject(new IntParam(ArtDiffEnum,iomodel->artdiff));
    67         parameters->AddObject(new IntParam(MeltingRateCorrectionApplyEnum,iomodel->melting_rate_correction_apply));
     67        parameters->AddObject(new IntParam(BasalMeltingRateCorrectionApplyEnum,iomodel->basal_melting_rate_correction_apply));
    6868        parameters->AddObject(new DoubleParam(GroundingLineMeltingRateEnum,iomodel->gl_melting_rate));
    6969        parameters->AddObject(new DoubleParam(PenaltyMeltingEnum,iomodel->penalty_melting));

  • issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp

    r8330 r8392  
    4646                IoModelFetchData(&iomodel->vz,NULL,NULL,iomodel_handle,"vz");
    4747                IoModelFetchData(&iomodel->accumulation_rate,NULL,NULL,iomodel_handle,"accumulation_rate");
    48                 IoModelFetchData(&iomodel->melting_rate,NULL,NULL,iomodel_handle,"melting_rate");
     48                IoModelFetchData(&iomodel->basal_melting_rate,NULL,NULL,iomodel_handle,"basal_melting_rate");
    4949                IoModelFetchData(&iomodel->nodeonstokes,NULL,NULL,iomodel_handle,"nodeonstokes");
    5050        }
    … …  
    8282        xfree((void**)&iomodel->elementonwater);
    8383        xfree((void**)&iomodel->accumulation_rate);
    84         xfree((void**)&iomodel->melting_rate);
     84        xfree((void**)&iomodel->basal_melting_rate);
    8585        xfree((void**)&iomodel->nodeonstokes);
    8686        xfree((void**)&iomodel->vx);

  • issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp

    r8330 r8392  
    3333        IoModelFetchData(&iomodel->elementonsurface,NULL,NULL,iomodel_handle,"elementonsurface");
    3434        IoModelFetchData(&iomodel->elementonwater,NULL,NULL,iomodel_handle,"elementonwater");
    35         IoModelFetchData(&iomodel->melting_rate,NULL,NULL,iomodel_handle,"melting_rate");
     35        IoModelFetchData(&iomodel->basal_melting_rate,NULL,NULL,iomodel_handle,"basal_melting_rate");
    3636        IoModelFetchData(&iomodel->accumulation_rate,NULL,NULL,iomodel_handle,"accumulation_rate");
    3737        IoModelFetchData(&iomodel->vx,NULL,NULL,iomodel_handle,"vx");
    … …  
    5959        xfree((void**)&iomodel->elementonsurface);
    6060        xfree((void**)&iomodel->elementonwater);
    61         xfree((void**)&iomodel->melting_rate);
     61        xfree((void**)&iomodel->basal_melting_rate);
    6262        xfree((void**)&iomodel->accumulation_rate);
    6363        xfree((void**)&iomodel->vx);

  • issm/trunk/src/c/modules/ModelProcessorx/Hydrology/UpdateElementsHydrology.cpp

    r8330 r8392  
    3737        IoModelFetchData(&iomodel->pressure,NULL,NULL,iomodel_handle,"pressure");
    3838        IoModelFetchData(&iomodel->temperature,NULL,NULL,iomodel_handle,"temperature");
    39         IoModelFetchData(&iomodel->melting_rate,NULL,NULL,iomodel_handle,"melting_rate");
     39        IoModelFetchData(&iomodel->basal_melting_rate,NULL,NULL,iomodel_handle,"basal_melting_rate");
    4040        IoModelFetchData(&iomodel->watercolumn,NULL,NULL,iomodel_handle,"watercolumn");
    4141        IoModelFetchData(&iomodel->geothermalflux,NULL,NULL,iomodel_handle,"geothermalflux");
    … …  
    7373        xfree((void**)&iomodel->pressure);
    7474        xfree((void**)&iomodel->temperature);
    75         xfree((void**)&iomodel->melting_rate);
     75        xfree((void**)&iomodel->basal_melting_rate);
    7676        xfree((void**)&iomodel->watercolumn);
    7777        xfree((void**)&iomodel->geothermalflux);

  • issm/trunk/src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp

    r8330 r8392  
    3939        IoModelFetchData(&iomodel->rheology_n,NULL,NULL,iomodel_handle,"rheology_n");
    4040        IoModelFetchData(&iomodel->accumulation_rate,NULL,NULL,iomodel_handle,"accumulation_rate");
    41         IoModelFetchData(&iomodel->melting_rate,NULL,NULL,iomodel_handle,"melting_rate");
     41        IoModelFetchData(&iomodel->basal_melting_rate,NULL,NULL,iomodel_handle,"basal_melting_rate");
    4242        IoModelFetchData(&iomodel->pressure,NULL,NULL,iomodel_handle,"pressure");
    4343
    … …  
    6969        xfree((void**)&iomodel->rheology_n);
    7070        xfree((void**)&iomodel->accumulation_rate);
    71         xfree((void**)&iomodel->melting_rate);
     71        xfree((void**)&iomodel->basal_melting_rate);
    7272        xfree((void**)&iomodel->pressure);
    7373}

  • issm/trunk/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp

    r8330 r8392  
    2828        IoModelFetchData(&iomodel->elementonwater,NULL,NULL,iomodel_handle,"elementonwater");
    2929        IoModelFetchData(&iomodel->accumulation_rate,NULL,NULL,iomodel_handle,"accumulation_rate");
    30         IoModelFetchData(&iomodel->melting_rate,NULL,NULL,iomodel_handle,"melting_rate");
    31         if(iomodel->melting_rate_correction_apply)IoModelFetchData(&iomodel->melting_rate_correction,NULL,NULL,iomodel_handle,"melting_rate_correction");
     30        IoModelFetchData(&iomodel->basal_melting_rate,NULL,NULL,iomodel_handle,"basal_melting_rate");
     31        if(iomodel->basal_melting_rate_correction_apply)IoModelFetchData(&iomodel->basal_melting_rate_correction,NULL,NULL,iomodel_handle,"basal_melting_rate_correction");
    3232        IoModelFetchData(&iomodel->vx,NULL,NULL,iomodel_handle,"vx");
    3333        IoModelFetchData(&iomodel->vy,NULL,NULL,iomodel_handle,"vy");
    … …  
    6060        xfree((void**)&iomodel->elementonwater);
    6161        xfree((void**)&iomodel->accumulation_rate);
    62         xfree((void**)&iomodel->melting_rate);
    63         xfree((void**)&iomodel->melting_rate_correction);
     62        xfree((void**)&iomodel->basal_melting_rate);
     63        xfree((void**)&iomodel->basal_melting_rate_correction);
    6464        xfree((void**)&iomodel->vx);
    6565        xfree((void**)&iomodel->vy);

  • issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp

    r8376 r8392  
    192192        else if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum;
    193193        else if (strcmp(name,"GroundingLineMeltingRate")==0) return GroundingLineMeltingRateEnum;
    194         else if (strcmp(name,"MeltingRate")==0) return MeltingRateEnum;
     194        else if (strcmp(name,"BasalMeltingRate")==0) return BasalMeltingRateEnum;
    195195        else if (strcmp(name,"Misfit")==0) return MisfitEnum;
    196196        else if (strcmp(name,"NodeOnBed")==0) return NodeOnBedEnum;
    … …  
    293293        else if (strcmp(name,"Gravity")==0) return GravityEnum;
    294294        else if (strcmp(name,"ThermalConductivity")==0) return ThermalConductivityEnum;
    295         else if (strcmp(name,"MeltingRateCorrection")==0) return MeltingRateCorrectionEnum;
    296         else if (strcmp(name,"MeltingRateCorrectionApply")==0) return MeltingRateCorrectionApplyEnum;
     295        else if (strcmp(name,"BasalMeltingRateCorrection")==0) return BasalMeltingRateCorrectionEnum;
     296        else if (strcmp(name,"BasalMeltingRateCorrectionApply")==0) return BasalMeltingRateCorrectionApplyEnum;
    297297        else if (strcmp(name,"MixedLayerCapacity")==0) return MixedLayerCapacityEnum;
    298298        else if (strcmp(name,"ThermalExchangeVelocity")==0) return ThermalExchangeVelocityEnum;

  • issm/trunk/src/c/objects/Elements/Penta.cpp

    r8386 r8392  
    40034003
    40044004        }
    4005         if (iomodel->melting_rate) {
    4006                 for(i=0;i<6;i++)nodeinputs[i]=iomodel->melting_rate[penta_vertex_ids[i]-1]/iomodel->yts;
    4007                 this->inputs->AddInput(new PentaVertexInput(MeltingRateEnum,nodeinputs));
     4005        if (iomodel->basal_melting_rate) {
     4006                for(i=0;i<6;i++)nodeinputs[i]=iomodel->basal_melting_rate[penta_vertex_ids[i]-1]/iomodel->yts;
     4007                this->inputs->AddInput(new PentaVertexInput(BasalMeltingRateEnum,nodeinputs));
    40084008        }
    40094009        if (iomodel->accumulation_rate) {
    … …  
    41974197        }
    41984198        else if (analysis_type==MeltingAnalysisEnum){
    4199                 InputUpdateFromSolutionOneDof(solution,MeltingRateEnum);
     4199                InputUpdateFromSolutionOneDof(solution,BasalMeltingRateEnum);
    42004200        }
    42014201        else{
    … …  
    53065306                                name==SurfaceSlopeXEnum ||
    53075307                                name==SurfaceSlopeYEnum ||
    5308                                 name==MeltingRateEnum ||
     5308                                name==BasalMeltingRateEnum ||
    53095309                                name==AccumulationRateEnum ||
    53105310                                name==GeothermalFluxEnum ||

  • issm/trunk/src/c/objects/Elements/Tria.cpp

    r8386 r8392  
    16711671        GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES);
    16721672        Input* accumulation_input=inputs->GetInput(AccumulationRateEnum); _assert_(accumulation_input);
    1673         Input* melting_input=inputs->GetInput(MeltingRateEnum);           _assert_(melting_input);
     1673        Input* melting_input=inputs->GetInput(BasalMeltingRateEnum);           _assert_(melting_input);
    16741674        Input* dhdt_input=inputs->GetInput(DhDtEnum);                     _assert_(dhdt_input);
    16751675       
    … …  
    17141714        GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES);
    17151715        Input* accumulation_input=inputs->GetInput(AccumulationRateEnum); _assert_(accumulation_input);
    1716         Input* melting_input=inputs->GetInput(MeltingRateEnum);           _assert_(melting_input);
     1716        Input* melting_input=inputs->GetInput(BasalMeltingRateEnum);           _assert_(melting_input);
    17171717        Input* dhdt_input=inputs->GetInput(DhDtEnum);                     _assert_(dhdt_input);
    17181718
    … …  
    17571757        GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES);
    17581758        Input* accumulation_input=inputs->GetInput(AccumulationRateEnum); _assert_(accumulation_input);
    1759         Input* melting_input=inputs->GetInput(MeltingRateEnum);           _assert_(melting_input);
     1759        Input* melting_input=inputs->GetInput(BasalMeltingRateEnum);           _assert_(melting_input);
    17601760
    17611761        /* Start  looping on the number of gaussian points: */
    … …  
    18021802        inputs->GetParameterValue(&approximation,ApproximationEnum);
    18031803        Input* bed_input=inputs->GetInput(BedEnum);             _assert_(bed_input);
    1804         Input* melting_input=inputs->GetInput(MeltingRateEnum); _assert_(melting_input);
     1804        Input* melting_input=inputs->GetInput(BasalMeltingRateEnum); _assert_(melting_input);
    18051805        Input* vx_input=inputs->GetInput(VxEnum);               _assert_(vx_input);
    18061806        Input* vy_input=inputs->GetInput(VyEnum);               _assert_(vy_input);
    … …  
    24012401        GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES);
    24022402        this->parameters->FindParam(&dt,DtEnum);
    2403         Input* melting_input=inputs->GetInput(MeltingRateEnum);           _assert_(melting_input);
     2403        Input* melting_input=inputs->GetInput(BasalMeltingRateEnum);           _assert_(melting_input);
    24042404        Input* old_watercolumn_input=inputs->GetInput(WaterColumnOldEnum);_assert_(old_watercolumn_input);
    24052405
    … …  
    24472447        this->parameters->FindParam(&dt,DtEnum);
    24482448        Input* accumulation_input=inputs->GetInput(AccumulationRateEnum); _assert_(accumulation_input);
    2449         Input* melting_input=inputs->GetInput(MeltingRateEnum);           _assert_(melting_input);
    2450         Input* melting_correction_input=inputs->GetInput(MeltingRateCorrectionEnum);
     2449        Input* melting_input=inputs->GetInput(BasalMeltingRateEnum);           _assert_(melting_input);
     2450        Input* melting_correction_input=inputs->GetInput(BasalMeltingRateCorrectionEnum);
    24512451        Input* thickness_input=inputs->GetInput(ThicknessEnum);           _assert_(thickness_input);
    24522452
    … …  
    24952495        GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES);
    24962496        Input* accumulation_input=inputs->GetInput(AccumulationRateEnum); _assert_(accumulation_input);
    2497         Input* melting_input=inputs->GetInput(MeltingRateEnum);           _assert_(melting_input);
     2497        Input* melting_input=inputs->GetInput(BasalMeltingRateEnum);           _assert_(melting_input);
    24982498        Input* thickness_input=inputs->GetInput(ThicknessEnum);           _assert_(thickness_input);
    24992499
    … …  
    38723872                this->inputs->AddInput(new TriaVertexInput(ThicknessObsEnum,nodeinputs));
    38733873        }
    3874         if (iomodel->melting_rate) {
    3875                 for(i=0;i<3;i++)nodeinputs[i]=iomodel->melting_rate[tria_vertex_ids[i]-1]/iomodel->yts;
    3876                 this->inputs->AddInput(new TriaVertexInput(MeltingRateEnum,nodeinputs));
    3877         }
    3878         if (iomodel->melting_rate_correction) {
    3879                 for(i=0;i<3;i++)nodeinputs[i]=iomodel->melting_rate_correction[tria_vertex_ids[i]-1]/iomodel->yts;
    3880                 this->inputs->AddInput(new TriaVertexInput(MeltingRateCorrectionEnum,nodeinputs));
     3874        if (iomodel->basal_melting_rate) {
     3875                for(i=0;i<3;i++)nodeinputs[i]=iomodel->basal_melting_rate[tria_vertex_ids[i]-1]/iomodel->yts;
     3876                this->inputs->AddInput(new TriaVertexInput(BasalMeltingRateEnum,nodeinputs));
     3877        }
     3878        if (iomodel->basal_melting_rate_correction) {
     3879                for(i=0;i<3;i++)nodeinputs[i]=iomodel->basal_melting_rate_correction[tria_vertex_ids[i]-1]/iomodel->yts;
     3880                this->inputs->AddInput(new TriaVertexInput(BasalMeltingRateCorrectionEnum,nodeinputs));
    38813881        }
    38823882        if (iomodel->watercolumn){
    … …  
    45284528                                name==SurfaceSlopeXEnum ||
    45294529                                name==SurfaceSlopeYEnum ||
    4530                                 name==MeltingRateEnum ||
     4530                                name==BasalMeltingRateEnum ||
    45314531                                name==WaterColumnEnum ||
    45324532                                name==AccumulationRateEnum ||
    … …  
    51485148        /*If this element just  became ungrounded, set its melting rate at 50 m/yr:*/
    51495149        if(swap){
    5150                 Input* melting_rate_input     =inputs->GetInput(MeltingRateEnum);     _assert_(melting_rate_input);
    5151                 melting_rate_input->GetValuesPtr(&values,NULL); for(i=0;i<3;i++)values[i]=gl_melting_rate/yts;
     5150                Input* basal_melting_rate_input     =inputs->GetInput(BasalMeltingRateEnum);     _assert_(basal_melting_rate_input);
     5151                basal_melting_rate_input->GetValuesPtr(&values,NULL); for(i=0;i<3;i++)values[i]=gl_melting_rate/yts;
    51525152        }
    51535153

  • issm/trunk/src/c/objects/IoModel.cpp

    r8365 r8392  
    8585        xfree((void**)&this->edges);
    8686        xfree((void**)&this->geothermalflux);
    87         xfree((void**)&this->melting_rate);
     87        xfree((void**)&this->basal_melting_rate);
    8888        xfree((void**)&this->watercolumn);
    89         xfree((void**)&this->melting_rate_correction);
     89        xfree((void**)&this->basal_melting_rate_correction);
    9090        xfree((void**)&this->accumulation_rate);
    9191        xfree((void**)&this->forcingtypes);
    … …  
    219219        IoModelFetchData(&this->mixed_layer_capacity,iomodel_handle,"mixed_layer_capacity");
    220220        IoModelFetchData(&this->thermal_exchange_velocity,iomodel_handle,"thermal_exchange_velocity");
    221         IoModelFetchData(&this->melting_rate_correction_apply,iomodel_handle,"melting_rate_correction_apply");
     221        IoModelFetchData(&this->basal_melting_rate_correction_apply,iomodel_handle,"basal_melting_rate_correction_apply");
    222222        IoModelFetchData(&this->gl_melting_rate,iomodel_handle,"gl_melting_rate");
    223223        IoModelFetchData(&this->rheology_law,iomodel_handle,"rheology_law");
    … …  
    285285        this->temperature=NULL;
    286286        this->gl_melting_rate=0;
    287         this->melting_rate=NULL;
     287        this->basal_melting_rate=NULL;
    288288        this->watercolumn=NULL;
    289         this->melting_rate_correction=NULL;
    290         this->melting_rate_correction_apply=0;
     289        this->basal_melting_rate_correction=NULL;
     290        this->basal_melting_rate_correction_apply=0;
    291291        this->geothermalflux=NULL;
    292292        this->elementonbed=NULL;

  • issm/trunk/src/c/objects/IoModel.h

    r8365 r8392  
    189189
    190190                /*basal: */
    191                 double*  melting_rate;
     191                double*  basal_melting_rate;
    192192                double*  watercolumn;
    193193                double   gl_melting_rate;
    194                 double*  melting_rate_correction;
    195                 int      melting_rate_correction_apply;
     194                double*  basal_melting_rate_correction;
     195                int      basal_melting_rate_correction_apply;
    196196                double*  accumulation_rate;
    197197                double*  dhdt;

  • issm/trunk/src/c/shared/Numerics/UnitConversion.cpp

    r8365 r8392  
    6868                case VelObsEnum:      scale=yts;break; //m/yr
    6969                case DhDtEnum:        scale=yts;break; //m/yr
    70                 case MeltingRateEnum: scale=yts;break; //m/yr
     70                case BasalMeltingRateEnum: scale=yts;break; //m/yr
    7171                case AccumulationRateEnum: scale=yts;break; //m/yr
    7272                case MisfitEnum:      scale=pow(yts,2);break; //(m/yr)^2

  • issm/trunk/src/c/solutions/steadystate_core.cpp

    r8073 r8392  
    6262                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,PressureEnum);
    6363                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,TemperatureEnum);
    64                 InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,MeltingRateEnum);
     64                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BasalMeltingRateEnum);
    6565        }
    6666}

  • issm/trunk/src/c/solutions/thermal_core.cpp

    r6412 r8392  
    5050                        _printf_(VerboseSolution(),"   saving results\n");
    5151                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,TemperatureEnum,i+1,time);
    52                         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,MeltingRateEnum,i+1,time);
     52                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BasalMeltingRateEnum,i+1,time);
    5353                }
    5454

  • issm/trunk/src/c/solutions/transient2d_core.cpp

    r8365 r8392  
    8787                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BedEnum,step,time);
    8888                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,AccumulationRateEnum,step,time);
    89                         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,MeltingRateEnum,step,time);
     89                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BasalMeltingRateEnum,step,time);
    9090                        if(gl_migration!=NoneEnum)InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ElementOnIceShelfEnum,step,time);
    9191

  • issm/trunk/src/c/solutions/transient3d_core.cpp

    r8363 r8392  
    8585                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BedEnum,step,time);
    8686                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,TemperatureEnum,step,time);
    87                         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,MeltingRateEnum,step,time);
     87                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BasalMeltingRateEnum,step,time);
    8888
    8989                        /*unload results*/

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

    r8372 r8392  
    266266                 temperature=NaN; %temperature solution vector
    267267                 gl_melting_rate=NaN;
    268                  melting_rate=NaN;
    269                  melting_rate_correction=NaN;
    270                  melting_rate_correction_apply=0;
     268                 basal_melting_rate=NaN;
     269                 basal_melting_rate_correction=NaN;
     270                 basal_melting_rate_correction_apply=0;
    271271                 pressure=NaN;
    272272                 
    … …  
    425425                                 if isfield(structmd,'B'), md.rheology_B=structmd.B; end
    426426                                 if isfield(structmd,'n'), md.rheology_n=structmd.n; end
    427                                  if isfield(structmd,'melting'), md.melting_rate=structmd.melting; end
     427                                 if isfield(structmd,'melting'), md.basal_melting_rate=structmd.melting; end
    428428                                 if isfield(structmd,'accumulation'), md.accumulation_rate=structmd.accumulation; end
    429429                                 if isfield(structmd,'numberofgrids'), md.numberofnodes=structmd.numberofgrids; end
    … …  
    617617                         md.latentheat=3.34*10^5;
    618618
    619                          %melting rate correction:
     619                         %basal melting rate correction:
    620620                         md.gl_melting_rate=0;
    621                          md.melting_rate_correction_apply=0; %do not apply
     621                         md.basal_melting_rate_correction_apply=0; %do not apply
    622622
    623623                         %ice thermal conductivity lamda (W/m/K)

  • issm/trunk/src/m/enum/EnumToModelField.m

    r8383 r8392  
    2222                case GroundingLineMigrationEnum(), string='gl_migration'; return
    2323                case AccumulationRateEnum(), string='accumulation_rate'; return
    24                 case MeltingRateEnum(), string='melting_rate'; return
     24                case BasalMeltingRateEnum(), string='basal_melting_rate'; return
    2525                otherwise, error(['Enum ' num2str(enum)  ' not found associated to any model field']);
    2626

  • issm/trunk/src/m/model/collapse.m

    r8298 r8392  
    7676
    7777%special for thermal modeling:
    78 md.melting_rate=project2d(md,md.melting_rate,1);
     78md.basal_melting_rate=project2d(md,md.basal_melting_rate,1);
    7979md.observed_temperature=DepthAverage(md,md.observed_temperature);
    8080md.geothermalflux=project2d(md,md.geothermalflux,1); %bedrock only gets geothermal flux

  • issm/trunk/src/m/model/display/displaybc.m

    r8298 r8392  
    2727disp(sprintf('\n      thermal:'));
    2828fielddisplay(md,'spctemperature','constraints flag list (first column) and values (second column)');
    29 fielddisplay(md,'melting_rate','melting rate [m/a]');
     29fielddisplay(md,'basal_melting_rate','basal melting rate [m/a]');

  • issm/trunk/src/m/model/display/displaythermal.m

    r5054 r8392  
    1717disp(sprintf('\n      boundary conditions:'));
    1818fielddisplay(md,'spctemperature','constraints flag list (first column) and values (second column)');
    19 fielddisplay(md,'melting_rate','melting rate [m/a]');
     19fielddisplay(md,'basal_melting_rate','basal melting rate [m/a]');
    2020
    2121disp(sprintf('\n      transient:'));

  • issm/trunk/src/m/model/extrude.m

    r8369 r8392  
    243243
    244244%special for thermal modeling:
    245 md.melting_rate=project3d(md,md.melting_rate,'node',1);
     245md.basal_melting_rate=project3d(md,md.basal_melting_rate,'node',1);
    246246md.observed_temperature=project3d(md,md.observed_temperature,'node');
    247247if ~isnan(md.geothermalflux)

  • issm/trunk/src/m/model/ismodelselfconsistent.m

    r8365 r8392  
    9292%}}}
    9393%SIZE NUMBEROFNODES {{{1
    94 fields={'x','y','z','rheology_B','drag_coefficient','melting_rate','accumulation_rate','surface','thickness','bed','nodeonbed','nodeonsurface'};
     94fields={'x','y','z','rheology_B','drag_coefficient','basal_melting_rate','accumulation_rate','surface','thickness','bed','nodeonbed','nodeonsurface'};
    9595checksize(md,fields,[md.numberofnodes 1]);
    9696%}}}
    … …  
    505505
    506506                                %INITIAL TEMPERATURE, MELTING AND ACCUMULATION
    507                                 fields={'temperature','accumulation_rate','melting_rate'};
     507                                fields={'temperature','accumulation_rate','basal_melting_rate'};
    508508                                checksize(md,fields,[md.numberofnodes 1]);
    509509                                checknan(md,fields);
    … …  
    521521                        % {{{2
    522522                        %VELOCITIES MELTING AND ACCUMULATION
    523                         fields={'vx','vy','accumulation_rate','melting_rate','dhdt'};
     523                        fields={'vx','vy','accumulation_rate','basal_melting_rate','dhdt'};
    524524                        checksize(md,fields,[md.numberofnodes 1]);
    525525                        checknan(md,fields);
    … …  
    540540                        % {{{2
    541541                        %VELOCITIES MELTING AND ACCUMULATION
    542                         fields={'vx','vy','accumulation_rate','melting_rate'};
     542                        fields={'vx','vy','accumulation_rate','basal_melting_rate'};
    543543                        checksize(md,fields,[md.numberofnodes 1]);
    544544                        checknan(md,fields);

  • issm/trunk/src/m/model/marshall.m

    r8372 r8392  
    9191WriteData(fid,md.accumulation_rate,'Mat','accumulation_rate');
    9292WriteData(fid,md.gl_melting_rate,'Scalar','gl_melting_rate');
    93 WriteData(fid,md.melting_rate,'Mat','melting_rate');
    94 WriteData(fid,md.melting_rate_correction_apply,'Integer','melting_rate_correction_apply');
     93WriteData(fid,md.basal_melting_rate,'Mat','basal_melting_rate');
     94WriteData(fid,md.basal_melting_rate_correction_apply,'Integer','basal_melting_rate_correction_apply');
    9595
    9696%deal with forcings
    … …  
    103103                        case 'accumulation_rate'
    104104                                forcingtypes(i)=AccumulationRateEnum;
    105                         case 'melting_rate'
    106                                 forcingtypes(i)=MeltingRateEnum;
     105                        case 'basal_melting_rate'
     106                                forcingtypes(i)=BasalMeltingRateEnum;
    107107                        otherwise
    108108                                error(['forcing ' forcingnames{i} ' not supported yet']);
    … …  
    126126end
    127127
    128 if md.melting_rate_correction_apply,
    129         WriteData(fid,md.melting_rate_correction,'Mat','melting_rate_correction');
     128if md.basal_melting_rate_correction_apply,
     129        WriteData(fid,md.basal_melting_rate_correction,'Mat','basal_melting_rate_correction');
    130130end
    131131WriteData(fid,md.dhdt,'Mat','dhdt');

  • issm/trunk/src/m/model/modeldefault/defaultparams.m

    r8298 r8392  
    9494
    9595        disp('      thermal model');
    96         md.melting_rate=zeros(md.numberofnodes,1);
     96        md.basal_melting_rate=zeros(md.numberofnodes,1);
    9797        md.observed_temperature=md.temperature;
    9898       

  • issm/trunk/src/m/model/structtomodel.m

    r8323 r8392  
    2525if isfield(structmd,'B'), md.rheology_B=structmd.B; end
    2626if isfield(structmd,'n'), md.rheology_n=structmd.n; end
    27 if isfield(structmd,'melting'), md.melting_rate=structmd.melting; end
     27if isfield(structmd,'melting'), md.basal_melting_rate=structmd.melting; end
    2828if isfield(structmd,'accumulation'), md.accumulation_rate=structmd.accumulation; end
    2929if isfield(structmd,'numberofgrids'), md.numberofnodes=structmd.numberofgrids; end

  • issm/trunk/src/m/model/tres.m

    r8298 r8392  
    8484        md.pressure=PatchToVec(md.results.SteadystateSolution.Pressure);
    8585        md.temperature=PatchToVec(md.results.SteadystateSolution.Temperature);
    86         md.melting_rate=PatchToVec(md.results.SteadystateSolution.MeltingRate);
     86        md.basal_melting_rate=PatchToVec(md.results.SteadystateSolution.BasalMeltingRate);
    8787       
    8888        if md.control_analysis==1,
    … …  
    9494elseif strcmpi(string,'thermal'),
    9595        md.temperature=PatchToVec(md.results.ThermalSolution.Temperature);
    96         md.melting_rate=PatchToVec(md.results.ThermalSolution.MeltingRate);
     96        md.basal_melting_rate=PatchToVec(md.results.ThermalSolution.BasalMeltingRate);
    9797elseif strcmpi(string,'hydrology'),
    9898        md.watercolumn=PatchToVec(md.results.HydrologySolution.WaterColumn);

  • issm/trunk/src/m/solutions/steadystate_core.m

    r8075 r8392  
    4646                femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,PressureEnum);
    4747                femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,TemperatureEnum);
    48                 femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,MeltingRateEnum);
     48                femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,BasalMeltingRateEnum);
    4949        end
    5050

  • issm/trunk/src/m/solutions/thermal_core.m

    r6323 r8392  
    3131                        issmprintf(VerboseSolution,'\n%s',['   saving results']);
    3232                        femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,TemperatureEnum,i,time);
    33                         femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,MeltingRateEnum,i,time);
     33                        femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,BasalMeltingRateEnum,i,time);
    3434                end
    3535        end

  • issm/trunk/src/m/solutions/transient3d_core.m

    r8363 r8392  
    6565                        femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,BedEnum,step,time);
    6666                        femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,TemperatureEnum,step,time);
    67                         femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,MeltingRateEnum,step,time);
     67                        femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,BasalMeltingRateEnum,step,time);
    6868                end
    6969        end

  • issm/trunk/src/m/utils/BC/SetIceSheetBC.m

    r8367 r8392  
    2828end
    2929
    30 %Create zeros melting_rate and accumulation_rate if not specified
     30%Create zeros basal_melting_rate and accumulation_rate if not specified
    3131if isnan(md.accumulation_rate),
    3232        md.accumulation_rate=zeros(md.numberofnodes,1);
    … …  
    3434        disp('      no accumulation_rate specified: values set as zero');
    3535end
    36 if isnan(md.melting_rate),
    37         md.melting_rate=zeros(md.numberofnodes,1);
    38         disp('      no melting_rate specified: values set as zero');
     36if isnan(md.basal_melting_rate),
     37        md.basal_melting_rate=zeros(md.numberofnodes,1);
     38        disp('      no basal_melting_rate specified: values set as zero');
    3939end
    4040if isnan(md.dhdt),

  • issm/trunk/src/m/utils/BC/SetIceShelfBC.m

    r8367 r8392  
    5959md.pressureload=pressureload;
    6060
    61 %Create zeros melting_rate and accumulation_rate if not specified
     61%Create zeros basal_melting_rate and accumulation_rate if not specified
    6262if isnan(md.accumulation_rate),
    6363        md.accumulation_rate=zeros(md.numberofnodes,1);
    … …  
    6565        disp('      no accumulation_rate specified: values set as zero');
    6666end
    67 if isnan(md.melting_rate),
    68         md.melting_rate=zeros(md.numberofnodes,1);
    69         disp('      no melting_rate specified: values set as zero');
     67if isnan(md.basal_melting_rate),
     68        md.basal_melting_rate=zeros(md.numberofnodes,1);
     69        disp('      no basal_melting_rate specified: values set as zero');
    7070end
    7171if isnan(md.dhdt),

  • issm/trunk/src/m/utils/BC/SetMarineIceSheetBC.m

    r8367 r8392  
    6969md.pressureload=pressureload;
    7070
    71 %Create zeros melting_rate and accumulation_rate if not specified
     71%Create zeros basal_melting_rate and accumulation_rate if not specified
    7272if isnan(md.accumulation_rate),
    7373        md.accumulation_rate=zeros(md.numberofnodes,1);
    … …  
    7575        disp('      no accumulation_rate specified: values set as zero');
    7676end
    77 if isnan(md.melting_rate),
    78         md.melting_rate=zeros(md.numberofnodes,1);
    79         disp('      no melting_rate specified: values set as zero');
     77if isnan(md.basal_melting_rate),
     78        md.basal_melting_rate=zeros(md.numberofnodes,1);
     79        disp('      no basal_melting_rate specified: values set as zero');
    8080end
    8181if isnan(md.dhdt),

  • issm/trunk/test/NightlyRun/test115.m

    r8295 r8392  
    99
    1010%Fields and tolerances to track changes
    11 field_names     ={'Temperature','MeltingRate'};
     11field_names     ={'Temperature','BasalMeltingRate'};
    1212field_tolerances={1e-13,1e-13};
    1313field_values={...
    1414        PatchToVec(md.results.ThermalSolution.Temperature),...
    15         PatchToVec(md.results.ThermalSolution.MeltingRate),...
     15        PatchToVec(md.results.ThermalSolution.BasalMeltingRate),...
    1616        };

  • issm/trunk/test/NightlyRun/test116.m

    r8295 r8392  
    99
    1010%Fields and tolerances to track changes
    11 field_names     ={'Temperature','MeltingRate'};
     11field_names     ={'Temperature','BasalMeltingRate'};
    1212field_tolerances={1e-13,1e-13};
    1313field_values={...
    1414        PatchToVec(md.results.ThermalSolution.Temperature),...
    15         PatchToVec(md.results.ThermalSolution.MeltingRate),...
     15        PatchToVec(md.results.ThermalSolution.BasalMeltingRate),...
    1616        };

  • issm/trunk/test/NightlyRun/test117.m

    r8295 r8392  
    88
    99%Fields and tolerances to track changes
    10 field_names     ={'Temperature','MeltingRate'};
     10field_names     ={'Temperature','BasalMeltingRate'};
    1111field_tolerances={1e-13,1e-13};
    1212field_values={...
    1313        PatchToVec(md.results.ThermalSolution.Temperature),...
    14         PatchToVec(md.results.ThermalSolution.MeltingRate),...
     14        PatchToVec(md.results.ThermalSolution.BasalMeltingRate),...
    1515        };

  • issm/trunk/test/NightlyRun/test118.m

    r8295 r8392  
    88
    99%Fields and tolerances to track changes
    10 field_names     ={'Temperature','MeltingRate'};
     10field_names     ={'Temperature','BasalMeltingRate'};
    1111field_tolerances={1e-13,1e-13};
    1212field_values={...
    1313        PatchToVec(md.results.ThermalSolution.Temperature),...
    14         PatchToVec(md.results.ThermalSolution.MeltingRate),...
     14        PatchToVec(md.results.ThermalSolution.BasalMeltingRate),...
    1515        };

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

    r8384 r8392  
    2626
    2727%Fields and tolerances to track changes
    28 field_names     ={'Vx','Vy','Vz','Vel','Pressure','Thickness','Bed','Surface','Temperature','MeltingRate'};
     28field_names     ={'Vx','Vy','Vz','Vel','Pressure','Thickness','Bed','Surface','Temperature','BasalMeltingRate'};
    2929field_tolerances={1e-08,1e-08,1e-07,1e-08,1e-08,1e-08,1e-08,1e-08,1e-07,1e-07};
    3030field_values={...
    … …  
    3838        PatchToVec(md.results.Transient3DSolution(end).Surface),...
    3939        PatchToVec(md.results.Transient3DSolution(end).Temperature),...
    40         PatchToVec(md.results.Transient3DSolution(end).MeltingRate),...
     40        PatchToVec(md.results.Transient3DSolution(end).BasalMeltingRate),...
    4141        };

  • issm/trunk/test/NightlyRun/test121.m

    r8295 r8392  
    88
    99%Fields and tolerances to track changes
    10 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ...
    11                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ...
    12                                            'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'};
     10field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ...
     11                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ...
     12                                           'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'};
    1313field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05};
    1414field_values={...
    … …  
    2222        PatchToVec(md.results.Transient3DSolution(1).Thickness),...
    2323        PatchToVec(md.results.Transient3DSolution(1).Temperature),...
    24         PatchToVec(md.results.Transient3DSolution(1).MeltingRate),...
     24        PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),...
    2525        PatchToVec(md.results.Transient3DSolution(2).Vx),...
    2626        PatchToVec(md.results.Transient3DSolution(2).Vy),...
    … …  
    3232        PatchToVec(md.results.Transient3DSolution(2).Thickness),...
    3333        PatchToVec(md.results.Transient3DSolution(2).Temperature),...
    34         PatchToVec(md.results.Transient3DSolution(2).MeltingRate),...
     34        PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),...
    3535        PatchToVec(md.results.Transient3DSolution(3).Vx),...
    3636        PatchToVec(md.results.Transient3DSolution(3).Vy),...
    … …  
    4242        PatchToVec(md.results.Transient3DSolution(3).Thickness),...
    4343        PatchToVec(md.results.Transient3DSolution(3).Temperature),...
    44         PatchToVec(md.results.Transient3DSolution(3).MeltingRate),...
     44        PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),...
    4545        };

  • issm/trunk/test/NightlyRun/test122.m

    r8295 r8392  
    88
    99%Fields and tolerances to track changes
    10 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ...
    11                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ...
    12                                            'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'};
     10field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ...
     11                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ...
     12                                           'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'};
    1313field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05};
    1414field_values={...
    … …  
    2222        PatchToVec(md.results.Transient3DSolution(1).Thickness),...
    2323        PatchToVec(md.results.Transient3DSolution(1).Temperature),...
    24         PatchToVec(md.results.Transient3DSolution(1).MeltingRate),...
     24        PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),...
    2525        PatchToVec(md.results.Transient3DSolution(2).Vx),...
    2626        PatchToVec(md.results.Transient3DSolution(2).Vy),...
    … …  
    3232        PatchToVec(md.results.Transient3DSolution(2).Thickness),...
    3333        PatchToVec(md.results.Transient3DSolution(2).Temperature),...
    34         PatchToVec(md.results.Transient3DSolution(2).MeltingRate),...
     34        PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),...
    3535        PatchToVec(md.results.Transient3DSolution(3).Vx),...
    3636        PatchToVec(md.results.Transient3DSolution(3).Vy),...
    … …  
    4242        PatchToVec(md.results.Transient3DSolution(3).Thickness),...
    4343        PatchToVec(md.results.Transient3DSolution(3).Temperature),...
    44         PatchToVec(md.results.Transient3DSolution(3).MeltingRate),...
     44        PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),...
    4545        };

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

    r8304 r8392  
    2929%plot results
    3030comp_melting=zeros(md.numberofnodes,1);
    31 comp_melting(md.results.ThermalSolution.MeltingRate.index)=md.results.ThermalSolution.MeltingRate.value;
     31comp_melting(md.results.ThermalSolution.BasalMeltingRate.index)=md.results.ThermalSolution.BasalMeltingRate.value;
    3232relative=abs((comp_melting-melting)./melting)*100;
    3333relative(find(comp_melting==melting))=0;
    … …  
    4343
    4444%Fields and tolerances to track changes
    45 field_names     ={'Melting'};
     45field_names     ={'BasalMelting'};
    4646field_tolerances={1e-13};
    4747field_values    ={comp_melting};

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

    r8295 r8392  
    99
    1010%Fields and tolerances to track changes
    11 field_names     ={'Temperature','MeltingRate'};
     11field_names     ={'Temperature','BasalMeltingRate'};
    1212field_tolerances={1e-13,1e-13};
    1313field_values={...
    1414        PatchToVec(md.results.ThermalSolution.Temperature),...
    15         PatchToVec(md.results.ThermalSolution.MeltingRate),...
     15        PatchToVec(md.results.ThermalSolution.BasalMeltingRate),...
    1616        };

  • issm/trunk/test/NightlyRun/test212.m

    r8295 r8392  
    99
    1010%Fields and tolerances to track changes
    11 field_names     ={'Temperature','MeltingRate'};
     11field_names     ={'Temperature','BasalMeltingRate'};
    1212field_tolerances={1e-13,1e-13};
    1313field_values={...
    1414        PatchToVec(md.results.ThermalSolution.Temperature),...
    15         PatchToVec(md.results.ThermalSolution.MeltingRate),...
     15        PatchToVec(md.results.ThermalSolution.BasalMeltingRate),...
    1616        };

  • issm/trunk/test/NightlyRun/test213.m

    r8295 r8392  
    88
    99%Fields and tolerances to track changes
    10 field_names     ={'Temperature1','MeltingRate1','Temperature2','MeltingRate2','Temperature3','MeltingRate3'};
     10field_names     ={'Temperature1','MeltingRate1','Temperature2','BasalMeltingRate2','Temperature3','BasalMeltingRate3'};
    1111field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    1212field_values={...
    1313        PatchToVec(md.results.ThermalSolution(1).Temperature),...
    14         PatchToVec(md.results.ThermalSolution(1).MeltingRate),...
     14        PatchToVec(md.results.ThermalSolution(1).BasalMeltingRate),...
    1515        PatchToVec(md.results.ThermalSolution(2).Temperature),...
    16         PatchToVec(md.results.ThermalSolution(2).MeltingRate),...
     16        PatchToVec(md.results.ThermalSolution(2).BasalMeltingRate),...
    1717        PatchToVec(md.results.ThermalSolution(3).Temperature),...
    18         PatchToVec(md.results.ThermalSolution(3).MeltingRate),...
     18        PatchToVec(md.results.ThermalSolution(3).BasalMeltingRate),...
    1919        };

  • issm/trunk/test/NightlyRun/test214.m

    r8295 r8392  
    88
    99%Fields and tolerances to track changes
    10 field_names     ={'Temperature1','MeltingRate1','Temperature2','MeltingRate2','Temperature3','MeltingRate3'};
     10field_names     ={'Temperature1','BasalMeltingRate1','Temperature2','BasalMeltingRate2','Temperature3','BasalMeltingRate3'};
    1111field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    1212field_values={...
    1313        PatchToVec(md.results.ThermalSolution(1).Temperature),...
    14         PatchToVec(md.results.ThermalSolution(1).MeltingRate),...
     14        PatchToVec(md.results.ThermalSolution(1).BasalMeltingRate),...
    1515        PatchToVec(md.results.ThermalSolution(2).Temperature),...
    16         PatchToVec(md.results.ThermalSolution(2).MeltingRate),...
     16        PatchToVec(md.results.ThermalSolution(2).BasalMeltingRate),...
    1717        PatchToVec(md.results.ThermalSolution(3).Temperature),...
    18         PatchToVec(md.results.ThermalSolution(3).MeltingRate),...
     18        PatchToVec(md.results.ThermalSolution(3).BasalMeltingRate),...
    1919        };

  • issm/trunk/test/NightlyRun/test217.m

    r8295 r8392  
    88
    99%Fields and tolerances to track changes
    10 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ...
    11                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ...
    12                                            'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'};
     10field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ...
     11                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ...
     12                                           'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'};
    1313field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    1414field_values={...
    … …  
    2222        PatchToVec(md.results.Transient3DSolution(1).Thickness),...
    2323        PatchToVec(md.results.Transient3DSolution(1).Temperature),...
    24         PatchToVec(md.results.Transient3DSolution(1).MeltingRate),...
     24        PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),...
    2525        PatchToVec(md.results.Transient3DSolution(2).Vx),...
    2626        PatchToVec(md.results.Transient3DSolution(2).Vy),...
    … …  
    3232        PatchToVec(md.results.Transient3DSolution(2).Thickness),...
    3333        PatchToVec(md.results.Transient3DSolution(2).Temperature),...
    34         PatchToVec(md.results.Transient3DSolution(2).MeltingRate),...
     34        PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),...
    3535        PatchToVec(md.results.Transient3DSolution(3).Vx),...
    3636        PatchToVec(md.results.Transient3DSolution(3).Vy),...
    … …  
    4242        PatchToVec(md.results.Transient3DSolution(3).Thickness),...
    4343        PatchToVec(md.results.Transient3DSolution(3).Temperature),...
    44         PatchToVec(md.results.Transient3DSolution(3).MeltingRate),...
     44        PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),...
    4545        };

  • issm/trunk/test/NightlyRun/test218.m

    r8295 r8392  
    88
    99%Fields and tolerances to track changes
    10 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ...
    11                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ...
    12                                            'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'};
     10field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ...
     11                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ...
     12                                           'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'};
    1313field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    1414field_values={...
    … …  
    2222        PatchToVec(md.results.Transient3DSolution(1).Thickness),...
    2323        PatchToVec(md.results.Transient3DSolution(1).Temperature),...
    24         PatchToVec(md.results.Transient3DSolution(1).MeltingRate),...
     24        PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),...
    2525        PatchToVec(md.results.Transient3DSolution(2).Vx),...
    2626        PatchToVec(md.results.Transient3DSolution(2).Vy),...
    … …  
    3232        PatchToVec(md.results.Transient3DSolution(2).Thickness),...
    3333        PatchToVec(md.results.Transient3DSolution(2).Temperature),...
    34         PatchToVec(md.results.Transient3DSolution(2).MeltingRate),...
     34        PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),...
    3535        PatchToVec(md.results.Transient3DSolution(3).Vx),...
    3636        PatchToVec(md.results.Transient3DSolution(3).Vy),...
    … …  
    4242        PatchToVec(md.results.Transient3DSolution(3).Thickness),...
    4343        PatchToVec(md.results.Transient3DSolution(3).Temperature),...
    44         PatchToVec(md.results.Transient3DSolution(3).MeltingRate),...
     44        PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),...
    4545        };

  • issm/trunk/test/NightlyRun/test219.m

    r8295 r8392  
    88
    99%Fields and tolerances to track changes
    10 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ...
    11                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ...
    12                                            'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'};
     10field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ...
     11                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ...
     12                                           'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'};
    1313field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06};
    1414field_values={...
    … …  
    2222        PatchToVec(md.results.Transient3DSolution(1).Thickness),...
    2323        PatchToVec(md.results.Transient3DSolution(1).Temperature),...
    24         PatchToVec(md.results.Transient3DSolution(1).MeltingRate),...
     24        PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),...
    2525        PatchToVec(md.results.Transient3DSolution(2).Vx),...
    2626        PatchToVec(md.results.Transient3DSolution(2).Vy),...
    … …  
    3232        PatchToVec(md.results.Transient3DSolution(2).Thickness),...
    3333        PatchToVec(md.results.Transient3DSolution(2).Temperature),...
    34         PatchToVec(md.results.Transient3DSolution(2).MeltingRate),...
     34        PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),...
    3535        PatchToVec(md.results.Transient3DSolution(3).Vx),...
    3636        PatchToVec(md.results.Transient3DSolution(3).Vy),...
    … …  
    4242        PatchToVec(md.results.Transient3DSolution(3).Thickness),...
    4343        PatchToVec(md.results.Transient3DSolution(3).Temperature),...
    44         PatchToVec(md.results.Transient3DSolution(3).MeltingRate),...
     44        PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),...
    4545        };

  • issm/trunk/test/NightlyRun/test220.m

    r8295 r8392  
    88
    99%Fields and tolerances to track changes
    10 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ...
    11                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ...
    12                                            'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'};
     10field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ...
     11                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ...
     12                                           'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'};
    1313field_tolerances={...
    1414        1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,...
    … …  
    2525        PatchToVec(md.results.Transient3DSolution(1).Thickness),...
    2626        PatchToVec(md.results.Transient3DSolution(1).Temperature),...
    27         PatchToVec(md.results.Transient3DSolution(1).MeltingRate),...
     27        PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),...
    2828        PatchToVec(md.results.Transient3DSolution(2).Vx),...
    2929        PatchToVec(md.results.Transient3DSolution(2).Vy),...
    … …  
    3535        PatchToVec(md.results.Transient3DSolution(2).Thickness),...
    3636        PatchToVec(md.results.Transient3DSolution(2).Temperature),...
    37         PatchToVec(md.results.Transient3DSolution(2).MeltingRate),...
     37        PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),...
    3838        PatchToVec(md.results.Transient3DSolution(3).Vx),...
    3939        PatchToVec(md.results.Transient3DSolution(3).Vy),...
    … …  
    4545        PatchToVec(md.results.Transient3DSolution(3).Thickness),...
    4646        PatchToVec(md.results.Transient3DSolution(3).Temperature),...
    47         PatchToVec(md.results.Transient3DSolution(3).MeltingRate),...
     47        PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),...
    4848        };

  • issm/trunk/test/NightlyRun/test221.m

    r8295 r8392  
    99
    1010%Fields and tolerances to track changes
    11 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ...
    12                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ...
    13                                            'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'};
     11field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ...
     12                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ...
     13                                           'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'};
    1414field_tolerances={1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08};
    1515field_values={...
    … …  
    2323        PatchToVec(md.results.Transient3DSolution(1).Thickness),...
    2424        PatchToVec(md.results.Transient3DSolution(1).Temperature),...
    25         PatchToVec(md.results.Transient3DSolution(1).MeltingRate),...
     25        PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),...
    2626        PatchToVec(md.results.Transient3DSolution(2).Vx),...
    2727        PatchToVec(md.results.Transient3DSolution(2).Vy),...
    … …  
    3333        PatchToVec(md.results.Transient3DSolution(2).Thickness),...
    3434        PatchToVec(md.results.Transient3DSolution(2).Temperature),...
    35         PatchToVec(md.results.Transient3DSolution(2).MeltingRate),...
     35        PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),...
    3636        PatchToVec(md.results.Transient3DSolution(3).Vx),...
    3737        PatchToVec(md.results.Transient3DSolution(3).Vy),...
    … …  
    4343        PatchToVec(md.results.Transient3DSolution(3).Thickness),...
    4444        PatchToVec(md.results.Transient3DSolution(3).Temperature),...
    45         PatchToVec(md.results.Transient3DSolution(3).MeltingRate),...
     45        PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),...
    4646        };

  • issm/trunk/test/NightlyRun/test222.m

    r8295 r8392  
    99
    1010%Fields and tolerances to track changes
    11 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ...
    12                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ...
    13                                            'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'};
     11field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ...
     12                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ...
     13                                           'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'};
    1414field_tolerances={...
    1515        1e-08,1e-08,1e-06,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,...
    … …  
    2626        PatchToVec(md.results.Transient3DSolution(1).Thickness),...
    2727        PatchToVec(md.results.Transient3DSolution(1).Temperature),...
    28         PatchToVec(md.results.Transient3DSolution(1).MeltingRate),...
     28        PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),...
    2929        PatchToVec(md.results.Transient3DSolution(2).Vx),...
    3030        PatchToVec(md.results.Transient3DSolution(2).Vy),...
    … …  
    3636        PatchToVec(md.results.Transient3DSolution(2).Thickness),...
    3737        PatchToVec(md.results.Transient3DSolution(2).Temperature),...
    38         PatchToVec(md.results.Transient3DSolution(2).MeltingRate),...
     38        PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),...
    3939        PatchToVec(md.results.Transient3DSolution(3).Vx),...
    4040        PatchToVec(md.results.Transient3DSolution(3).Vy),...
    … …  
    4646        PatchToVec(md.results.Transient3DSolution(3).Thickness),...
    4747        PatchToVec(md.results.Transient3DSolution(3).Temperature),...
    48         PatchToVec(md.results.Transient3DSolution(3).MeltingRate),...
     48        PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),...
    4949        };

  • issm/trunk/test/NightlyRun/test247.m

    r8295 r8392  
    99
    1010%Fields and tolerances to track changes
    11 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ...
    12                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ...
    13                                            'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'};
     11field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ...
     12                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ...
     13                                           'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'};
    1414field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06};
    1515field_values={...
    … …  
    2323        PatchToVec(md.results.Transient3DSolution(1).Thickness),...
    2424        PatchToVec(md.results.Transient3DSolution(1).Temperature),...
    25         PatchToVec(md.results.Transient3DSolution(1).MeltingRate),...
     25        PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),...
    2626        PatchToVec(md.results.Transient3DSolution(2).Vx),...
    2727        PatchToVec(md.results.Transient3DSolution(2).Vy),...
    … …  
    3333        PatchToVec(md.results.Transient3DSolution(2).Thickness),...
    3434        PatchToVec(md.results.Transient3DSolution(2).Temperature),...
    35         PatchToVec(md.results.Transient3DSolution(2).MeltingRate),...
     35        PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),...
    3636        PatchToVec(md.results.Transient3DSolution(3).Vx),...
    3737        PatchToVec(md.results.Transient3DSolution(3).Vy),...
    … …  
    4343        PatchToVec(md.results.Transient3DSolution(3).Thickness),...
    4444        PatchToVec(md.results.Transient3DSolution(3).Temperature),...
    45         PatchToVec(md.results.Transient3DSolution(3).MeltingRate),...
     45        PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),...
    4646        };

  • issm/trunk/test/NightlyRun/test248.m

    r8295 r8392  
    99
    1010%Fields and tolerances to track changes
    11 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ...
    12                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ...
    13                                            'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'};
     11field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ...
     12                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ...
     13                                           'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'};
    1414field_tolerances={...
    1515        1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,...
    … …  
    2626        PatchToVec(md.results.Transient3DSolution(1).Thickness),...
    2727        PatchToVec(md.results.Transient3DSolution(1).Temperature),...
    28         PatchToVec(md.results.Transient3DSolution(1).MeltingRate),...
     28        PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),...
    2929        PatchToVec(md.results.Transient3DSolution(2).Vx),...
    3030        PatchToVec(md.results.Transient3DSolution(2).Vy),...
    … …  
    3636        PatchToVec(md.results.Transient3DSolution(2).Thickness),...
    3737        PatchToVec(md.results.Transient3DSolution(2).Temperature),...
    38         PatchToVec(md.results.Transient3DSolution(2).MeltingRate),...
     38        PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),...
    3939        PatchToVec(md.results.Transient3DSolution(3).Vx),...
    4040        PatchToVec(md.results.Transient3DSolution(3).Vy),...
    … …  
    4646        PatchToVec(md.results.Transient3DSolution(3).Thickness),...
    4747        PatchToVec(md.results.Transient3DSolution(3).Temperature),...
    48         PatchToVec(md.results.Transient3DSolution(3).MeltingRate),...
     48        PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),...
    4949        };

  • issm/trunk/test/NightlyRun/test249.m

    r8295 r8392  
    1010
    1111%Fields and tolerances to track changes
    12 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ...
    13                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ...
    14                                            'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'};
     12field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ...
     13                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ...
     14                                           'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'};
    1515field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06};
    1616field_values={...
    … …  
    2424        PatchToVec(md.results.Transient3DSolution(1).Thickness),...
    2525        PatchToVec(md.results.Transient3DSolution(1).Temperature),...
    26         PatchToVec(md.results.Transient3DSolution(1).MeltingRate),...
     26        PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),...
    2727        PatchToVec(md.results.Transient3DSolution(2).Vx),...
    2828        PatchToVec(md.results.Transient3DSolution(2).Vy),...
    … …  
    3434        PatchToVec(md.results.Transient3DSolution(2).Thickness),...
    3535        PatchToVec(md.results.Transient3DSolution(2).Temperature),...
    36         PatchToVec(md.results.Transient3DSolution(2).MeltingRate),...
     36        PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),...
    3737        PatchToVec(md.results.Transient3DSolution(3).Vx),...
    3838        PatchToVec(md.results.Transient3DSolution(3).Vy),...
    … …  
    4444        PatchToVec(md.results.Transient3DSolution(3).Thickness),...
    4545        PatchToVec(md.results.Transient3DSolution(3).Temperature),...
    46         PatchToVec(md.results.Transient3DSolution(3).MeltingRate),...
     46        PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),...
    4747        };

  • issm/trunk/test/NightlyRun/test250.m

    r8295 r8392  
    1010
    1111%Fields and tolerances to track changes
    12 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ...
    13                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ...
    14                                            'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'};
     12field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ...
     13                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ...
     14                                           'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'};
    1515field_tolerances={...
    1616        1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,...
    … …  
    2727        PatchToVec(md.results.Transient3DSolution(1).Thickness),...
    2828        PatchToVec(md.results.Transient3DSolution(1).Temperature),...
    29         PatchToVec(md.results.Transient3DSolution(1).MeltingRate),...
     29        PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),...
    3030        PatchToVec(md.results.Transient3DSolution(2).Vx),...
    3131        PatchToVec(md.results.Transient3DSolution(2).Vy),...
    … …  
    3737        PatchToVec(md.results.Transient3DSolution(2).Thickness),...
    3838        PatchToVec(md.results.Transient3DSolution(2).Temperature),...
    39         PatchToVec(md.results.Transient3DSolution(2).MeltingRate),...
     39        PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),...
    4040        PatchToVec(md.results.Transient3DSolution(3).Vx),...
    4141        PatchToVec(md.results.Transient3DSolution(3).Vy),...
    … …  
    4747        PatchToVec(md.results.Transient3DSolution(3).Thickness),...
    4848        PatchToVec(md.results.Transient3DSolution(3).Temperature),...
    49         PatchToVec(md.results.Transient3DSolution(3).MeltingRate),...
     49        PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),...
    5050        };

  • issm/trunk/test/NightlyRun/test253.m

    r8295 r8392  
    1010
    1111%Fields and tolerances to track changes
    12 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ...
    13                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ...
    14                                            'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'};
     12field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ...
     13                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ...
     14                                           'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'};
    1515field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06};
    1616field_values={...
    … …  
    2424        PatchToVec(md.results.Transient3DSolution(1).Thickness),...
    2525        PatchToVec(md.results.Transient3DSolution(1).Temperature),...
    26         PatchToVec(md.results.Transient3DSolution(1).MeltingRate),...
     26        PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),...
    2727        PatchToVec(md.results.Transient3DSolution(2).Vx),...
    2828        PatchToVec(md.results.Transient3DSolution(2).Vy),...
    … …  
    3434        PatchToVec(md.results.Transient3DSolution(2).Thickness),...
    3535        PatchToVec(md.results.Transient3DSolution(2).Temperature),...
    36         PatchToVec(md.results.Transient3DSolution(2).MeltingRate),...
     36        PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),...
    3737        PatchToVec(md.results.Transient3DSolution(3).Vx),...
    3838        PatchToVec(md.results.Transient3DSolution(3).Vy),...
    … …  
    4444        PatchToVec(md.results.Transient3DSolution(3).Thickness),...
    4545        PatchToVec(md.results.Transient3DSolution(3).Temperature),...
    46         PatchToVec(md.results.Transient3DSolution(3).MeltingRate),...
     46        PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),...
    4747        };

  • issm/trunk/test/NightlyRun/test254.m

    r8295 r8392  
    1010
    1111%Fields and tolerances to track changes
    12 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ...
    13                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ...
    14                                            'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'};
     12field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ...
     13                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ...
     14                                           'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'};
    1515field_tolerances={...
    1616        1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,...
    … …  
    2727        PatchToVec(md.results.Transient3DSolution(1).Thickness),...
    2828        PatchToVec(md.results.Transient3DSolution(1).Temperature),...
    29         PatchToVec(md.results.Transient3DSolution(1).MeltingRate),...
     29        PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),...
    3030        PatchToVec(md.results.Transient3DSolution(2).Vx),...
    3131        PatchToVec(md.results.Transient3DSolution(2).Vy),...
    … …  
    3737        PatchToVec(md.results.Transient3DSolution(2).Thickness),...
    3838        PatchToVec(md.results.Transient3DSolution(2).Temperature),...
    39         PatchToVec(md.results.Transient3DSolution(2).MeltingRate),...
     39        PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),...
    4040        PatchToVec(md.results.Transient3DSolution(3).Vx),...
    4141        PatchToVec(md.results.Transient3DSolution(3).Vy),...
    … …  
    4747        PatchToVec(md.results.Transient3DSolution(3).Thickness),...
    4848        PatchToVec(md.results.Transient3DSolution(3).Temperature),...
    49         PatchToVec(md.results.Transient3DSolution(3).MeltingRate),...
     49        PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),...
    5050        };

  • issm/trunk/test/NightlyRun/test323.m

    r8295 r8392  
    99
    1010%Fields and tolerances to track changes
    11 field_names     ={'Temperature','MeltingRate'};
     11field_names     ={'Temperature','BasalMeltingRate'};
    1212field_tolerances={1e-13,1e-13};
    1313field_values={...
    1414        PatchToVec(md.results.ThermalSolution.Temperature),...
    15         PatchToVec(md.results.ThermalSolution.MeltingRate),...
     15        PatchToVec(md.results.ThermalSolution.BasalMeltingRate),...
    1616        };

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

    r8295 r8392  
    99
    1010%Fields and tolerances to track changes
    11 field_names     ={'Temperature','MeltingRate'};
     11field_names     ={'Temperature','BasalMeltingRate'};
    1212field_tolerances={1e-13,1e-13};
    1313field_values={...
    1414        PatchToVec(md.results.ThermalSolution.Temperature),...
    15         PatchToVec(md.results.ThermalSolution.MeltingRate),...
     15        PatchToVec(md.results.ThermalSolution.BasalMeltingRate),...
    1616        };

  • issm/trunk/test/NightlyRun/test325.m

    r8295 r8392  
    88
    99%Fields and tolerances to track changes
    10 field_names     ={'Temperature','MeltingRate'};
     10field_names     ={'Temperature','BasalMeltingRate'};
    1111field_tolerances={1e-13,1e-13};
    1212field_values={...
    1313        PatchToVec(md.results.ThermalSolution.Temperature),...
    14         PatchToVec(md.results.ThermalSolution.MeltingRate),...
     14        PatchToVec(md.results.ThermalSolution.BasalMeltingRate),...
    1515        };

  • issm/trunk/test/NightlyRun/test326.m

    r8295 r8392  
    88
    99%Fields and tolerances to track changes
    10 field_names     ={'Temperature','MeltingRate'};
     10field_names     ={'Temperature','BasalMeltingRate'};
    1111field_tolerances={1e-13,1e-13};
    1212field_values={...
    1313        PatchToVec(md.results.ThermalSolution.Temperature),...
    14         PatchToVec(md.results.ThermalSolution.MeltingRate),...
     14        PatchToVec(md.results.ThermalSolution.BasalMeltingRate),...
    1515        };

  • issm/trunk/test/NightlyRun/test329.m

    r8295 r8392  
    88
    99%Fields and tolerances to track changes
    10 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ...
    11                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ...
    12                                            'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'};
     10field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ...
     11                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ...
     12                                           'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'};
    1313field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    1414field_values={...
    … …  
    2222        PatchToVec(md.results.Transient3DSolution(1).Thickness),...
    2323        PatchToVec(md.results.Transient3DSolution(1).Temperature),...
    24         PatchToVec(md.results.Transient3DSolution(1).MeltingRate),...
     24        PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),...
    2525        PatchToVec(md.results.Transient3DSolution(2).Vx),...
    2626        PatchToVec(md.results.Transient3DSolution(2).Vy),...
    … …  
    3232        PatchToVec(md.results.Transient3DSolution(2).Thickness),...
    3333        PatchToVec(md.results.Transient3DSolution(2).Temperature),...
    34         PatchToVec(md.results.Transient3DSolution(2).MeltingRate),...
     34        PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),...
    3535        PatchToVec(md.results.Transient3DSolution(3).Vx),...
    3636        PatchToVec(md.results.Transient3DSolution(3).Vy),...
    … …  
    4242        PatchToVec(md.results.Transient3DSolution(3).Thickness),...
    4343        PatchToVec(md.results.Transient3DSolution(3).Temperature),...
    44         PatchToVec(md.results.Transient3DSolution(3).MeltingRate),...
     44        PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),...
    4545        };

  • issm/trunk/test/NightlyRun/test330.m

    r8295 r8392  
    88
    99%Fields and tolerances to track changes
    10 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ...
    11                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ...
    12                                            'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'};
     10field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ...
     11                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ...
     12                                           'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'};
    1313field_tolerances={1e-13,  1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...,
    1414                                                5*1e-11,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
    … …  
    2424        PatchToVec(md.results.Transient3DSolution(1).Thickness),...
    2525        PatchToVec(md.results.Transient3DSolution(1).Temperature),...
    26         PatchToVec(md.results.Transient3DSolution(1).MeltingRate),...
     26        PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),...
    2727        PatchToVec(md.results.Transient3DSolution(2).Vx),...
    2828        PatchToVec(md.results.Transient3DSolution(2).Vy),...
    … …  
    3434        PatchToVec(md.results.Transient3DSolution(2).Thickness),...
    3535        PatchToVec(md.results.Transient3DSolution(2).Temperature),...
    36         PatchToVec(md.results.Transient3DSolution(2).MeltingRate),...
     36        PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),...
    3737        PatchToVec(md.results.Transient3DSolution(3).Vx),...
    3838        PatchToVec(md.results.Transient3DSolution(3).Vy),...
    … …  
    4444        PatchToVec(md.results.Transient3DSolution(3).Thickness),...
    4545        PatchToVec(md.results.Transient3DSolution(3).Temperature),...
    46         PatchToVec(md.results.Transient3DSolution(3).MeltingRate),...
     46        PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),...
    4747        };

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

    r8295 r8392  
    88
    99%Fields and tolerances to track changes
    10 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ...
    11                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ...
    12                                            'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'};
     10field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ...
     11                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ...
     12                                           'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'};
    1313field_tolerances={1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10};
    1414field_values={...
    … …  
    2222        PatchToVec(md.results.Transient3DSolution(1).Thickness),...
    2323        PatchToVec(md.results.Transient3DSolution(1).Temperature),...
    24         PatchToVec(md.results.Transient3DSolution(1).MeltingRate),...
     24        PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),...
    2525        PatchToVec(md.results.Transient3DSolution(2).Vx),...
    2626        PatchToVec(md.results.Transient3DSolution(2).Vy),...
    … …  
    3232        PatchToVec(md.results.Transient3DSolution(2).Thickness),...
    3333        PatchToVec(md.results.Transient3DSolution(2).Temperature),...
    34         PatchToVec(md.results.Transient3DSolution(2).MeltingRate),...
     34        PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),...
    3535        PatchToVec(md.results.Transient3DSolution(3).Vx),...
    3636        PatchToVec(md.results.Transient3DSolution(3).Vy),...
    … …  
    4242        PatchToVec(md.results.Transient3DSolution(3).Thickness),...
    4343        PatchToVec(md.results.Transient3DSolution(3).Temperature),...
    44         PatchToVec(md.results.Transient3DSolution(3).MeltingRate),...
     44        PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),...
    4545        };

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

    r8295 r8392  
    88
    99%Fields and tolerances to track changes
    10 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ...
    11                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ...
    12                                            'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'};
     10field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ...
     11                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ...
     12                                           'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'};
    1313field_tolerances={1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,...
    1414                                                1e-09,1e-09,1e-10,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,...
    … …  
    2424        PatchToVec(md.results.Transient3DSolution(1).Thickness),...
    2525        PatchToVec(md.results.Transient3DSolution(1).Temperature),...
    26         PatchToVec(md.results.Transient3DSolution(1).MeltingRate),...
     26        PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),...
    2727        PatchToVec(md.results.Transient3DSolution(2).Vx),...
    2828        PatchToVec(md.results.Transient3DSolution(2).Vy),...
    … …  
    3434        PatchToVec(md.results.Transient3DSolution(2).Thickness),...
    3535        PatchToVec(md.results.Transient3DSolution(2).Temperature),...
    36         PatchToVec(md.results.Transient3DSolution(2).MeltingRate),...
     36        PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),...
    3737        PatchToVec(md.results.Transient3DSolution(3).Vx),...
    3838        PatchToVec(md.results.Transient3DSolution(3).Vy),...
    … …  
    4444        PatchToVec(md.results.Transient3DSolution(3).Thickness),...
    4545        PatchToVec(md.results.Transient3DSolution(3).Temperature),...
    46         PatchToVec(md.results.Transient3DSolution(3).MeltingRate),...
     46        PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),...
    4747        };

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

    r8295 r8392  
    99
    1010%Fields and tolerances to track changes
    11 field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','MeltingRate'};
     11field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalMeltingRate'};
     12
    1213field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13
    1314};
    … …  
    1920        PatchToVec(md.results.SteadystateSolution.Pressure),...
    2021        PatchToVec(md.results.SteadystateSolution.Temperature),...
    21         PatchToVec(md.results.SteadystateSolution.MeltingRate),...
     22        PatchToVec(md.results.SteadystateSolution.BasalMeltingRate),...
    2223        };

  • issm/trunk/test/NightlyRun/test336.m

    r8295 r8392  
    99
    1010%Fields and tolerances to track changes
    11 field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','MeltingRate'};
     11field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalMeltingRate'};
    1212field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13
    1313};
    … …  
    1919        PatchToVec(md.results.SteadystateSolution.Pressure),...
    2020        PatchToVec(md.results.SteadystateSolution.Temperature),...
    21         PatchToVec(md.results.SteadystateSolution.MeltingRate),...
     21        PatchToVec(md.results.SteadystateSolution.BasalMeltingRate),...
    2222        };

  • issm/trunk/test/NightlyRun/test347.m

    r8295 r8392  
    1010
    1111%Fields and tolerances to track changes
    12 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ...
    13                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2'};
    14                                            %'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'};
     12field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ...
     13                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2'};
     14                                           %'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'};
    1515field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    1616field_values={...
    … …  
    2424        PatchToVec(md.results.Transient3DSolution(1).Thickness),...
    2525        PatchToVec(md.results.Transient3DSolution(1).Temperature),...
    26         PatchToVec(md.results.Transient3DSolution(1).MeltingRate),...
     26        PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),...
    2727        PatchToVec(md.results.Transient3DSolution(2).Vx),...
    2828        PatchToVec(md.results.Transient3DSolution(2).Vy),...
    … …  
    3434        PatchToVec(md.results.Transient3DSolution(2).Thickness),...
    3535        PatchToVec(md.results.Transient3DSolution(2).Temperature),...
    36         PatchToVec(md.results.Transient3DSolution(2).MeltingRate),...
     36        PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),...
    3737%       PatchToVec(md.results.Transient3DSolution(3).Vx),...
    3838%       PatchToVec(md.results.Transient3DSolution(3).Vy),...
    … …  
    4444%       PatchToVec(md.results.Transient3DSolution(3).Thickness),...
    4545%       PatchToVec(md.results.Transient3DSolution(3).Temperature),...
    46 %       PatchToVec(md.results.Transient3DSolution(3).MeltingRate),...
     46%       PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),...
    4747        };

  • issm/trunk/test/NightlyRun/test348.m

    r8295 r8392  
    1010
    1111%Fields and tolerances to track changes
    12 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ...
    13                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2'};
    14                                            %'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'};
     12field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ...
     13                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2'};
     14                                           %'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'};
    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,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
    … …  
    2626        PatchToVec(md.results.Transient3DSolution(1).Thickness),...
    2727        PatchToVec(md.results.Transient3DSolution(1).Temperature),...
    28         PatchToVec(md.results.Transient3DSolution(1).MeltingRate),...
     28        PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),...
    2929        PatchToVec(md.results.Transient3DSolution(2).Vx),...
    3030        PatchToVec(md.results.Transient3DSolution(2).Vy),...
    … …  
    3636        PatchToVec(md.results.Transient3DSolution(2).Thickness),...
    3737        PatchToVec(md.results.Transient3DSolution(2).Temperature),...
    38         PatchToVec(md.results.Transient3DSolution(2).MeltingRate),...
     38        PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),...
    3939%       PatchToVec(md.results.Transient3DSolution(3).Vx),...
    4040%       PatchToVec(md.results.Transient3DSolution(3).Vy),...
    … …  
    4646%       PatchToVec(md.results.Transient3DSolution(3).Thickness),...
    4747%       PatchToVec(md.results.Transient3DSolution(3).Temperature),...
    48 %       PatchToVec(md.results.Transient3DSolution(3).MeltingRate),...
     48%       PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),...
    4949        };

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

    r8295 r8392  
    99
    1010%Fields and tolerances to track changes
    11 field_names     ={'Temperature','MeltingRate'};
     11field_names     ={'Temperature','BasalMeltingRate'};
    1212field_tolerances={1e-13,1e-13};
    1313field_values={...
    1414        PatchToVec(md.results.ThermalSolution.Temperature),...
    15         PatchToVec(md.results.ThermalSolution.MeltingRate),...
     15        PatchToVec(md.results.ThermalSolution.BasalMeltingRate),...
    1616        };

  • issm/trunk/test/NightlyRun/test412.m

    r8295 r8392  
    99
    1010%Fields and tolerances to track changes
    11 field_names     ={'Temperature','MeltingRate'};
     11field_names     ={'Temperature','BasalMeltingRate'};
    1212field_tolerances={1e-13,1e-13};
    1313field_values={...
    1414        PatchToVec(md.results.ThermalSolution.Temperature),...
    15         PatchToVec(md.results.ThermalSolution.MeltingRate),...
     15        PatchToVec(md.results.ThermalSolution.BasalMeltingRate),...
    1616        };

  • issm/trunk/test/NightlyRun/test413.m

    r8295 r8392  
    88
    99%Fields and tolerances to track changes
    10 field_names     ={'Temperature','MeltingRate'};
     10field_names     ={'Temperature','BasalMeltingRate'};
    1111field_tolerances={1e-13,1e-13};
    1212field_values={...
    1313        PatchToVec(md.results.ThermalSolution.Temperature),...
    14         PatchToVec(md.results.ThermalSolution.MeltingRate),...
     14        PatchToVec(md.results.ThermalSolution.BasalMeltingRate),...
    1515        };

  • issm/trunk/test/NightlyRun/test414.m

    r8295 r8392  
    88
    99%Fields and tolerances to track changes
    10 field_names     ={'Temperature','MeltingRate'};
     10field_names     ={'Temperature','BasalMeltingRate'};
    1111field_tolerances={1e-13,1e-13};
    1212field_values={...
    1313        PatchToVec(md.results.ThermalSolution.Temperature),...
    14         PatchToVec(md.results.ThermalSolution.MeltingRate),...
     14        PatchToVec(md.results.ThermalSolution.BasalMeltingRate),...
    1515        };

  • issm/trunk/test/NightlyRun/test417.m

    r8295 r8392  
    88
    99%Fields and tolerances to track changes
    10 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ...
    11                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ...
    12                                            'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'};
     10field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ...
     11                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ...
     12                                           'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'};
    1313field_tolerances={1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05};
    1414field_values={...
    … …  
    2222        PatchToVec(md.results.Transient3DSolution(1).Thickness),...
    2323        PatchToVec(md.results.Transient3DSolution(1).Temperature),...
    24         PatchToVec(md.results.Transient3DSolution(1).MeltingRate),...
     24        PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),...
    2525        PatchToVec(md.results.Transient3DSolution(2).Vx),...
    2626        PatchToVec(md.results.Transient3DSolution(2).Vy),...
    … …  
    3232        PatchToVec(md.results.Transient3DSolution(2).Thickness),...
    3333        PatchToVec(md.results.Transient3DSolution(2).Temperature),...
    34         PatchToVec(md.results.Transient3DSolution(2).MeltingRate),...
     34        PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),...
    3535        PatchToVec(md.results.Transient3DSolution(3).Vx),...
    3636        PatchToVec(md.results.Transient3DSolution(3).Vy),...
    … …  
    4242        PatchToVec(md.results.Transient3DSolution(3).Thickness),...
    4343        PatchToVec(md.results.Transient3DSolution(3).Temperature),...
    44         PatchToVec(md.results.Transient3DSolution(3).MeltingRate),...
     44        PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),...
    4545        };

  • issm/trunk/test/NightlyRun/test418.m

    r8295 r8392  
    88
    99%Fields and tolerances to track changes
    10 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ...
    11                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ...
    12                                            'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'};
     10field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ...
     11                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ...
     12                                           'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'};
    1313field_tolerances={...
    1414        1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,...
    … …  
    2525        PatchToVec(md.results.Transient3DSolution(1).Thickness),...
    2626        PatchToVec(md.results.Transient3DSolution(1).Temperature),...
    27         PatchToVec(md.results.Transient3DSolution(1).MeltingRate),...
     27        PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),...
    2828        PatchToVec(md.results.Transient3DSolution(2).Vx),...
    2929        PatchToVec(md.results.Transient3DSolution(2).Vy),...
    … …  
    3535        PatchToVec(md.results.Transient3DSolution(2).Thickness),...
    3636        PatchToVec(md.results.Transient3DSolution(2).Temperature),...
    37         PatchToVec(md.results.Transient3DSolution(2).MeltingRate),...
     37        PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),...
    3838        PatchToVec(md.results.Transient3DSolution(3).Vx),...
    3939        PatchToVec(md.results.Transient3DSolution(3).Vy),...
    … …  
    4545        PatchToVec(md.results.Transient3DSolution(3).Thickness),...
    4646        PatchToVec(md.results.Transient3DSolution(3).Temperature),...
    47         PatchToVec(md.results.Transient3DSolution(3).MeltingRate),...
     47        PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),...
    4848        };

  • issm/trunk/test/NightlyRun/test419.m

    r8295 r8392  
    99
    1010%Fields and tolerances to track changes
    11 field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','MeltingRate'};
     11field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalMeltingRate'};
    1212field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13
    1313};
    … …  
    1919        PatchToVec(md.results.SteadystateSolution.Pressure),...
    2020        PatchToVec(md.results.SteadystateSolution.Temperature),...
    21         PatchToVec(md.results.SteadystateSolution.MeltingRate),...
     21        PatchToVec(md.results.SteadystateSolution.BasalMeltingRate),...
    2222        };

  • issm/trunk/test/NightlyRun/test420.m

    r8295 r8392  
    99
    1010%Fields and tolerances to track changes
    11 field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','MeltingRate'};
     11field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalMeltingRate'};
    1212field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13
    1313};
    … …  
    1919        PatchToVec(md.results.SteadystateSolution.Pressure),...
    2020        PatchToVec(md.results.SteadystateSolution.Temperature),...
    21         PatchToVec(md.results.SteadystateSolution.MeltingRate),...
     21        PatchToVec(md.results.SteadystateSolution.BasalMeltingRate),...
    2222        };

  • issm/trunk/test/NightlyRun/test421.m

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

  • issm/trunk/test/NightlyRun/test422.m

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

  • issm/trunk/test/NightlyRun/test429.m

    r8304 r8392  
    2424
    2525%Fields and tolerances to track changes
    26 field_names     ={'Gradient' 'Misfits' 'DragCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'MeltingRate'};
     26field_names     ={'Gradient' 'Misfits' 'DragCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalMeltingRate'};
    2727field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    2828field_values={...
    … …  
    3636        PatchToVec(md.results.SteadystateSolution.Vz),...
    3737        PatchToVec(md.results.SteadystateSolution.Temperature),...
    38         PatchToVec(md.results.SteadystateSolution.MeltingRate)
     38        PatchToVec(md.results.SteadystateSolution.BasalMeltingRate)
    3939};

  • issm/trunk/test/NightlyRun/test430.m

    r8304 r8392  
    2424
    2525%Fields and tolerances to track changes
    26 field_names     ={'Gradient' 'Misfits' 'DragCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'MeltingRate'};
     26field_names     ={'Gradient' 'Misfits' 'DragCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalMeltingRate'};
    2727field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    2828field_values={...
    … …  
    3636        PatchToVec(md.results.SteadystateSolution.Vz),...
    3737        PatchToVec(md.results.SteadystateSolution.Temperature),...
    38         PatchToVec(md.results.SteadystateSolution.MeltingRate)
     38        PatchToVec(md.results.SteadystateSolution.BasalMeltingRate)
    3939};

  • issm/trunk/test/NightlyRun/test431.m

    r8304 r8392  
    2424
    2525%Fields and tolerances to track changes
    26 field_names     ={'Gradient' 'Misfits' 'DragCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'MeltingRate'};
     26field_names     ={'Gradient' 'Misfits' 'DragCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalMeltingRate'};
    2727field_tolerances={1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06};
    2828field_values={...
    … …  
    3636        PatchToVec(md.results.SteadystateSolution.Vz),...
    3737        PatchToVec(md.results.SteadystateSolution.Temperature),...
    38         PatchToVec(md.results.SteadystateSolution.MeltingRate)
     38        PatchToVec(md.results.SteadystateSolution.BasalMeltingRate)
    3939};

  • issm/trunk/test/NightlyRun/test432.m

    r8304 r8392  
    2424
    2525%Fields and tolerances to track changes
    26 field_names     ={'Gradient' 'Misfits' 'DragCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'MeltingRate'};
     26field_names     ={'Gradient' 'Misfits' 'DragCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalMeltingRate'};
    2727field_tolerances={1e-08,1e-07,1e-08,1e-08,1e-08,1e-08,1e-08,1e-07,1e-08,1e-05};
    2828field_values={...
    … …  
    3636        PatchToVec(md.results.SteadystateSolution.Vz),...
    3737        PatchToVec(md.results.SteadystateSolution.Temperature),...
    38         PatchToVec(md.results.SteadystateSolution.MeltingRate)
     38        PatchToVec(md.results.SteadystateSolution.BasalMeltingRate)
    3939};

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

    r8295 r8392  
    88
    99%Fields and tolerances to track changes
    10 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ...
    11                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2'};
     10field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ...
     11                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2'};
    1212field_tolerances={1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12};
    1313field_values={...
    … …  
    2121        PatchToVec(md.results.Transient3DSolution(1).Thickness),...
    2222        PatchToVec(md.results.Transient3DSolution(1).Temperature),...
    23         PatchToVec(md.results.Transient3DSolution(1).MeltingRate),...
     23        PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),...
    2424        PatchToVec(md.results.Transient3DSolution(2).Vx),...
    2525        PatchToVec(md.results.Transient3DSolution(2).Vy),...
    … …  
    3131        PatchToVec(md.results.Transient3DSolution(2).Thickness),...
    3232        PatchToVec(md.results.Transient3DSolution(2).Temperature),...
    33         PatchToVec(md.results.Transient3DSolution(2).MeltingRate),...
     33        PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),...
    3434        };

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

    r8295 r8392  
    88
    99%Fields and tolerances to track changes
    10 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ...
    11                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2'};
     10field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ...
     11                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2'};
    1212field_tolerances={1e-12,1e-12,1e-12,1e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-12,1e-12,1e-12,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    1313field_values={...
    … …  
    2121        PatchToVec(md.results.Transient3DSolution(1).Thickness),...
    2222        PatchToVec(md.results.Transient3DSolution(1).Temperature),...
    23         PatchToVec(md.results.Transient3DSolution(1).MeltingRate),...
     23        PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),...
    2424        PatchToVec(md.results.Transient3DSolution(2).Vx),...
    2525        PatchToVec(md.results.Transient3DSolution(2).Vy),...
    … …  
    3131        PatchToVec(md.results.Transient3DSolution(2).Thickness),...
    3232        PatchToVec(md.results.Transient3DSolution(2).Temperature),...
    33         PatchToVec(md.results.Transient3DSolution(2).MeltingRate),...
     33        PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),...
    3434        };

  • issm/trunk/test/NightlyRun/test511.m

    r8295 r8392  
    88
    99%Fields and tolerances to track changes
    10 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ...
    11                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2'};
     10field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ...
     11                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2'};
    1212field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    1313field_values={...
    … …  
    2121        PatchToVec(md.results.Transient3DSolution(1).Thickness),...
    2222        PatchToVec(md.results.Transient3DSolution(1).Temperature),...
    23         PatchToVec(md.results.Transient3DSolution(1).MeltingRate),...
     23        PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),...
    2424        PatchToVec(md.results.Transient3DSolution(2).Vx),...
    2525        PatchToVec(md.results.Transient3DSolution(2).Vy),...
    … …  
    3131        PatchToVec(md.results.Transient3DSolution(2).Thickness),...
    3232        PatchToVec(md.results.Transient3DSolution(2).Temperature),...
    33         PatchToVec(md.results.Transient3DSolution(2).MeltingRate),...
     33        PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),...
    3434        };

  • issm/trunk/test/NightlyRun/test512.m

    r8295 r8392  
    88
    99%Fields and tolerances to track changes
    10 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ...
    11                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2'};
     10field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ...
     11                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2'};
    1212field_tolerances={1e-10,1e-10,1e-10,1e-10,1e-12,1e-11,1e-12,1e-11,1e-12,1e-12,...
    1313                                                1e-11,1e-11,1e-09,1e-11,1e-11,1e-10,1e-11,1e-10,1e-11,1e-08};
    … …  
    2222        PatchToVec(md.results.Transient3DSolution(1).Thickness),...
    2323        PatchToVec(md.results.Transient3DSolution(1).Temperature),...
    24         PatchToVec(md.results.Transient3DSolution(1).MeltingRate),...
     24        PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),...
    2525        PatchToVec(md.results.Transient3DSolution(2).Vx),...
    2626        PatchToVec(md.results.Transient3DSolution(2).Vy),...
    … …  
    3232        PatchToVec(md.results.Transient3DSolution(2).Thickness),...
    3333        PatchToVec(md.results.Transient3DSolution(2).Temperature),...
    34         PatchToVec(md.results.Transient3DSolution(2).MeltingRate),...
     34        PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),...
    3535        };

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

    r8295 r8392  
    99%Fields and tolerances to track changes
    1010%The thickness wants to be lower than 1 so we contrain it to 1
    11 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ...
    12                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2'};
     11field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ...
     12                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2'};
    1313field_tolerances={1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08};
    1414field_values={...
    … …  
    2222        PatchToVec(md.results.Transient3DSolution(1).Thickness),...
    2323        PatchToVec(md.results.Transient3DSolution(1).Temperature),...
    24         PatchToVec(md.results.Transient3DSolution(1).MeltingRate),...
     24        PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),...
    2525        PatchToVec(md.results.Transient3DSolution(2).Vx),...
    2626        PatchToVec(md.results.Transient3DSolution(2).Vy),...
    … …  
    3232        PatchToVec(md.results.Transient3DSolution(2).Thickness),...
    3333        PatchToVec(md.results.Transient3DSolution(2).Temperature),...
    34         PatchToVec(md.results.Transient3DSolution(2).MeltingRate),...
     34        PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),...
    3535        };

  • issm/trunk/test/NightlyRun/test514.m

    r8295 r8392  
    99%Fields and tolerances to track changes
    1010%The thickness wants to be lower than 1 so we contrain it to 1
    11 field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ...
    12                                       'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2'};
     11field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ...
     12                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2'};
    1313field_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};
    1414field_values={...
    … …  
    2222        PatchToVec(md.results.Transient3DSolution(1).Thickness),...
    2323        PatchToVec(md.results.Transient3DSolution(1).Temperature),...
    24         PatchToVec(md.results.Transient3DSolution(1).MeltingRate),...
     24        PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),...
    2525        PatchToVec(md.results.Transient3DSolution(2).Vx),...
    2626        PatchToVec(md.results.Transient3DSolution(2).Vy),...
    … …  
    3232        PatchToVec(md.results.Transient3DSolution(2).Thickness),...
    3333        PatchToVec(md.results.Transient3DSolution(2).Temperature),...
    34         PatchToVec(md.results.Transient3DSolution(2).MeltingRate),...
     34        PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),...
    3535        };

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

    r8295 r8392  
    99
    1010%Fields and tolerances to track changes
    11 field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','MeltingRate'};
     11field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalMeltingRate'};
    1212field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13
    1313};
    … …  
    1919        PatchToVec(md.results.SteadystateSolution.Pressure),...
    2020        PatchToVec(md.results.SteadystateSolution.Temperature),...
    21         PatchToVec(md.results.SteadystateSolution.MeltingRate),...
     21        PatchToVec(md.results.SteadystateSolution.BasalMeltingRate),...
    2222        };

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

    r8295 r8392  
    99
    1010%Fields and tolerances to track changes
    11 field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','MeltingRate'};
     11field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalMeltingRate'};
    1212field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-08
    1313};
    … …  
    1919        PatchToVec(md.results.SteadystateSolution.Pressure),...
    2020        PatchToVec(md.results.SteadystateSolution.Temperature),...
    21         PatchToVec(md.results.SteadystateSolution.MeltingRate),...
     21        PatchToVec(md.results.SteadystateSolution.BasalMeltingRate),...
    2222        };

  • issm/trunk/test/NightlyRun/test517.m

    r8295 r8392  
    99
    1010%Fields and tolerances to track changes
    11 field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','MeltingRate'};
     11field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalMeltingRate'};
    1212field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13
    1313};
    … …  
    1919        PatchToVec(md.results.SteadystateSolution.Pressure),...
    2020        PatchToVec(md.results.SteadystateSolution.Temperature),...
    21         PatchToVec(md.results.SteadystateSolution.MeltingRate),...
     21        PatchToVec(md.results.SteadystateSolution.BasalMeltingRate),...
    2222        };

  • issm/trunk/test/NightlyRun/test518.m

    r8295 r8392  
    99
    1010%Fields and tolerances to track changes
    11 field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','MeltingRate'};
     11field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalMeltingRate'};
    1212field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06
    1313};
    … …  
    1919        PatchToVec(md.results.SteadystateSolution.Pressure),...
    2020        PatchToVec(md.results.SteadystateSolution.Temperature),...
    21         PatchToVec(md.results.SteadystateSolution.MeltingRate),...
     21        PatchToVec(md.results.SteadystateSolution.BasalMeltingRate),...
    2222        };

  • issm/trunk/test/NightlyRun/test519.m

    r8295 r8392  
    99
    1010%Fields and tolerances to track changes
    11 field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','MeltingRate'};
     11field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalMeltingRate'};
    1212field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06
    1313};
    … …  
    1919        PatchToVec(md.results.SteadystateSolution.Pressure),...
    2020        PatchToVec(md.results.SteadystateSolution.Temperature),...
    21         PatchToVec(md.results.SteadystateSolution.MeltingRate),...
     21        PatchToVec(md.results.SteadystateSolution.BasalMeltingRate),...
    2222        };

  • issm/trunk/test/NightlyRun/test520.m

    r8295 r8392  
    99
    1010%Fields and tolerances to track changes
    11 field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','MeltingRate'};
     11field_names     ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalMeltingRate'};
    1212field_tolerances={1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06
    1313};
    … …  
    1919        PatchToVec(md.results.SteadystateSolution.Pressure),...
    2020        PatchToVec(md.results.SteadystateSolution.Temperature),...
    21         PatchToVec(md.results.SteadystateSolution.MeltingRate),...
     21        PatchToVec(md.results.SteadystateSolution.BasalMeltingRate),...
    2222        };

  • issm/trunk/test/NightlyRun/test525.m

    r8304 r8392  
    2424
    2525%Fields and tolerances to track changes
    26 field_names     ={'Gradient' 'Misfits' 'DragCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'MeltingRate'};
     26field_names     ={'Gradient' 'Misfits' 'DragCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalMeltingRate'};
    2727field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
    2828field_values={...
    … …  
    3636        PatchToVec(md.results.SteadystateSolution.Vz),...
    3737        PatchToVec(md.results.SteadystateSolution.Temperature),...
    38         PatchToVec(md.results.SteadystateSolution.MeltingRate)
     38        PatchToVec(md.results.SteadystateSolution.BasalMeltingRate)
    3939};

  • issm/trunk/test/NightlyRun/test526.m

    r8304 r8392  
    2424
    2525%Fields and tolerances to track changes
    26 field_names     ={'Gradient' 'Misfits' 'DragCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'MeltingRate'};
     26field_names     ={'Gradient' 'Misfits' 'DragCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalMeltingRate'};
    2727field_tolerances={1e-10,1e-10,1e-10,1e-10,1e-6,1e-6,1e-6,1e-6,1e-6,1e-06};
    2828field_values={...
    … …  
    3636        PatchToVec(md.results.SteadystateSolution.Vz),...
    3737        PatchToVec(md.results.SteadystateSolution.Temperature),...
    38         PatchToVec(md.results.SteadystateSolution.MeltingRate)
     38        PatchToVec(md.results.SteadystateSolution.BasalMeltingRate)
    3939};

  • issm/trunk/test/NightlyRun/test529.m

    r8295 r8392  
    88
    99%Fields and tolerances to track changes
    10 field_names     ={'Temperature1','MeltingRate1', ...
    11                                       'Temperature2','MeltingRate2'};
     10field_names     ={'Temperature1','BasalMeltingRate1', ...
     11                                      'Temperature2','BasalMeltingRate2'};
    1212field_tolerances={1e-13,1e-9,1e-13,1e-9};
    1313field_values={...
    1414        PatchToVec(md.results.ThermalSolution(1).Temperature),...
    15         PatchToVec(md.results.ThermalSolution(1).MeltingRate),...
     15        PatchToVec(md.results.ThermalSolution(1).BasalMeltingRate),...
    1616        PatchToVec(md.results.ThermalSolution(2).Temperature),...
    17         PatchToVec(md.results.ThermalSolution(2).MeltingRate),...
     17        PatchToVec(md.results.ThermalSolution(2).BasalMeltingRate),...
    1818        };

  • issm/trunk/test/NightlyRun/test530.m

    r8295 r8392  
    99
    1010%Fields and tolerances to track changes
    11 field_names     ={'Temperature1','MeltingRate1', ...
    12                                       'Temperature2','MeltingRate2'};
     11field_names     ={'Temperature1','BasalMeltingRate1', ...
     12                                      'Temperature2','BasalMeltingRate2'};
    1313field_tolerances={1e-13,1e-8,1e-13,1e-8};
    1414field_values={...
    1515        PatchToVec(md.results.ThermalSolution(1).Temperature),...
    16         PatchToVec(md.results.ThermalSolution(1).MeltingRate),...
     16        PatchToVec(md.results.ThermalSolution(1).BasalMeltingRate),...
    1717        PatchToVec(md.results.ThermalSolution(2).Temperature),...
    18         PatchToVec(md.results.ThermalSolution(2).MeltingRate),...
     18        PatchToVec(md.results.ThermalSolution(2).BasalMeltingRate),...
    1919        };

  • issm/trunk/test/NightlyRun/test531.m

    r8295 r8392  
    1010
    1111%Fields and tolerances to track changes
    12 field_names     ={'Temperature','MeltingRate'};
     12field_names     ={'Temperature','BasalMeltingRate'};
    1313field_tolerances={1e-13,1e-12};
    1414field_values={...
    1515        PatchToVec(md.results.ThermalSolution.Temperature),...
    16         PatchToVec(md.results.ThermalSolution.MeltingRate),...
     16        PatchToVec(md.results.ThermalSolution.BasalMeltingRate),...
    1717        };

  • issm/trunk/test/NightlyRun/test532.m

    r8295 r8392  
    1111
    1212%Fields and tolerances to track changes
    13 field_names     ={'Temperature','MeltingRate'};
     13field_names     ={'Temperature','BasalMeltingRate'};
    1414field_tolerances={1e-11,1e-11};
    1515field_values={...
    1616        PatchToVec(md.results.ThermalSolution.Temperature),...
    17         PatchToVec(md.results.ThermalSolution.MeltingRate),...
     17        PatchToVec(md.results.ThermalSolution.BasalMeltingRate),...
    1818        };

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

    r8368 r8392  
    2424
    2525%Ice shelf melting and accumulation
    26 md.melting_rate=zeros(md.numberofnodes,1);
     26md.basal_melting_rate=zeros(md.numberofnodes,1);
    2727pos=zeros(md.numberofnodes,1);
    2828pos(md.elements(find(md.elementoniceshelf),:))=1;
    29 md.melting_rate(find(pos))=10;
     29md.basal_melting_rate(find(pos))=10;
    3030md.accumulation_rate=15*ones(md.numberofnodes,1);
    3131md.forcings.accumulation_rate=[15*ones(md.numberofnodes,1);1];

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

    r8368 r8392  
    4848md.accumulation_rate=-10*ones(md.numberofnodes,1);
    4949md.forcings.accumulation_rate=[-10*ones(md.numberofnodes,1);1];
    50 md.melting_rate=zeros(md.numberofnodes,1);
    51 pos=find(md.nodeoniceshelf);md.melting_rate(pos)=10;
     50md.basal_melting_rate=zeros(md.numberofnodes,1);
     51pos=find(md.nodeoniceshelf);md.basal_melting_rate(pos)=10;
    5252
    5353%Friction

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

    r8368 r8392  
    2929md.accumulation_rate=0.2*ones(md.numberofnodes,1); %0m/a
    3030md.forcings.accumulation_rate=[0.2*ones(md.numberofnodes,1);1]; %0m/a
    31 md.melting_rate=0*ones(md.numberofnodes,1); %0m/a
     31md.basal_melting_rate=0*ones(md.numberofnodes,1); %0m/a
    3232
    3333disp('      boundary conditions ');

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

    r8368 r8392  
    3030md.accumulation_rate=10*ones(md.numberofnodes,1);
    3131md.forcings.accumulation_rate=[10*ones(md.numberofnodes,1);1];
    32 md.melting_rate=5*ones(md.numberofnodes,1);
     32md.basal_melting_rate=5*ones(md.numberofnodes,1);
    3333
    3434%Friction

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

    r8368 r8392  
    2727md.accumulation_rate=10*ones(md.numberofnodes,1);
    2828md.forcings.accumulation_rate=[10*ones(md.numberofnodes,1);1];
    29 md.melting_rate=5*ones(md.numberofnodes,1);
     29md.basal_melting_rate=5*ones(md.numberofnodes,1);
    3030
    3131%Friction

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

    r8368 r8392  
    3636md.accumulation_rate=ones(md.numberofnodes,1)/md.yts; %1m/a
    3737md.forcings.accumulation_rate=[ones(md.numberofnodes,1)/md.yts;1]; %1m/a
    38 md.melting_rate=0*ones(md.numberofnodes,1)/md.yts; %1m/a
     38md.basal_melting_rate=0*ones(md.numberofnodes,1)/md.yts; %1m/a
    3939
    4040%Deal with boundary conditions:
Note: See TracChangeset for help on using the changeset viewer.