Index: /issm/trunk/examples/Bumps/Bump1_surface_bed/Square.par =================================================================== --- /issm/trunk/examples/Bumps/Bump1_surface_bed/Square.par (revision 8391) +++ /issm/trunk/examples/Bumps/Bump1_surface_bed/Square.par (revision 8392) @@ -21,5 +21,5 @@ md.eps_abs=10; %m/yr md.penalty_offset=4; - md.penalty_melting=10^7; + md.penalty_basal_melting=10^7; if md.numberofgrids<1000000, md.sparsity=.001; @@ -70,5 +70,5 @@ disp(' creating accumulation rates'); md.accumulation_rate=ones(md.numberofgrids,1)/md.yts; %1m/a - md.melting_rate=0*ones(md.numberofgrids,1)/md.yts; %1m/a + md.basal_melting_rate=0*ones(md.numberofgrids,1)/md.yts; %1m/a %Deal with boundary conditions: Index: /issm/trunk/examples/Bumps/Bump1_surface_bed/runme.m =================================================================== --- /issm/trunk/examples/Bumps/Bump1_surface_bed/runme.m (revision 8391) +++ /issm/trunk/examples/Bumps/Bump1_surface_bed/runme.m (revision 8392) @@ -13,5 +13,5 @@ md.vy=PatchToVec(md.results.DiagnosticSolution.Vy); md.accumulation_rate(:)=0; - md.melting_rate(:)=0; + md.basal_melting_rate(:)=0; md.thickness(:)=1; md.bed=md.surface-md.thickness; Index: /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h =================================================================== --- /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h (revision 8391) +++ /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h (revision 8392) @@ -226,5 +226,5 @@ MeltingOffsetEnum, GroundingLineMeltingRateEnum, - MeltingRateEnum, + BasalMeltingRateEnum, MisfitEnum, NodeOnBedEnum, @@ -341,6 +341,6 @@ GravityEnum, ThermalConductivityEnum, - MeltingRateCorrectionEnum, - MeltingRateCorrectionApplyEnum, + BasalMeltingRateCorrectionEnum, + BasalMeltingRateCorrectionApplyEnum, MixedLayerCapacityEnum, ThermalExchangeVelocityEnum, Index: /issm/trunk/src/c/EnumDefinitions/EnumToModelField.cpp =================================================================== --- /issm/trunk/src/c/EnumDefinitions/EnumToModelField.cpp (revision 8391) +++ /issm/trunk/src/c/EnumDefinitions/EnumToModelField.cpp (revision 8392) @@ -24,5 +24,5 @@ case GroundingLineMigrationEnum : return "gl_migration"; case AccumulationRateEnum: return "accumulation_rate"; - case MeltingRateEnum: return "melting_rate"; + case BasalMeltingRateEnum: return "basal_melting_rate"; default : _error_("No model field is associated to enum %s",EnumToStringx(en)); } Index: /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp =================================================================== --- /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 8391) +++ /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 8392) @@ -194,5 +194,5 @@ case MeltingOffsetEnum : return "MeltingOffset"; case GroundingLineMeltingRateEnum : return "GroundingLineMeltingRate"; - case MeltingRateEnum : return "MeltingRate"; + case BasalMeltingRateEnum : return "BasalMeltingRate"; case MisfitEnum : return "Misfit"; case NodeOnBedEnum : return "NodeOnBed"; @@ -295,6 +295,6 @@ case GravityEnum : return "Gravity"; case ThermalConductivityEnum : return "ThermalConductivity"; - case MeltingRateCorrectionEnum : return "MeltingRateCorrection"; - case MeltingRateCorrectionApplyEnum : return "MeltingRateCorrectionApply"; + case BasalMeltingRateCorrectionEnum : return "BasalMeltingRateCorrection"; + case BasalMeltingRateCorrectionApplyEnum : return "BasalMeltingRateCorrectionApply"; case MixedLayerCapacityEnum : return "MixedLayerCapacity"; case ThermalExchangeVelocityEnum : return "ThermalExchangeVelocity"; Index: /issm/trunk/src/c/modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp (revision 8391) +++ /issm/trunk/src/c/modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp (revision 8392) @@ -29,5 +29,5 @@ IoModelFetchData(&iomodel->vx,NULL,NULL,iomodel_handle,"vx"); IoModelFetchData(&iomodel->vy,NULL,NULL,iomodel_handle,"vy"); - IoModelFetchData(&iomodel->melting_rate,NULL,NULL,iomodel_handle,"melting_rate"); + IoModelFetchData(&iomodel->basal_melting_rate,NULL,NULL,iomodel_handle,"basal_melting_rate"); IoModelFetchData(&iomodel->accumulation_rate,NULL,NULL,iomodel_handle,"accumulation_rate"); IoModelFetchData(&iomodel->dhdt,NULL,NULL,iomodel_handle,"dhdt"); @@ -58,5 +58,5 @@ xfree((void**)&iomodel->vx); xfree((void**)&iomodel->vy); - xfree((void**)&iomodel->melting_rate); + xfree((void**)&iomodel->basal_melting_rate); xfree((void**)&iomodel->accumulation_rate); } Index: /issm/trunk/src/c/modules/ModelProcessorx/Balancevelocities/UpdateElementsBalancevelocities.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Balancevelocities/UpdateElementsBalancevelocities.cpp (revision 8391) +++ /issm/trunk/src/c/modules/ModelProcessorx/Balancevelocities/UpdateElementsBalancevelocities.cpp (revision 8392) @@ -29,5 +29,5 @@ IoModelFetchData(&iomodel->vx,NULL,NULL,iomodel_handle,"vx"); IoModelFetchData(&iomodel->vy,NULL,NULL,iomodel_handle,"vy"); - IoModelFetchData(&iomodel->melting_rate,NULL,NULL,iomodel_handle,"melting_rate"); + IoModelFetchData(&iomodel->basal_melting_rate,NULL,NULL,iomodel_handle,"basal_melting_rate"); IoModelFetchData(&iomodel->accumulation_rate,NULL,NULL,iomodel_handle,"accumulation_rate"); @@ -59,5 +59,5 @@ xfree((void**)&iomodel->vy); xfree((void**)&iomodel->vz); - xfree((void**)&iomodel->melting_rate); + xfree((void**)&iomodel->basal_melting_rate); xfree((void**)&iomodel->accumulation_rate); } Index: /issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 8391) +++ /issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 8392) @@ -65,5 +65,5 @@ parameters->AddObject(new DoubleParam(HeatCapacityEnum,iomodel->heatcapacity)); parameters->AddObject(new IntParam(ArtDiffEnum,iomodel->artdiff)); - parameters->AddObject(new IntParam(MeltingRateCorrectionApplyEnum,iomodel->melting_rate_correction_apply)); + parameters->AddObject(new IntParam(BasalMeltingRateCorrectionApplyEnum,iomodel->basal_melting_rate_correction_apply)); parameters->AddObject(new DoubleParam(GroundingLineMeltingRateEnum,iomodel->gl_melting_rate)); parameters->AddObject(new DoubleParam(PenaltyMeltingEnum,iomodel->penalty_melting)); Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp (revision 8391) +++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp (revision 8392) @@ -46,5 +46,5 @@ IoModelFetchData(&iomodel->vz,NULL,NULL,iomodel_handle,"vz"); IoModelFetchData(&iomodel->accumulation_rate,NULL,NULL,iomodel_handle,"accumulation_rate"); - IoModelFetchData(&iomodel->melting_rate,NULL,NULL,iomodel_handle,"melting_rate"); + IoModelFetchData(&iomodel->basal_melting_rate,NULL,NULL,iomodel_handle,"basal_melting_rate"); IoModelFetchData(&iomodel->nodeonstokes,NULL,NULL,iomodel_handle,"nodeonstokes"); } @@ -82,5 +82,5 @@ xfree((void**)&iomodel->elementonwater); xfree((void**)&iomodel->accumulation_rate); - xfree((void**)&iomodel->melting_rate); + xfree((void**)&iomodel->basal_melting_rate); xfree((void**)&iomodel->nodeonstokes); xfree((void**)&iomodel->vx); Index: /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp (revision 8391) +++ /issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp (revision 8392) @@ -33,5 +33,5 @@ IoModelFetchData(&iomodel->elementonsurface,NULL,NULL,iomodel_handle,"elementonsurface"); IoModelFetchData(&iomodel->elementonwater,NULL,NULL,iomodel_handle,"elementonwater"); - IoModelFetchData(&iomodel->melting_rate,NULL,NULL,iomodel_handle,"melting_rate"); + IoModelFetchData(&iomodel->basal_melting_rate,NULL,NULL,iomodel_handle,"basal_melting_rate"); IoModelFetchData(&iomodel->accumulation_rate,NULL,NULL,iomodel_handle,"accumulation_rate"); IoModelFetchData(&iomodel->vx,NULL,NULL,iomodel_handle,"vx"); @@ -59,5 +59,5 @@ xfree((void**)&iomodel->elementonsurface); xfree((void**)&iomodel->elementonwater); - xfree((void**)&iomodel->melting_rate); + xfree((void**)&iomodel->basal_melting_rate); xfree((void**)&iomodel->accumulation_rate); xfree((void**)&iomodel->vx); Index: /issm/trunk/src/c/modules/ModelProcessorx/Hydrology/UpdateElementsHydrology.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Hydrology/UpdateElementsHydrology.cpp (revision 8391) +++ /issm/trunk/src/c/modules/ModelProcessorx/Hydrology/UpdateElementsHydrology.cpp (revision 8392) @@ -37,5 +37,5 @@ IoModelFetchData(&iomodel->pressure,NULL,NULL,iomodel_handle,"pressure"); IoModelFetchData(&iomodel->temperature,NULL,NULL,iomodel_handle,"temperature"); - IoModelFetchData(&iomodel->melting_rate,NULL,NULL,iomodel_handle,"melting_rate"); + IoModelFetchData(&iomodel->basal_melting_rate,NULL,NULL,iomodel_handle,"basal_melting_rate"); IoModelFetchData(&iomodel->watercolumn,NULL,NULL,iomodel_handle,"watercolumn"); IoModelFetchData(&iomodel->geothermalflux,NULL,NULL,iomodel_handle,"geothermalflux"); @@ -73,5 +73,5 @@ xfree((void**)&iomodel->pressure); xfree((void**)&iomodel->temperature); - xfree((void**)&iomodel->melting_rate); + xfree((void**)&iomodel->basal_melting_rate); xfree((void**)&iomodel->watercolumn); xfree((void**)&iomodel->geothermalflux); Index: /issm/trunk/src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp (revision 8391) +++ /issm/trunk/src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp (revision 8392) @@ -39,5 +39,5 @@ IoModelFetchData(&iomodel->rheology_n,NULL,NULL,iomodel_handle,"rheology_n"); IoModelFetchData(&iomodel->accumulation_rate,NULL,NULL,iomodel_handle,"accumulation_rate"); - IoModelFetchData(&iomodel->melting_rate,NULL,NULL,iomodel_handle,"melting_rate"); + IoModelFetchData(&iomodel->basal_melting_rate,NULL,NULL,iomodel_handle,"basal_melting_rate"); IoModelFetchData(&iomodel->pressure,NULL,NULL,iomodel_handle,"pressure"); @@ -69,5 +69,5 @@ xfree((void**)&iomodel->rheology_n); xfree((void**)&iomodel->accumulation_rate); - xfree((void**)&iomodel->melting_rate); + xfree((void**)&iomodel->basal_melting_rate); xfree((void**)&iomodel->pressure); } Index: /issm/trunk/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp (revision 8391) +++ /issm/trunk/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp (revision 8392) @@ -28,6 +28,6 @@ IoModelFetchData(&iomodel->elementonwater,NULL,NULL,iomodel_handle,"elementonwater"); IoModelFetchData(&iomodel->accumulation_rate,NULL,NULL,iomodel_handle,"accumulation_rate"); - IoModelFetchData(&iomodel->melting_rate,NULL,NULL,iomodel_handle,"melting_rate"); - if(iomodel->melting_rate_correction_apply)IoModelFetchData(&iomodel->melting_rate_correction,NULL,NULL,iomodel_handle,"melting_rate_correction"); + IoModelFetchData(&iomodel->basal_melting_rate,NULL,NULL,iomodel_handle,"basal_melting_rate"); + if(iomodel->basal_melting_rate_correction_apply)IoModelFetchData(&iomodel->basal_melting_rate_correction,NULL,NULL,iomodel_handle,"basal_melting_rate_correction"); IoModelFetchData(&iomodel->vx,NULL,NULL,iomodel_handle,"vx"); IoModelFetchData(&iomodel->vy,NULL,NULL,iomodel_handle,"vy"); @@ -60,6 +60,6 @@ xfree((void**)&iomodel->elementonwater); xfree((void**)&iomodel->accumulation_rate); - xfree((void**)&iomodel->melting_rate); - xfree((void**)&iomodel->melting_rate_correction); + xfree((void**)&iomodel->basal_melting_rate); + xfree((void**)&iomodel->basal_melting_rate_correction); xfree((void**)&iomodel->vx); xfree((void**)&iomodel->vy); Index: /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp =================================================================== --- /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 8391) +++ /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 8392) @@ -192,5 +192,5 @@ else if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum; else if (strcmp(name,"GroundingLineMeltingRate")==0) return GroundingLineMeltingRateEnum; - else if (strcmp(name,"MeltingRate")==0) return MeltingRateEnum; + else if (strcmp(name,"BasalMeltingRate")==0) return BasalMeltingRateEnum; else if (strcmp(name,"Misfit")==0) return MisfitEnum; else if (strcmp(name,"NodeOnBed")==0) return NodeOnBedEnum; @@ -293,6 +293,6 @@ else if (strcmp(name,"Gravity")==0) return GravityEnum; else if (strcmp(name,"ThermalConductivity")==0) return ThermalConductivityEnum; - else if (strcmp(name,"MeltingRateCorrection")==0) return MeltingRateCorrectionEnum; - else if (strcmp(name,"MeltingRateCorrectionApply")==0) return MeltingRateCorrectionApplyEnum; + else if (strcmp(name,"BasalMeltingRateCorrection")==0) return BasalMeltingRateCorrectionEnum; + else if (strcmp(name,"BasalMeltingRateCorrectionApply")==0) return BasalMeltingRateCorrectionApplyEnum; else if (strcmp(name,"MixedLayerCapacity")==0) return MixedLayerCapacityEnum; else if (strcmp(name,"ThermalExchangeVelocity")==0) return ThermalExchangeVelocityEnum; Index: /issm/trunk/src/c/objects/Elements/Penta.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Penta.cpp (revision 8391) +++ /issm/trunk/src/c/objects/Elements/Penta.cpp (revision 8392) @@ -4003,7 +4003,7 @@ } - if (iomodel->melting_rate) { - for(i=0;i<6;i++)nodeinputs[i]=iomodel->melting_rate[penta_vertex_ids[i]-1]/iomodel->yts; - this->inputs->AddInput(new PentaVertexInput(MeltingRateEnum,nodeinputs)); + if (iomodel->basal_melting_rate) { + for(i=0;i<6;i++)nodeinputs[i]=iomodel->basal_melting_rate[penta_vertex_ids[i]-1]/iomodel->yts; + this->inputs->AddInput(new PentaVertexInput(BasalMeltingRateEnum,nodeinputs)); } if (iomodel->accumulation_rate) { @@ -4197,5 +4197,5 @@ } else if (analysis_type==MeltingAnalysisEnum){ - InputUpdateFromSolutionOneDof(solution,MeltingRateEnum); + InputUpdateFromSolutionOneDof(solution,BasalMeltingRateEnum); } else{ @@ -5306,5 +5306,5 @@ name==SurfaceSlopeXEnum || name==SurfaceSlopeYEnum || - name==MeltingRateEnum || + name==BasalMeltingRateEnum || name==AccumulationRateEnum || name==GeothermalFluxEnum || Index: /issm/trunk/src/c/objects/Elements/Tria.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Tria.cpp (revision 8391) +++ /issm/trunk/src/c/objects/Elements/Tria.cpp (revision 8392) @@ -1671,5 +1671,5 @@ GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); Input* accumulation_input=inputs->GetInput(AccumulationRateEnum); _assert_(accumulation_input); - Input* melting_input=inputs->GetInput(MeltingRateEnum); _assert_(melting_input); + Input* melting_input=inputs->GetInput(BasalMeltingRateEnum); _assert_(melting_input); Input* dhdt_input=inputs->GetInput(DhDtEnum); _assert_(dhdt_input); @@ -1714,5 +1714,5 @@ GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); Input* accumulation_input=inputs->GetInput(AccumulationRateEnum); _assert_(accumulation_input); - Input* melting_input=inputs->GetInput(MeltingRateEnum); _assert_(melting_input); + Input* melting_input=inputs->GetInput(BasalMeltingRateEnum); _assert_(melting_input); Input* dhdt_input=inputs->GetInput(DhDtEnum); _assert_(dhdt_input); @@ -1757,5 +1757,5 @@ GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); Input* accumulation_input=inputs->GetInput(AccumulationRateEnum); _assert_(accumulation_input); - Input* melting_input=inputs->GetInput(MeltingRateEnum); _assert_(melting_input); + Input* melting_input=inputs->GetInput(BasalMeltingRateEnum); _assert_(melting_input); /* Start looping on the number of gaussian points: */ @@ -1802,5 +1802,5 @@ inputs->GetParameterValue(&approximation,ApproximationEnum); Input* bed_input=inputs->GetInput(BedEnum); _assert_(bed_input); - Input* melting_input=inputs->GetInput(MeltingRateEnum); _assert_(melting_input); + Input* melting_input=inputs->GetInput(BasalMeltingRateEnum); _assert_(melting_input); Input* vx_input=inputs->GetInput(VxEnum); _assert_(vx_input); Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); @@ -2401,5 +2401,5 @@ GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); this->parameters->FindParam(&dt,DtEnum); - Input* melting_input=inputs->GetInput(MeltingRateEnum); _assert_(melting_input); + Input* melting_input=inputs->GetInput(BasalMeltingRateEnum); _assert_(melting_input); Input* old_watercolumn_input=inputs->GetInput(WaterColumnOldEnum);_assert_(old_watercolumn_input); @@ -2447,6 +2447,6 @@ this->parameters->FindParam(&dt,DtEnum); Input* accumulation_input=inputs->GetInput(AccumulationRateEnum); _assert_(accumulation_input); - Input* melting_input=inputs->GetInput(MeltingRateEnum); _assert_(melting_input); - Input* melting_correction_input=inputs->GetInput(MeltingRateCorrectionEnum); + Input* melting_input=inputs->GetInput(BasalMeltingRateEnum); _assert_(melting_input); + Input* melting_correction_input=inputs->GetInput(BasalMeltingRateCorrectionEnum); Input* thickness_input=inputs->GetInput(ThicknessEnum); _assert_(thickness_input); @@ -2495,5 +2495,5 @@ GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); Input* accumulation_input=inputs->GetInput(AccumulationRateEnum); _assert_(accumulation_input); - Input* melting_input=inputs->GetInput(MeltingRateEnum); _assert_(melting_input); + Input* melting_input=inputs->GetInput(BasalMeltingRateEnum); _assert_(melting_input); Input* thickness_input=inputs->GetInput(ThicknessEnum); _assert_(thickness_input); @@ -3872,11 +3872,11 @@ this->inputs->AddInput(new TriaVertexInput(ThicknessObsEnum,nodeinputs)); } - if (iomodel->melting_rate) { - for(i=0;i<3;i++)nodeinputs[i]=iomodel->melting_rate[tria_vertex_ids[i]-1]/iomodel->yts; - this->inputs->AddInput(new TriaVertexInput(MeltingRateEnum,nodeinputs)); - } - if (iomodel->melting_rate_correction) { - for(i=0;i<3;i++)nodeinputs[i]=iomodel->melting_rate_correction[tria_vertex_ids[i]-1]/iomodel->yts; - this->inputs->AddInput(new TriaVertexInput(MeltingRateCorrectionEnum,nodeinputs)); + if (iomodel->basal_melting_rate) { + for(i=0;i<3;i++)nodeinputs[i]=iomodel->basal_melting_rate[tria_vertex_ids[i]-1]/iomodel->yts; + this->inputs->AddInput(new TriaVertexInput(BasalMeltingRateEnum,nodeinputs)); + } + if (iomodel->basal_melting_rate_correction) { + for(i=0;i<3;i++)nodeinputs[i]=iomodel->basal_melting_rate_correction[tria_vertex_ids[i]-1]/iomodel->yts; + this->inputs->AddInput(new TriaVertexInput(BasalMeltingRateCorrectionEnum,nodeinputs)); } if (iomodel->watercolumn){ @@ -4528,5 +4528,5 @@ name==SurfaceSlopeXEnum || name==SurfaceSlopeYEnum || - name==MeltingRateEnum || + name==BasalMeltingRateEnum || name==WaterColumnEnum || name==AccumulationRateEnum || @@ -5148,6 +5148,6 @@ /*If this element just became ungrounded, set its melting rate at 50 m/yr:*/ if(swap){ - Input* melting_rate_input =inputs->GetInput(MeltingRateEnum); _assert_(melting_rate_input); - melting_rate_input->GetValuesPtr(&values,NULL); for(i=0;i<3;i++)values[i]=gl_melting_rate/yts; + Input* basal_melting_rate_input =inputs->GetInput(BasalMeltingRateEnum); _assert_(basal_melting_rate_input); + basal_melting_rate_input->GetValuesPtr(&values,NULL); for(i=0;i<3;i++)values[i]=gl_melting_rate/yts; } Index: /issm/trunk/src/c/objects/IoModel.cpp =================================================================== --- /issm/trunk/src/c/objects/IoModel.cpp (revision 8391) +++ /issm/trunk/src/c/objects/IoModel.cpp (revision 8392) @@ -85,7 +85,7 @@ xfree((void**)&this->edges); xfree((void**)&this->geothermalflux); - xfree((void**)&this->melting_rate); + xfree((void**)&this->basal_melting_rate); xfree((void**)&this->watercolumn); - xfree((void**)&this->melting_rate_correction); + xfree((void**)&this->basal_melting_rate_correction); xfree((void**)&this->accumulation_rate); xfree((void**)&this->forcingtypes); @@ -219,5 +219,5 @@ IoModelFetchData(&this->mixed_layer_capacity,iomodel_handle,"mixed_layer_capacity"); IoModelFetchData(&this->thermal_exchange_velocity,iomodel_handle,"thermal_exchange_velocity"); - IoModelFetchData(&this->melting_rate_correction_apply,iomodel_handle,"melting_rate_correction_apply"); + IoModelFetchData(&this->basal_melting_rate_correction_apply,iomodel_handle,"basal_melting_rate_correction_apply"); IoModelFetchData(&this->gl_melting_rate,iomodel_handle,"gl_melting_rate"); IoModelFetchData(&this->rheology_law,iomodel_handle,"rheology_law"); @@ -285,8 +285,8 @@ this->temperature=NULL; this->gl_melting_rate=0; - this->melting_rate=NULL; + this->basal_melting_rate=NULL; this->watercolumn=NULL; - this->melting_rate_correction=NULL; - this->melting_rate_correction_apply=0; + this->basal_melting_rate_correction=NULL; + this->basal_melting_rate_correction_apply=0; this->geothermalflux=NULL; this->elementonbed=NULL; Index: /issm/trunk/src/c/objects/IoModel.h =================================================================== --- /issm/trunk/src/c/objects/IoModel.h (revision 8391) +++ /issm/trunk/src/c/objects/IoModel.h (revision 8392) @@ -189,9 +189,9 @@ /*basal: */ - double* melting_rate; + double* basal_melting_rate; double* watercolumn; double gl_melting_rate; - double* melting_rate_correction; - int melting_rate_correction_apply; + double* basal_melting_rate_correction; + int basal_melting_rate_correction_apply; double* accumulation_rate; double* dhdt; Index: /issm/trunk/src/c/shared/Numerics/UnitConversion.cpp =================================================================== --- /issm/trunk/src/c/shared/Numerics/UnitConversion.cpp (revision 8391) +++ /issm/trunk/src/c/shared/Numerics/UnitConversion.cpp (revision 8392) @@ -68,5 +68,5 @@ case VelObsEnum: scale=yts;break; //m/yr case DhDtEnum: scale=yts;break; //m/yr - case MeltingRateEnum: scale=yts;break; //m/yr + case BasalMeltingRateEnum: scale=yts;break; //m/yr case AccumulationRateEnum: scale=yts;break; //m/yr case MisfitEnum: scale=pow(yts,2);break; //(m/yr)^2 Index: /issm/trunk/src/c/solutions/steadystate_core.cpp =================================================================== --- /issm/trunk/src/c/solutions/steadystate_core.cpp (revision 8391) +++ /issm/trunk/src/c/solutions/steadystate_core.cpp (revision 8392) @@ -62,5 +62,5 @@ InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,PressureEnum); InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,TemperatureEnum); - InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,MeltingRateEnum); + InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BasalMeltingRateEnum); } } Index: /issm/trunk/src/c/solutions/thermal_core.cpp =================================================================== --- /issm/trunk/src/c/solutions/thermal_core.cpp (revision 8391) +++ /issm/trunk/src/c/solutions/thermal_core.cpp (revision 8392) @@ -50,5 +50,5 @@ _printf_(VerboseSolution()," saving results\n"); InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,TemperatureEnum,i+1,time); - InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,MeltingRateEnum,i+1,time); + InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BasalMeltingRateEnum,i+1,time); } Index: /issm/trunk/src/c/solutions/transient2d_core.cpp =================================================================== --- /issm/trunk/src/c/solutions/transient2d_core.cpp (revision 8391) +++ /issm/trunk/src/c/solutions/transient2d_core.cpp (revision 8392) @@ -87,5 +87,5 @@ InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BedEnum,step,time); InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,AccumulationRateEnum,step,time); - InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,MeltingRateEnum,step,time); + InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BasalMeltingRateEnum,step,time); if(gl_migration!=NoneEnum)InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ElementOnIceShelfEnum,step,time); Index: /issm/trunk/src/c/solutions/transient3d_core.cpp =================================================================== --- /issm/trunk/src/c/solutions/transient3d_core.cpp (revision 8391) +++ /issm/trunk/src/c/solutions/transient3d_core.cpp (revision 8392) @@ -85,5 +85,5 @@ InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BedEnum,step,time); InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,TemperatureEnum,step,time); - InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,MeltingRateEnum,step,time); + InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BasalMeltingRateEnum,step,time); /*unload results*/ Index: /issm/trunk/src/m/classes/model.m =================================================================== --- /issm/trunk/src/m/classes/model.m (revision 8391) +++ /issm/trunk/src/m/classes/model.m (revision 8392) @@ -266,7 +266,7 @@ temperature=NaN; %temperature solution vector gl_melting_rate=NaN; - melting_rate=NaN; - melting_rate_correction=NaN; - melting_rate_correction_apply=0; + basal_melting_rate=NaN; + basal_melting_rate_correction=NaN; + basal_melting_rate_correction_apply=0; pressure=NaN; @@ -425,5 +425,5 @@ if isfield(structmd,'B'), md.rheology_B=structmd.B; end if isfield(structmd,'n'), md.rheology_n=structmd.n; end - if isfield(structmd,'melting'), md.melting_rate=structmd.melting; end + if isfield(structmd,'melting'), md.basal_melting_rate=structmd.melting; end if isfield(structmd,'accumulation'), md.accumulation_rate=structmd.accumulation; end if isfield(structmd,'numberofgrids'), md.numberofnodes=structmd.numberofgrids; end @@ -617,7 +617,7 @@ md.latentheat=3.34*10^5; - %melting rate correction: + %basal melting rate correction: md.gl_melting_rate=0; - md.melting_rate_correction_apply=0; %do not apply + md.basal_melting_rate_correction_apply=0; %do not apply %ice thermal conductivity lamda (W/m/K) Index: /issm/trunk/src/m/enum/EnumToModelField.m =================================================================== --- /issm/trunk/src/m/enum/EnumToModelField.m (revision 8391) +++ /issm/trunk/src/m/enum/EnumToModelField.m (revision 8392) @@ -22,5 +22,5 @@ case GroundingLineMigrationEnum(), string='gl_migration'; return case AccumulationRateEnum(), string='accumulation_rate'; return - case MeltingRateEnum(), string='melting_rate'; return + case BasalMeltingRateEnum(), string='basal_melting_rate'; return otherwise, error(['Enum ' num2str(enum) ' not found associated to any model field']); Index: /issm/trunk/src/m/model/collapse.m =================================================================== --- /issm/trunk/src/m/model/collapse.m (revision 8391) +++ /issm/trunk/src/m/model/collapse.m (revision 8392) @@ -76,5 +76,5 @@ %special for thermal modeling: -md.melting_rate=project2d(md,md.melting_rate,1); +md.basal_melting_rate=project2d(md,md.basal_melting_rate,1); md.observed_temperature=DepthAverage(md,md.observed_temperature); md.geothermalflux=project2d(md,md.geothermalflux,1); %bedrock only gets geothermal flux Index: /issm/trunk/src/m/model/display/displaybc.m =================================================================== --- /issm/trunk/src/m/model/display/displaybc.m (revision 8391) +++ /issm/trunk/src/m/model/display/displaybc.m (revision 8392) @@ -27,3 +27,3 @@ disp(sprintf('\n thermal:')); fielddisplay(md,'spctemperature','constraints flag list (first column) and values (second column)'); -fielddisplay(md,'melting_rate','melting rate [m/a]'); +fielddisplay(md,'basal_melting_rate','basal melting rate [m/a]'); Index: /issm/trunk/src/m/model/display/displaythermal.m =================================================================== --- /issm/trunk/src/m/model/display/displaythermal.m (revision 8391) +++ /issm/trunk/src/m/model/display/displaythermal.m (revision 8392) @@ -17,5 +17,5 @@ disp(sprintf('\n boundary conditions:')); fielddisplay(md,'spctemperature','constraints flag list (first column) and values (second column)'); -fielddisplay(md,'melting_rate','melting rate [m/a]'); +fielddisplay(md,'basal_melting_rate','basal melting rate [m/a]'); disp(sprintf('\n transient:')); Index: /issm/trunk/src/m/model/extrude.m =================================================================== --- /issm/trunk/src/m/model/extrude.m (revision 8391) +++ /issm/trunk/src/m/model/extrude.m (revision 8392) @@ -243,5 +243,5 @@ %special for thermal modeling: -md.melting_rate=project3d(md,md.melting_rate,'node',1); +md.basal_melting_rate=project3d(md,md.basal_melting_rate,'node',1); md.observed_temperature=project3d(md,md.observed_temperature,'node'); if ~isnan(md.geothermalflux) Index: /issm/trunk/src/m/model/ismodelselfconsistent.m =================================================================== --- /issm/trunk/src/m/model/ismodelselfconsistent.m (revision 8391) +++ /issm/trunk/src/m/model/ismodelselfconsistent.m (revision 8392) @@ -92,5 +92,5 @@ %}}} %SIZE NUMBEROFNODES {{{1 -fields={'x','y','z','rheology_B','drag_coefficient','melting_rate','accumulation_rate','surface','thickness','bed','nodeonbed','nodeonsurface'}; +fields={'x','y','z','rheology_B','drag_coefficient','basal_melting_rate','accumulation_rate','surface','thickness','bed','nodeonbed','nodeonsurface'}; checksize(md,fields,[md.numberofnodes 1]); %}}} @@ -505,5 +505,5 @@ %INITIAL TEMPERATURE, MELTING AND ACCUMULATION - fields={'temperature','accumulation_rate','melting_rate'}; + fields={'temperature','accumulation_rate','basal_melting_rate'}; checksize(md,fields,[md.numberofnodes 1]); checknan(md,fields); @@ -521,5 +521,5 @@ % {{{2 %VELOCITIES MELTING AND ACCUMULATION - fields={'vx','vy','accumulation_rate','melting_rate','dhdt'}; + fields={'vx','vy','accumulation_rate','basal_melting_rate','dhdt'}; checksize(md,fields,[md.numberofnodes 1]); checknan(md,fields); @@ -540,5 +540,5 @@ % {{{2 %VELOCITIES MELTING AND ACCUMULATION - fields={'vx','vy','accumulation_rate','melting_rate'}; + fields={'vx','vy','accumulation_rate','basal_melting_rate'}; checksize(md,fields,[md.numberofnodes 1]); checknan(md,fields); Index: /issm/trunk/src/m/model/marshall.m =================================================================== --- /issm/trunk/src/m/model/marshall.m (revision 8391) +++ /issm/trunk/src/m/model/marshall.m (revision 8392) @@ -91,6 +91,6 @@ WriteData(fid,md.accumulation_rate,'Mat','accumulation_rate'); WriteData(fid,md.gl_melting_rate,'Scalar','gl_melting_rate'); -WriteData(fid,md.melting_rate,'Mat','melting_rate'); -WriteData(fid,md.melting_rate_correction_apply,'Integer','melting_rate_correction_apply'); +WriteData(fid,md.basal_melting_rate,'Mat','basal_melting_rate'); +WriteData(fid,md.basal_melting_rate_correction_apply,'Integer','basal_melting_rate_correction_apply'); %deal with forcings @@ -103,6 +103,6 @@ case 'accumulation_rate' forcingtypes(i)=AccumulationRateEnum; - case 'melting_rate' - forcingtypes(i)=MeltingRateEnum; + case 'basal_melting_rate' + forcingtypes(i)=BasalMeltingRateEnum; otherwise error(['forcing ' forcingnames{i} ' not supported yet']); @@ -126,6 +126,6 @@ end -if md.melting_rate_correction_apply, - WriteData(fid,md.melting_rate_correction,'Mat','melting_rate_correction'); +if md.basal_melting_rate_correction_apply, + WriteData(fid,md.basal_melting_rate_correction,'Mat','basal_melting_rate_correction'); end WriteData(fid,md.dhdt,'Mat','dhdt'); Index: /issm/trunk/src/m/model/modeldefault/defaultparams.m =================================================================== --- /issm/trunk/src/m/model/modeldefault/defaultparams.m (revision 8391) +++ /issm/trunk/src/m/model/modeldefault/defaultparams.m (revision 8392) @@ -94,5 +94,5 @@ disp(' thermal model'); - md.melting_rate=zeros(md.numberofnodes,1); + md.basal_melting_rate=zeros(md.numberofnodes,1); md.observed_temperature=md.temperature; Index: /issm/trunk/src/m/model/structtomodel.m =================================================================== --- /issm/trunk/src/m/model/structtomodel.m (revision 8391) +++ /issm/trunk/src/m/model/structtomodel.m (revision 8392) @@ -25,5 +25,5 @@ if isfield(structmd,'B'), md.rheology_B=structmd.B; end if isfield(structmd,'n'), md.rheology_n=structmd.n; end -if isfield(structmd,'melting'), md.melting_rate=structmd.melting; end +if isfield(structmd,'melting'), md.basal_melting_rate=structmd.melting; end if isfield(structmd,'accumulation'), md.accumulation_rate=structmd.accumulation; end if isfield(structmd,'numberofgrids'), md.numberofnodes=structmd.numberofgrids; end Index: /issm/trunk/src/m/model/tres.m =================================================================== --- /issm/trunk/src/m/model/tres.m (revision 8391) +++ /issm/trunk/src/m/model/tres.m (revision 8392) @@ -84,5 +84,5 @@ md.pressure=PatchToVec(md.results.SteadystateSolution.Pressure); md.temperature=PatchToVec(md.results.SteadystateSolution.Temperature); - md.melting_rate=PatchToVec(md.results.SteadystateSolution.MeltingRate); + md.basal_melting_rate=PatchToVec(md.results.SteadystateSolution.BasalMeltingRate); if md.control_analysis==1, @@ -94,5 +94,5 @@ elseif strcmpi(string,'thermal'), md.temperature=PatchToVec(md.results.ThermalSolution.Temperature); - md.melting_rate=PatchToVec(md.results.ThermalSolution.MeltingRate); + md.basal_melting_rate=PatchToVec(md.results.ThermalSolution.BasalMeltingRate); elseif strcmpi(string,'hydrology'), md.watercolumn=PatchToVec(md.results.HydrologySolution.WaterColumn); Index: /issm/trunk/src/m/solutions/steadystate_core.m =================================================================== --- /issm/trunk/src/m/solutions/steadystate_core.m (revision 8391) +++ /issm/trunk/src/m/solutions/steadystate_core.m (revision 8392) @@ -46,5 +46,5 @@ femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,PressureEnum); femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,TemperatureEnum); - femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,MeltingRateEnum); + femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,BasalMeltingRateEnum); end Index: /issm/trunk/src/m/solutions/thermal_core.m =================================================================== --- /issm/trunk/src/m/solutions/thermal_core.m (revision 8391) +++ /issm/trunk/src/m/solutions/thermal_core.m (revision 8392) @@ -31,5 +31,5 @@ issmprintf(VerboseSolution,'\n%s',[' saving results']); femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,TemperatureEnum,i,time); - femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,MeltingRateEnum,i,time); + femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,BasalMeltingRateEnum,i,time); end end Index: /issm/trunk/src/m/solutions/transient3d_core.m =================================================================== --- /issm/trunk/src/m/solutions/transient3d_core.m (revision 8391) +++ /issm/trunk/src/m/solutions/transient3d_core.m (revision 8392) @@ -65,5 +65,5 @@ femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,BedEnum,step,time); femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,TemperatureEnum,step,time); - femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,MeltingRateEnum,step,time); + femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,BasalMeltingRateEnum,step,time); end end Index: /issm/trunk/src/m/utils/BC/SetIceSheetBC.m =================================================================== --- /issm/trunk/src/m/utils/BC/SetIceSheetBC.m (revision 8391) +++ /issm/trunk/src/m/utils/BC/SetIceSheetBC.m (revision 8392) @@ -28,5 +28,5 @@ end -%Create zeros melting_rate and accumulation_rate if not specified +%Create zeros basal_melting_rate and accumulation_rate if not specified if isnan(md.accumulation_rate), md.accumulation_rate=zeros(md.numberofnodes,1); @@ -34,7 +34,7 @@ disp(' no accumulation_rate specified: values set as zero'); end -if isnan(md.melting_rate), - md.melting_rate=zeros(md.numberofnodes,1); - disp(' no melting_rate specified: values set as zero'); +if isnan(md.basal_melting_rate), + md.basal_melting_rate=zeros(md.numberofnodes,1); + disp(' no basal_melting_rate specified: values set as zero'); end if isnan(md.dhdt), Index: /issm/trunk/src/m/utils/BC/SetIceShelfBC.m =================================================================== --- /issm/trunk/src/m/utils/BC/SetIceShelfBC.m (revision 8391) +++ /issm/trunk/src/m/utils/BC/SetIceShelfBC.m (revision 8392) @@ -59,5 +59,5 @@ md.pressureload=pressureload; -%Create zeros melting_rate and accumulation_rate if not specified +%Create zeros basal_melting_rate and accumulation_rate if not specified if isnan(md.accumulation_rate), md.accumulation_rate=zeros(md.numberofnodes,1); @@ -65,7 +65,7 @@ disp(' no accumulation_rate specified: values set as zero'); end -if isnan(md.melting_rate), - md.melting_rate=zeros(md.numberofnodes,1); - disp(' no melting_rate specified: values set as zero'); +if isnan(md.basal_melting_rate), + md.basal_melting_rate=zeros(md.numberofnodes,1); + disp(' no basal_melting_rate specified: values set as zero'); end if isnan(md.dhdt), Index: /issm/trunk/src/m/utils/BC/SetMarineIceSheetBC.m =================================================================== --- /issm/trunk/src/m/utils/BC/SetMarineIceSheetBC.m (revision 8391) +++ /issm/trunk/src/m/utils/BC/SetMarineIceSheetBC.m (revision 8392) @@ -69,5 +69,5 @@ md.pressureload=pressureload; -%Create zeros melting_rate and accumulation_rate if not specified +%Create zeros basal_melting_rate and accumulation_rate if not specified if isnan(md.accumulation_rate), md.accumulation_rate=zeros(md.numberofnodes,1); @@ -75,7 +75,7 @@ disp(' no accumulation_rate specified: values set as zero'); end -if isnan(md.melting_rate), - md.melting_rate=zeros(md.numberofnodes,1); - disp(' no melting_rate specified: values set as zero'); +if isnan(md.basal_melting_rate), + md.basal_melting_rate=zeros(md.numberofnodes,1); + disp(' no basal_melting_rate specified: values set as zero'); end if isnan(md.dhdt), Index: /issm/trunk/test/NightlyRun/test115.m =================================================================== --- /issm/trunk/test/NightlyRun/test115.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test115.m (revision 8392) @@ -9,8 +9,8 @@ %Fields and tolerances to track changes -field_names ={'Temperature','MeltingRate'}; +field_names ={'Temperature','BasalMeltingRate'}; field_tolerances={1e-13,1e-13}; field_values={... PatchToVec(md.results.ThermalSolution.Temperature),... - PatchToVec(md.results.ThermalSolution.MeltingRate),... + PatchToVec(md.results.ThermalSolution.BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test116.m =================================================================== --- /issm/trunk/test/NightlyRun/test116.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test116.m (revision 8392) @@ -9,8 +9,8 @@ %Fields and tolerances to track changes -field_names ={'Temperature','MeltingRate'}; +field_names ={'Temperature','BasalMeltingRate'}; field_tolerances={1e-13,1e-13}; field_values={... PatchToVec(md.results.ThermalSolution.Temperature),... - PatchToVec(md.results.ThermalSolution.MeltingRate),... + PatchToVec(md.results.ThermalSolution.BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test117.m =================================================================== --- /issm/trunk/test/NightlyRun/test117.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test117.m (revision 8392) @@ -8,8 +8,8 @@ %Fields and tolerances to track changes -field_names ={'Temperature','MeltingRate'}; +field_names ={'Temperature','BasalMeltingRate'}; field_tolerances={1e-13,1e-13}; field_values={... PatchToVec(md.results.ThermalSolution.Temperature),... - PatchToVec(md.results.ThermalSolution.MeltingRate),... + PatchToVec(md.results.ThermalSolution.BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test118.m =================================================================== --- /issm/trunk/test/NightlyRun/test118.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test118.m (revision 8392) @@ -8,8 +8,8 @@ %Fields and tolerances to track changes -field_names ={'Temperature','MeltingRate'}; +field_names ={'Temperature','BasalMeltingRate'}; field_tolerances={1e-13,1e-13}; field_values={... PatchToVec(md.results.ThermalSolution.Temperature),... - PatchToVec(md.results.ThermalSolution.MeltingRate),... + PatchToVec(md.results.ThermalSolution.BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test1208.m =================================================================== --- /issm/trunk/test/NightlyRun/test1208.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test1208.m (revision 8392) @@ -26,5 +26,5 @@ %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Thickness','Bed','Surface','Temperature','MeltingRate'}; +field_names ={'Vx','Vy','Vz','Vel','Pressure','Thickness','Bed','Surface','Temperature','BasalMeltingRate'}; field_tolerances={1e-08,1e-08,1e-07,1e-08,1e-08,1e-08,1e-08,1e-08,1e-07,1e-07}; field_values={... @@ -38,4 +38,4 @@ PatchToVec(md.results.Transient3DSolution(end).Surface),... PatchToVec(md.results.Transient3DSolution(end).Temperature),... - PatchToVec(md.results.Transient3DSolution(end).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(end).BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test121.m =================================================================== --- /issm/trunk/test/NightlyRun/test121.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test121.m (revision 8392) @@ -8,7 +8,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; field_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}; field_values={... @@ -22,5 +22,5 @@ PatchToVec(md.results.Transient3DSolution(1).Thickness),... PatchToVec(md.results.Transient3DSolution(1).Temperature),... - PatchToVec(md.results.Transient3DSolution(1).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(2).Vx),... PatchToVec(md.results.Transient3DSolution(2).Vy),... @@ -32,5 +32,5 @@ PatchToVec(md.results.Transient3DSolution(2).Thickness),... PatchToVec(md.results.Transient3DSolution(2).Temperature),... - PatchToVec(md.results.Transient3DSolution(2).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(3).Vx),... PatchToVec(md.results.Transient3DSolution(3).Vy),... @@ -42,4 +42,4 @@ PatchToVec(md.results.Transient3DSolution(3).Thickness),... PatchToVec(md.results.Transient3DSolution(3).Temperature),... - PatchToVec(md.results.Transient3DSolution(3).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test122.m =================================================================== --- /issm/trunk/test/NightlyRun/test122.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test122.m (revision 8392) @@ -8,7 +8,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; field_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}; field_values={... @@ -22,5 +22,5 @@ PatchToVec(md.results.Transient3DSolution(1).Thickness),... PatchToVec(md.results.Transient3DSolution(1).Temperature),... - PatchToVec(md.results.Transient3DSolution(1).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(2).Vx),... PatchToVec(md.results.Transient3DSolution(2).Vy),... @@ -32,5 +32,5 @@ PatchToVec(md.results.Transient3DSolution(2).Thickness),... PatchToVec(md.results.Transient3DSolution(2).Temperature),... - PatchToVec(md.results.Transient3DSolution(2).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(3).Vx),... PatchToVec(md.results.Transient3DSolution(3).Vy),... @@ -42,4 +42,4 @@ PatchToVec(md.results.Transient3DSolution(3).Thickness),... PatchToVec(md.results.Transient3DSolution(3).Temperature),... - PatchToVec(md.results.Transient3DSolution(3).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test1301.m =================================================================== --- /issm/trunk/test/NightlyRun/test1301.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test1301.m (revision 8392) @@ -29,5 +29,5 @@ %plot results comp_melting=zeros(md.numberofnodes,1); -comp_melting(md.results.ThermalSolution.MeltingRate.index)=md.results.ThermalSolution.MeltingRate.value; +comp_melting(md.results.ThermalSolution.BasalMeltingRate.index)=md.results.ThermalSolution.BasalMeltingRate.value; relative=abs((comp_melting-melting)./melting)*100; relative(find(comp_melting==melting))=0; @@ -43,5 +43,5 @@ %Fields and tolerances to track changes -field_names ={'Melting'}; +field_names ={'BasalMelting'}; field_tolerances={1e-13}; field_values ={comp_melting}; Index: /issm/trunk/test/NightlyRun/test211.m =================================================================== --- /issm/trunk/test/NightlyRun/test211.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test211.m (revision 8392) @@ -9,8 +9,8 @@ %Fields and tolerances to track changes -field_names ={'Temperature','MeltingRate'}; +field_names ={'Temperature','BasalMeltingRate'}; field_tolerances={1e-13,1e-13}; field_values={... PatchToVec(md.results.ThermalSolution.Temperature),... - PatchToVec(md.results.ThermalSolution.MeltingRate),... + PatchToVec(md.results.ThermalSolution.BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test212.m =================================================================== --- /issm/trunk/test/NightlyRun/test212.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test212.m (revision 8392) @@ -9,8 +9,8 @@ %Fields and tolerances to track changes -field_names ={'Temperature','MeltingRate'}; +field_names ={'Temperature','BasalMeltingRate'}; field_tolerances={1e-13,1e-13}; field_values={... PatchToVec(md.results.ThermalSolution.Temperature),... - PatchToVec(md.results.ThermalSolution.MeltingRate),... + PatchToVec(md.results.ThermalSolution.BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test213.m =================================================================== --- /issm/trunk/test/NightlyRun/test213.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test213.m (revision 8392) @@ -8,12 +8,12 @@ %Fields and tolerances to track changes -field_names ={'Temperature1','MeltingRate1','Temperature2','MeltingRate2','Temperature3','MeltingRate3'}; +field_names ={'Temperature1','MeltingRate1','Temperature2','BasalMeltingRate2','Temperature3','BasalMeltingRate3'}; field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; field_values={... PatchToVec(md.results.ThermalSolution(1).Temperature),... - PatchToVec(md.results.ThermalSolution(1).MeltingRate),... + PatchToVec(md.results.ThermalSolution(1).BasalMeltingRate),... PatchToVec(md.results.ThermalSolution(2).Temperature),... - PatchToVec(md.results.ThermalSolution(2).MeltingRate),... + PatchToVec(md.results.ThermalSolution(2).BasalMeltingRate),... PatchToVec(md.results.ThermalSolution(3).Temperature),... - PatchToVec(md.results.ThermalSolution(3).MeltingRate),... + PatchToVec(md.results.ThermalSolution(3).BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test214.m =================================================================== --- /issm/trunk/test/NightlyRun/test214.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test214.m (revision 8392) @@ -8,12 +8,12 @@ %Fields and tolerances to track changes -field_names ={'Temperature1','MeltingRate1','Temperature2','MeltingRate2','Temperature3','MeltingRate3'}; +field_names ={'Temperature1','BasalMeltingRate1','Temperature2','BasalMeltingRate2','Temperature3','BasalMeltingRate3'}; field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; field_values={... PatchToVec(md.results.ThermalSolution(1).Temperature),... - PatchToVec(md.results.ThermalSolution(1).MeltingRate),... + PatchToVec(md.results.ThermalSolution(1).BasalMeltingRate),... PatchToVec(md.results.ThermalSolution(2).Temperature),... - PatchToVec(md.results.ThermalSolution(2).MeltingRate),... + PatchToVec(md.results.ThermalSolution(2).BasalMeltingRate),... PatchToVec(md.results.ThermalSolution(3).Temperature),... - PatchToVec(md.results.ThermalSolution(3).MeltingRate),... + PatchToVec(md.results.ThermalSolution(3).BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test217.m =================================================================== --- /issm/trunk/test/NightlyRun/test217.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test217.m (revision 8392) @@ -8,7 +8,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; field_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}; field_values={... @@ -22,5 +22,5 @@ PatchToVec(md.results.Transient3DSolution(1).Thickness),... PatchToVec(md.results.Transient3DSolution(1).Temperature),... - PatchToVec(md.results.Transient3DSolution(1).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(2).Vx),... PatchToVec(md.results.Transient3DSolution(2).Vy),... @@ -32,5 +32,5 @@ PatchToVec(md.results.Transient3DSolution(2).Thickness),... PatchToVec(md.results.Transient3DSolution(2).Temperature),... - PatchToVec(md.results.Transient3DSolution(2).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(3).Vx),... PatchToVec(md.results.Transient3DSolution(3).Vy),... @@ -42,4 +42,4 @@ PatchToVec(md.results.Transient3DSolution(3).Thickness),... PatchToVec(md.results.Transient3DSolution(3).Temperature),... - PatchToVec(md.results.Transient3DSolution(3).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test218.m =================================================================== --- /issm/trunk/test/NightlyRun/test218.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test218.m (revision 8392) @@ -8,7 +8,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; field_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}; field_values={... @@ -22,5 +22,5 @@ PatchToVec(md.results.Transient3DSolution(1).Thickness),... PatchToVec(md.results.Transient3DSolution(1).Temperature),... - PatchToVec(md.results.Transient3DSolution(1).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(2).Vx),... PatchToVec(md.results.Transient3DSolution(2).Vy),... @@ -32,5 +32,5 @@ PatchToVec(md.results.Transient3DSolution(2).Thickness),... PatchToVec(md.results.Transient3DSolution(2).Temperature),... - PatchToVec(md.results.Transient3DSolution(2).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(3).Vx),... PatchToVec(md.results.Transient3DSolution(3).Vy),... @@ -42,4 +42,4 @@ PatchToVec(md.results.Transient3DSolution(3).Thickness),... PatchToVec(md.results.Transient3DSolution(3).Temperature),... - PatchToVec(md.results.Transient3DSolution(3).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test219.m =================================================================== --- /issm/trunk/test/NightlyRun/test219.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test219.m (revision 8392) @@ -8,7 +8,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; field_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}; field_values={... @@ -22,5 +22,5 @@ PatchToVec(md.results.Transient3DSolution(1).Thickness),... PatchToVec(md.results.Transient3DSolution(1).Temperature),... - PatchToVec(md.results.Transient3DSolution(1).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(2).Vx),... PatchToVec(md.results.Transient3DSolution(2).Vy),... @@ -32,5 +32,5 @@ PatchToVec(md.results.Transient3DSolution(2).Thickness),... PatchToVec(md.results.Transient3DSolution(2).Temperature),... - PatchToVec(md.results.Transient3DSolution(2).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(3).Vx),... PatchToVec(md.results.Transient3DSolution(3).Vy),... @@ -42,4 +42,4 @@ PatchToVec(md.results.Transient3DSolution(3).Thickness),... PatchToVec(md.results.Transient3DSolution(3).Temperature),... - PatchToVec(md.results.Transient3DSolution(3).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test220.m =================================================================== --- /issm/trunk/test/NightlyRun/test220.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test220.m (revision 8392) @@ -8,7 +8,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; field_tolerances={... 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,... @@ -25,5 +25,5 @@ PatchToVec(md.results.Transient3DSolution(1).Thickness),... PatchToVec(md.results.Transient3DSolution(1).Temperature),... - PatchToVec(md.results.Transient3DSolution(1).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(2).Vx),... PatchToVec(md.results.Transient3DSolution(2).Vy),... @@ -35,5 +35,5 @@ PatchToVec(md.results.Transient3DSolution(2).Thickness),... PatchToVec(md.results.Transient3DSolution(2).Temperature),... - PatchToVec(md.results.Transient3DSolution(2).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(3).Vx),... PatchToVec(md.results.Transient3DSolution(3).Vy),... @@ -45,4 +45,4 @@ PatchToVec(md.results.Transient3DSolution(3).Thickness),... PatchToVec(md.results.Transient3DSolution(3).Temperature),... - PatchToVec(md.results.Transient3DSolution(3).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test221.m =================================================================== --- /issm/trunk/test/NightlyRun/test221.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test221.m (revision 8392) @@ -9,7 +9,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; field_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}; field_values={... @@ -23,5 +23,5 @@ PatchToVec(md.results.Transient3DSolution(1).Thickness),... PatchToVec(md.results.Transient3DSolution(1).Temperature),... - PatchToVec(md.results.Transient3DSolution(1).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(2).Vx),... PatchToVec(md.results.Transient3DSolution(2).Vy),... @@ -33,5 +33,5 @@ PatchToVec(md.results.Transient3DSolution(2).Thickness),... PatchToVec(md.results.Transient3DSolution(2).Temperature),... - PatchToVec(md.results.Transient3DSolution(2).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(3).Vx),... PatchToVec(md.results.Transient3DSolution(3).Vy),... @@ -43,4 +43,4 @@ PatchToVec(md.results.Transient3DSolution(3).Thickness),... PatchToVec(md.results.Transient3DSolution(3).Temperature),... - PatchToVec(md.results.Transient3DSolution(3).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test222.m =================================================================== --- /issm/trunk/test/NightlyRun/test222.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test222.m (revision 8392) @@ -9,7 +9,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; field_tolerances={... 1e-08,1e-08,1e-06,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,... @@ -26,5 +26,5 @@ PatchToVec(md.results.Transient3DSolution(1).Thickness),... PatchToVec(md.results.Transient3DSolution(1).Temperature),... - PatchToVec(md.results.Transient3DSolution(1).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(2).Vx),... PatchToVec(md.results.Transient3DSolution(2).Vy),... @@ -36,5 +36,5 @@ PatchToVec(md.results.Transient3DSolution(2).Thickness),... PatchToVec(md.results.Transient3DSolution(2).Temperature),... - PatchToVec(md.results.Transient3DSolution(2).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(3).Vx),... PatchToVec(md.results.Transient3DSolution(3).Vy),... @@ -46,4 +46,4 @@ PatchToVec(md.results.Transient3DSolution(3).Thickness),... PatchToVec(md.results.Transient3DSolution(3).Temperature),... - PatchToVec(md.results.Transient3DSolution(3).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test247.m =================================================================== --- /issm/trunk/test/NightlyRun/test247.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test247.m (revision 8392) @@ -9,7 +9,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; field_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}; field_values={... @@ -23,5 +23,5 @@ PatchToVec(md.results.Transient3DSolution(1).Thickness),... PatchToVec(md.results.Transient3DSolution(1).Temperature),... - PatchToVec(md.results.Transient3DSolution(1).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(2).Vx),... PatchToVec(md.results.Transient3DSolution(2).Vy),... @@ -33,5 +33,5 @@ PatchToVec(md.results.Transient3DSolution(2).Thickness),... PatchToVec(md.results.Transient3DSolution(2).Temperature),... - PatchToVec(md.results.Transient3DSolution(2).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(3).Vx),... PatchToVec(md.results.Transient3DSolution(3).Vy),... @@ -43,4 +43,4 @@ PatchToVec(md.results.Transient3DSolution(3).Thickness),... PatchToVec(md.results.Transient3DSolution(3).Temperature),... - PatchToVec(md.results.Transient3DSolution(3).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test248.m =================================================================== --- /issm/trunk/test/NightlyRun/test248.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test248.m (revision 8392) @@ -9,7 +9,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; field_tolerances={... 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,... @@ -26,5 +26,5 @@ PatchToVec(md.results.Transient3DSolution(1).Thickness),... PatchToVec(md.results.Transient3DSolution(1).Temperature),... - PatchToVec(md.results.Transient3DSolution(1).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(2).Vx),... PatchToVec(md.results.Transient3DSolution(2).Vy),... @@ -36,5 +36,5 @@ PatchToVec(md.results.Transient3DSolution(2).Thickness),... PatchToVec(md.results.Transient3DSolution(2).Temperature),... - PatchToVec(md.results.Transient3DSolution(2).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(3).Vx),... PatchToVec(md.results.Transient3DSolution(3).Vy),... @@ -46,4 +46,4 @@ PatchToVec(md.results.Transient3DSolution(3).Thickness),... PatchToVec(md.results.Transient3DSolution(3).Temperature),... - PatchToVec(md.results.Transient3DSolution(3).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test249.m =================================================================== --- /issm/trunk/test/NightlyRun/test249.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test249.m (revision 8392) @@ -10,7 +10,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; field_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}; field_values={... @@ -24,5 +24,5 @@ PatchToVec(md.results.Transient3DSolution(1).Thickness),... PatchToVec(md.results.Transient3DSolution(1).Temperature),... - PatchToVec(md.results.Transient3DSolution(1).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(2).Vx),... PatchToVec(md.results.Transient3DSolution(2).Vy),... @@ -34,5 +34,5 @@ PatchToVec(md.results.Transient3DSolution(2).Thickness),... PatchToVec(md.results.Transient3DSolution(2).Temperature),... - PatchToVec(md.results.Transient3DSolution(2).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(3).Vx),... PatchToVec(md.results.Transient3DSolution(3).Vy),... @@ -44,4 +44,4 @@ PatchToVec(md.results.Transient3DSolution(3).Thickness),... PatchToVec(md.results.Transient3DSolution(3).Temperature),... - PatchToVec(md.results.Transient3DSolution(3).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test250.m =================================================================== --- /issm/trunk/test/NightlyRun/test250.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test250.m (revision 8392) @@ -10,7 +10,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; field_tolerances={... 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05,... @@ -27,5 +27,5 @@ PatchToVec(md.results.Transient3DSolution(1).Thickness),... PatchToVec(md.results.Transient3DSolution(1).Temperature),... - PatchToVec(md.results.Transient3DSolution(1).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(2).Vx),... PatchToVec(md.results.Transient3DSolution(2).Vy),... @@ -37,5 +37,5 @@ PatchToVec(md.results.Transient3DSolution(2).Thickness),... PatchToVec(md.results.Transient3DSolution(2).Temperature),... - PatchToVec(md.results.Transient3DSolution(2).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(3).Vx),... PatchToVec(md.results.Transient3DSolution(3).Vy),... @@ -47,4 +47,4 @@ PatchToVec(md.results.Transient3DSolution(3).Thickness),... PatchToVec(md.results.Transient3DSolution(3).Temperature),... - PatchToVec(md.results.Transient3DSolution(3).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test253.m =================================================================== --- /issm/trunk/test/NightlyRun/test253.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test253.m (revision 8392) @@ -10,7 +10,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; field_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}; field_values={... @@ -24,5 +24,5 @@ PatchToVec(md.results.Transient3DSolution(1).Thickness),... PatchToVec(md.results.Transient3DSolution(1).Temperature),... - PatchToVec(md.results.Transient3DSolution(1).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(2).Vx),... PatchToVec(md.results.Transient3DSolution(2).Vy),... @@ -34,5 +34,5 @@ PatchToVec(md.results.Transient3DSolution(2).Thickness),... PatchToVec(md.results.Transient3DSolution(2).Temperature),... - PatchToVec(md.results.Transient3DSolution(2).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(3).Vx),... PatchToVec(md.results.Transient3DSolution(3).Vy),... @@ -44,4 +44,4 @@ PatchToVec(md.results.Transient3DSolution(3).Thickness),... PatchToVec(md.results.Transient3DSolution(3).Temperature),... - PatchToVec(md.results.Transient3DSolution(3).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test254.m =================================================================== --- /issm/trunk/test/NightlyRun/test254.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test254.m (revision 8392) @@ -10,7 +10,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; field_tolerances={... 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,... @@ -27,5 +27,5 @@ PatchToVec(md.results.Transient3DSolution(1).Thickness),... PatchToVec(md.results.Transient3DSolution(1).Temperature),... - PatchToVec(md.results.Transient3DSolution(1).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(2).Vx),... PatchToVec(md.results.Transient3DSolution(2).Vy),... @@ -37,5 +37,5 @@ PatchToVec(md.results.Transient3DSolution(2).Thickness),... PatchToVec(md.results.Transient3DSolution(2).Temperature),... - PatchToVec(md.results.Transient3DSolution(2).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(3).Vx),... PatchToVec(md.results.Transient3DSolution(3).Vy),... @@ -47,4 +47,4 @@ PatchToVec(md.results.Transient3DSolution(3).Thickness),... PatchToVec(md.results.Transient3DSolution(3).Temperature),... - PatchToVec(md.results.Transient3DSolution(3).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test323.m =================================================================== --- /issm/trunk/test/NightlyRun/test323.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test323.m (revision 8392) @@ -9,8 +9,8 @@ %Fields and tolerances to track changes -field_names ={'Temperature','MeltingRate'}; +field_names ={'Temperature','BasalMeltingRate'}; field_tolerances={1e-13,1e-13}; field_values={... PatchToVec(md.results.ThermalSolution.Temperature),... - PatchToVec(md.results.ThermalSolution.MeltingRate),... + PatchToVec(md.results.ThermalSolution.BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test324.m =================================================================== --- /issm/trunk/test/NightlyRun/test324.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test324.m (revision 8392) @@ -9,8 +9,8 @@ %Fields and tolerances to track changes -field_names ={'Temperature','MeltingRate'}; +field_names ={'Temperature','BasalMeltingRate'}; field_tolerances={1e-13,1e-13}; field_values={... PatchToVec(md.results.ThermalSolution.Temperature),... - PatchToVec(md.results.ThermalSolution.MeltingRate),... + PatchToVec(md.results.ThermalSolution.BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test325.m =================================================================== --- /issm/trunk/test/NightlyRun/test325.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test325.m (revision 8392) @@ -8,8 +8,8 @@ %Fields and tolerances to track changes -field_names ={'Temperature','MeltingRate'}; +field_names ={'Temperature','BasalMeltingRate'}; field_tolerances={1e-13,1e-13}; field_values={... PatchToVec(md.results.ThermalSolution.Temperature),... - PatchToVec(md.results.ThermalSolution.MeltingRate),... + PatchToVec(md.results.ThermalSolution.BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test326.m =================================================================== --- /issm/trunk/test/NightlyRun/test326.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test326.m (revision 8392) @@ -8,8 +8,8 @@ %Fields and tolerances to track changes -field_names ={'Temperature','MeltingRate'}; +field_names ={'Temperature','BasalMeltingRate'}; field_tolerances={1e-13,1e-13}; field_values={... PatchToVec(md.results.ThermalSolution.Temperature),... - PatchToVec(md.results.ThermalSolution.MeltingRate),... + PatchToVec(md.results.ThermalSolution.BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test329.m =================================================================== --- /issm/trunk/test/NightlyRun/test329.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test329.m (revision 8392) @@ -8,7 +8,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; field_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}; field_values={... @@ -22,5 +22,5 @@ PatchToVec(md.results.Transient3DSolution(1).Thickness),... PatchToVec(md.results.Transient3DSolution(1).Temperature),... - PatchToVec(md.results.Transient3DSolution(1).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(2).Vx),... PatchToVec(md.results.Transient3DSolution(2).Vy),... @@ -32,5 +32,5 @@ PatchToVec(md.results.Transient3DSolution(2).Thickness),... PatchToVec(md.results.Transient3DSolution(2).Temperature),... - PatchToVec(md.results.Transient3DSolution(2).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(3).Vx),... PatchToVec(md.results.Transient3DSolution(3).Vy),... @@ -42,4 +42,4 @@ PatchToVec(md.results.Transient3DSolution(3).Thickness),... PatchToVec(md.results.Transient3DSolution(3).Temperature),... - PatchToVec(md.results.Transient3DSolution(3).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test330.m =================================================================== --- /issm/trunk/test/NightlyRun/test330.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test330.m (revision 8392) @@ -8,7 +8,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; field_tolerances={1e-13, 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,..., 5*1e-11,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... @@ -24,5 +24,5 @@ PatchToVec(md.results.Transient3DSolution(1).Thickness),... PatchToVec(md.results.Transient3DSolution(1).Temperature),... - PatchToVec(md.results.Transient3DSolution(1).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(2).Vx),... PatchToVec(md.results.Transient3DSolution(2).Vy),... @@ -34,5 +34,5 @@ PatchToVec(md.results.Transient3DSolution(2).Thickness),... PatchToVec(md.results.Transient3DSolution(2).Temperature),... - PatchToVec(md.results.Transient3DSolution(2).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(3).Vx),... PatchToVec(md.results.Transient3DSolution(3).Vy),... @@ -44,4 +44,4 @@ PatchToVec(md.results.Transient3DSolution(3).Thickness),... PatchToVec(md.results.Transient3DSolution(3).Temperature),... - PatchToVec(md.results.Transient3DSolution(3).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test333.m =================================================================== --- /issm/trunk/test/NightlyRun/test333.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test333.m (revision 8392) @@ -8,7 +8,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; field_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}; field_values={... @@ -22,5 +22,5 @@ PatchToVec(md.results.Transient3DSolution(1).Thickness),... PatchToVec(md.results.Transient3DSolution(1).Temperature),... - PatchToVec(md.results.Transient3DSolution(1).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(2).Vx),... PatchToVec(md.results.Transient3DSolution(2).Vy),... @@ -32,5 +32,5 @@ PatchToVec(md.results.Transient3DSolution(2).Thickness),... PatchToVec(md.results.Transient3DSolution(2).Temperature),... - PatchToVec(md.results.Transient3DSolution(2).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(3).Vx),... PatchToVec(md.results.Transient3DSolution(3).Vy),... @@ -42,4 +42,4 @@ PatchToVec(md.results.Transient3DSolution(3).Thickness),... PatchToVec(md.results.Transient3DSolution(3).Temperature),... - PatchToVec(md.results.Transient3DSolution(3).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test334.m =================================================================== --- /issm/trunk/test/NightlyRun/test334.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test334.m (revision 8392) @@ -8,7 +8,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; field_tolerances={1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... 1e-09,1e-09,1e-10,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,... @@ -24,5 +24,5 @@ PatchToVec(md.results.Transient3DSolution(1).Thickness),... PatchToVec(md.results.Transient3DSolution(1).Temperature),... - PatchToVec(md.results.Transient3DSolution(1).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(2).Vx),... PatchToVec(md.results.Transient3DSolution(2).Vy),... @@ -34,5 +34,5 @@ PatchToVec(md.results.Transient3DSolution(2).Thickness),... PatchToVec(md.results.Transient3DSolution(2).Temperature),... - PatchToVec(md.results.Transient3DSolution(2).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(3).Vx),... PatchToVec(md.results.Transient3DSolution(3).Vy),... @@ -44,4 +44,4 @@ PatchToVec(md.results.Transient3DSolution(3).Thickness),... PatchToVec(md.results.Transient3DSolution(3).Temperature),... - PatchToVec(md.results.Transient3DSolution(3).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test335.m =================================================================== --- /issm/trunk/test/NightlyRun/test335.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test335.m (revision 8392) @@ -9,5 +9,6 @@ %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','MeltingRate'}; +field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalMeltingRate'}; + field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13 }; @@ -19,4 +20,4 @@ PatchToVec(md.results.SteadystateSolution.Pressure),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.MeltingRate),... + PatchToVec(md.results.SteadystateSolution.BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test336.m =================================================================== --- /issm/trunk/test/NightlyRun/test336.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test336.m (revision 8392) @@ -9,5 +9,5 @@ %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','MeltingRate'}; +field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalMeltingRate'}; field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13 }; @@ -19,4 +19,4 @@ PatchToVec(md.results.SteadystateSolution.Pressure),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.MeltingRate),... + PatchToVec(md.results.SteadystateSolution.BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test347.m =================================================================== --- /issm/trunk/test/NightlyRun/test347.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test347.m (revision 8392) @@ -10,7 +10,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2'}; - %'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2'}; + %'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; field_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}; field_values={... @@ -24,5 +24,5 @@ PatchToVec(md.results.Transient3DSolution(1).Thickness),... PatchToVec(md.results.Transient3DSolution(1).Temperature),... - PatchToVec(md.results.Transient3DSolution(1).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(2).Vx),... PatchToVec(md.results.Transient3DSolution(2).Vy),... @@ -34,5 +34,5 @@ PatchToVec(md.results.Transient3DSolution(2).Thickness),... PatchToVec(md.results.Transient3DSolution(2).Temperature),... - PatchToVec(md.results.Transient3DSolution(2).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),... % PatchToVec(md.results.Transient3DSolution(3).Vx),... % PatchToVec(md.results.Transient3DSolution(3).Vy),... @@ -44,4 +44,4 @@ % PatchToVec(md.results.Transient3DSolution(3).Thickness),... % PatchToVec(md.results.Transient3DSolution(3).Temperature),... -% PatchToVec(md.results.Transient3DSolution(3).MeltingRate),... +% PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test348.m =================================================================== --- /issm/trunk/test/NightlyRun/test348.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test348.m (revision 8392) @@ -10,7 +10,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2'}; - %'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2'}; + %'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; field_tolerances={1e-13, 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,..., 5*1e-11,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,... @@ -26,5 +26,5 @@ PatchToVec(md.results.Transient3DSolution(1).Thickness),... PatchToVec(md.results.Transient3DSolution(1).Temperature),... - PatchToVec(md.results.Transient3DSolution(1).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(2).Vx),... PatchToVec(md.results.Transient3DSolution(2).Vy),... @@ -36,5 +36,5 @@ PatchToVec(md.results.Transient3DSolution(2).Thickness),... PatchToVec(md.results.Transient3DSolution(2).Temperature),... - PatchToVec(md.results.Transient3DSolution(2).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),... % PatchToVec(md.results.Transient3DSolution(3).Vx),... % PatchToVec(md.results.Transient3DSolution(3).Vy),... @@ -46,4 +46,4 @@ % PatchToVec(md.results.Transient3DSolution(3).Thickness),... % PatchToVec(md.results.Transient3DSolution(3).Temperature),... -% PatchToVec(md.results.Transient3DSolution(3).MeltingRate),... +% PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test411.m =================================================================== --- /issm/trunk/test/NightlyRun/test411.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test411.m (revision 8392) @@ -9,8 +9,8 @@ %Fields and tolerances to track changes -field_names ={'Temperature','MeltingRate'}; +field_names ={'Temperature','BasalMeltingRate'}; field_tolerances={1e-13,1e-13}; field_values={... PatchToVec(md.results.ThermalSolution.Temperature),... - PatchToVec(md.results.ThermalSolution.MeltingRate),... + PatchToVec(md.results.ThermalSolution.BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test412.m =================================================================== --- /issm/trunk/test/NightlyRun/test412.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test412.m (revision 8392) @@ -9,8 +9,8 @@ %Fields and tolerances to track changes -field_names ={'Temperature','MeltingRate'}; +field_names ={'Temperature','BasalMeltingRate'}; field_tolerances={1e-13,1e-13}; field_values={... PatchToVec(md.results.ThermalSolution.Temperature),... - PatchToVec(md.results.ThermalSolution.MeltingRate),... + PatchToVec(md.results.ThermalSolution.BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test413.m =================================================================== --- /issm/trunk/test/NightlyRun/test413.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test413.m (revision 8392) @@ -8,8 +8,8 @@ %Fields and tolerances to track changes -field_names ={'Temperature','MeltingRate'}; +field_names ={'Temperature','BasalMeltingRate'}; field_tolerances={1e-13,1e-13}; field_values={... PatchToVec(md.results.ThermalSolution.Temperature),... - PatchToVec(md.results.ThermalSolution.MeltingRate),... + PatchToVec(md.results.ThermalSolution.BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test414.m =================================================================== --- /issm/trunk/test/NightlyRun/test414.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test414.m (revision 8392) @@ -8,8 +8,8 @@ %Fields and tolerances to track changes -field_names ={'Temperature','MeltingRate'}; +field_names ={'Temperature','BasalMeltingRate'}; field_tolerances={1e-13,1e-13}; field_values={... PatchToVec(md.results.ThermalSolution.Temperature),... - PatchToVec(md.results.ThermalSolution.MeltingRate),... + PatchToVec(md.results.ThermalSolution.BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test417.m =================================================================== --- /issm/trunk/test/NightlyRun/test417.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test417.m (revision 8392) @@ -8,7 +8,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; field_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}; field_values={... @@ -22,5 +22,5 @@ PatchToVec(md.results.Transient3DSolution(1).Thickness),... PatchToVec(md.results.Transient3DSolution(1).Temperature),... - PatchToVec(md.results.Transient3DSolution(1).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(2).Vx),... PatchToVec(md.results.Transient3DSolution(2).Vy),... @@ -32,5 +32,5 @@ PatchToVec(md.results.Transient3DSolution(2).Thickness),... PatchToVec(md.results.Transient3DSolution(2).Temperature),... - PatchToVec(md.results.Transient3DSolution(2).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(3).Vx),... PatchToVec(md.results.Transient3DSolution(3).Vy),... @@ -42,4 +42,4 @@ PatchToVec(md.results.Transient3DSolution(3).Thickness),... PatchToVec(md.results.Transient3DSolution(3).Temperature),... - PatchToVec(md.results.Transient3DSolution(3).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test418.m =================================================================== --- /issm/trunk/test/NightlyRun/test418.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test418.m (revision 8392) @@ -8,7 +8,7 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2', ... - 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','MeltingRate3'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2', ... + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalMeltingRate3'}; field_tolerances={... 1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,1e-05,... @@ -25,5 +25,5 @@ PatchToVec(md.results.Transient3DSolution(1).Thickness),... PatchToVec(md.results.Transient3DSolution(1).Temperature),... - PatchToVec(md.results.Transient3DSolution(1).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(2).Vx),... PatchToVec(md.results.Transient3DSolution(2).Vy),... @@ -35,5 +35,5 @@ PatchToVec(md.results.Transient3DSolution(2).Thickness),... PatchToVec(md.results.Transient3DSolution(2).Temperature),... - PatchToVec(md.results.Transient3DSolution(2).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(3).Vx),... PatchToVec(md.results.Transient3DSolution(3).Vy),... @@ -45,4 +45,4 @@ PatchToVec(md.results.Transient3DSolution(3).Thickness),... PatchToVec(md.results.Transient3DSolution(3).Temperature),... - PatchToVec(md.results.Transient3DSolution(3).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(3).BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test419.m =================================================================== --- /issm/trunk/test/NightlyRun/test419.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test419.m (revision 8392) @@ -9,5 +9,5 @@ %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','MeltingRate'}; +field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalMeltingRate'}; field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13 }; @@ -19,4 +19,4 @@ PatchToVec(md.results.SteadystateSolution.Pressure),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.MeltingRate),... + PatchToVec(md.results.SteadystateSolution.BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test420.m =================================================================== --- /issm/trunk/test/NightlyRun/test420.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test420.m (revision 8392) @@ -9,5 +9,5 @@ %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','MeltingRate'}; +field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalMeltingRate'}; field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13 }; @@ -19,4 +19,4 @@ PatchToVec(md.results.SteadystateSolution.Pressure),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.MeltingRate),... + PatchToVec(md.results.SteadystateSolution.BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test421.m =================================================================== --- /issm/trunk/test/NightlyRun/test421.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test421.m (revision 8392) @@ -9,5 +9,5 @@ %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','MeltingRate'}; +field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalMeltingRate'}; field_tolerances={1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06}; field_values={... @@ -18,4 +18,4 @@ PatchToVec(md.results.SteadystateSolution.Pressure),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.MeltingRate),... + PatchToVec(md.results.SteadystateSolution.BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test422.m =================================================================== --- /issm/trunk/test/NightlyRun/test422.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test422.m (revision 8392) @@ -9,5 +9,5 @@ %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','MeltingRate'}; +field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalMeltingRate'}; field_tolerances={1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-05 }; @@ -19,4 +19,4 @@ PatchToVec(md.results.SteadystateSolution.Pressure),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.MeltingRate),... + PatchToVec(md.results.SteadystateSolution.BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test429.m =================================================================== --- /issm/trunk/test/NightlyRun/test429.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test429.m (revision 8392) @@ -24,5 +24,5 @@ %Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'DragCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'MeltingRate'}; +field_names ={'Gradient' 'Misfits' 'DragCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalMeltingRate'}; field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; field_values={... @@ -36,4 +36,4 @@ PatchToVec(md.results.SteadystateSolution.Vz),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.MeltingRate) + PatchToVec(md.results.SteadystateSolution.BasalMeltingRate) }; Index: /issm/trunk/test/NightlyRun/test430.m =================================================================== --- /issm/trunk/test/NightlyRun/test430.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test430.m (revision 8392) @@ -24,5 +24,5 @@ %Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'DragCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'MeltingRate'}; +field_names ={'Gradient' 'Misfits' 'DragCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalMeltingRate'}; field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; field_values={... @@ -36,4 +36,4 @@ PatchToVec(md.results.SteadystateSolution.Vz),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.MeltingRate) + PatchToVec(md.results.SteadystateSolution.BasalMeltingRate) }; Index: /issm/trunk/test/NightlyRun/test431.m =================================================================== --- /issm/trunk/test/NightlyRun/test431.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test431.m (revision 8392) @@ -24,5 +24,5 @@ %Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'DragCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'MeltingRate'}; +field_names ={'Gradient' 'Misfits' 'DragCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalMeltingRate'}; field_tolerances={1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06}; field_values={... @@ -36,4 +36,4 @@ PatchToVec(md.results.SteadystateSolution.Vz),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.MeltingRate) + PatchToVec(md.results.SteadystateSolution.BasalMeltingRate) }; Index: /issm/trunk/test/NightlyRun/test432.m =================================================================== --- /issm/trunk/test/NightlyRun/test432.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test432.m (revision 8392) @@ -24,5 +24,5 @@ %Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'DragCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'MeltingRate'}; +field_names ={'Gradient' 'Misfits' 'DragCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalMeltingRate'}; field_tolerances={1e-08,1e-07,1e-08,1e-08,1e-08,1e-08,1e-08,1e-07,1e-08,1e-05}; field_values={... @@ -36,4 +36,4 @@ PatchToVec(md.results.SteadystateSolution.Vz),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.MeltingRate) + PatchToVec(md.results.SteadystateSolution.BasalMeltingRate) }; Index: /issm/trunk/test/NightlyRun/test509.m =================================================================== --- /issm/trunk/test/NightlyRun/test509.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test509.m (revision 8392) @@ -8,6 +8,6 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2'}; field_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}; field_values={... @@ -21,5 +21,5 @@ PatchToVec(md.results.Transient3DSolution(1).Thickness),... PatchToVec(md.results.Transient3DSolution(1).Temperature),... - PatchToVec(md.results.Transient3DSolution(1).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(2).Vx),... PatchToVec(md.results.Transient3DSolution(2).Vy),... @@ -31,4 +31,4 @@ PatchToVec(md.results.Transient3DSolution(2).Thickness),... PatchToVec(md.results.Transient3DSolution(2).Temperature),... - PatchToVec(md.results.Transient3DSolution(2).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test510.m =================================================================== --- /issm/trunk/test/NightlyRun/test510.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test510.m (revision 8392) @@ -8,6 +8,6 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2'}; field_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}; field_values={... @@ -21,5 +21,5 @@ PatchToVec(md.results.Transient3DSolution(1).Thickness),... PatchToVec(md.results.Transient3DSolution(1).Temperature),... - PatchToVec(md.results.Transient3DSolution(1).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(2).Vx),... PatchToVec(md.results.Transient3DSolution(2).Vy),... @@ -31,4 +31,4 @@ PatchToVec(md.results.Transient3DSolution(2).Thickness),... PatchToVec(md.results.Transient3DSolution(2).Temperature),... - PatchToVec(md.results.Transient3DSolution(2).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test511.m =================================================================== --- /issm/trunk/test/NightlyRun/test511.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test511.m (revision 8392) @@ -8,6 +8,6 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2'}; field_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}; field_values={... @@ -21,5 +21,5 @@ PatchToVec(md.results.Transient3DSolution(1).Thickness),... PatchToVec(md.results.Transient3DSolution(1).Temperature),... - PatchToVec(md.results.Transient3DSolution(1).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(2).Vx),... PatchToVec(md.results.Transient3DSolution(2).Vy),... @@ -31,4 +31,4 @@ PatchToVec(md.results.Transient3DSolution(2).Thickness),... PatchToVec(md.results.Transient3DSolution(2).Temperature),... - PatchToVec(md.results.Transient3DSolution(2).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test512.m =================================================================== --- /issm/trunk/test/NightlyRun/test512.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test512.m (revision 8392) @@ -8,6 +8,6 @@ %Fields and tolerances to track changes -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2'}; field_tolerances={1e-10,1e-10,1e-10,1e-10,1e-12,1e-11,1e-12,1e-11,1e-12,1e-12,... 1e-11,1e-11,1e-09,1e-11,1e-11,1e-10,1e-11,1e-10,1e-11,1e-08}; @@ -22,5 +22,5 @@ PatchToVec(md.results.Transient3DSolution(1).Thickness),... PatchToVec(md.results.Transient3DSolution(1).Temperature),... - PatchToVec(md.results.Transient3DSolution(1).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(2).Vx),... PatchToVec(md.results.Transient3DSolution(2).Vy),... @@ -32,4 +32,4 @@ PatchToVec(md.results.Transient3DSolution(2).Thickness),... PatchToVec(md.results.Transient3DSolution(2).Temperature),... - PatchToVec(md.results.Transient3DSolution(2).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test513.m =================================================================== --- /issm/trunk/test/NightlyRun/test513.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test513.m (revision 8392) @@ -9,6 +9,6 @@ %Fields and tolerances to track changes %The thickness wants to be lower than 1 so we contrain it to 1 -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2'}; field_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}; field_values={... @@ -22,5 +22,5 @@ PatchToVec(md.results.Transient3DSolution(1).Thickness),... PatchToVec(md.results.Transient3DSolution(1).Temperature),... - PatchToVec(md.results.Transient3DSolution(1).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(2).Vx),... PatchToVec(md.results.Transient3DSolution(2).Vy),... @@ -32,4 +32,4 @@ PatchToVec(md.results.Transient3DSolution(2).Thickness),... PatchToVec(md.results.Transient3DSolution(2).Temperature),... - PatchToVec(md.results.Transient3DSolution(2).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test514.m =================================================================== --- /issm/trunk/test/NightlyRun/test514.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test514.m (revision 8392) @@ -9,6 +9,6 @@ %Fields and tolerances to track changes %The thickness wants to be lower than 1 so we contrain it to 1 -field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','MeltingRate1', ... - 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','MeltingRate2'}; +field_names ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalMeltingRate1', ... + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalMeltingRate2'}; field_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}; field_values={... @@ -22,5 +22,5 @@ PatchToVec(md.results.Transient3DSolution(1).Thickness),... PatchToVec(md.results.Transient3DSolution(1).Temperature),... - PatchToVec(md.results.Transient3DSolution(1).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(1).BasalMeltingRate),... PatchToVec(md.results.Transient3DSolution(2).Vx),... PatchToVec(md.results.Transient3DSolution(2).Vy),... @@ -32,4 +32,4 @@ PatchToVec(md.results.Transient3DSolution(2).Thickness),... PatchToVec(md.results.Transient3DSolution(2).Temperature),... - PatchToVec(md.results.Transient3DSolution(2).MeltingRate),... + PatchToVec(md.results.Transient3DSolution(2).BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test515.m =================================================================== --- /issm/trunk/test/NightlyRun/test515.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test515.m (revision 8392) @@ -9,5 +9,5 @@ %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','MeltingRate'}; +field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalMeltingRate'}; field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13 }; @@ -19,4 +19,4 @@ PatchToVec(md.results.SteadystateSolution.Pressure),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.MeltingRate),... + PatchToVec(md.results.SteadystateSolution.BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test516.m =================================================================== --- /issm/trunk/test/NightlyRun/test516.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test516.m (revision 8392) @@ -9,5 +9,5 @@ %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','MeltingRate'}; +field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalMeltingRate'}; field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-08 }; @@ -19,4 +19,4 @@ PatchToVec(md.results.SteadystateSolution.Pressure),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.MeltingRate),... + PatchToVec(md.results.SteadystateSolution.BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test517.m =================================================================== --- /issm/trunk/test/NightlyRun/test517.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test517.m (revision 8392) @@ -9,5 +9,5 @@ %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','MeltingRate'}; +field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalMeltingRate'}; field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13 }; @@ -19,4 +19,4 @@ PatchToVec(md.results.SteadystateSolution.Pressure),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.MeltingRate),... + PatchToVec(md.results.SteadystateSolution.BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test518.m =================================================================== --- /issm/trunk/test/NightlyRun/test518.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test518.m (revision 8392) @@ -9,5 +9,5 @@ %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','MeltingRate'}; +field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalMeltingRate'}; field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06 }; @@ -19,4 +19,4 @@ PatchToVec(md.results.SteadystateSolution.Pressure),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.MeltingRate),... + PatchToVec(md.results.SteadystateSolution.BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test519.m =================================================================== --- /issm/trunk/test/NightlyRun/test519.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test519.m (revision 8392) @@ -9,5 +9,5 @@ %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','MeltingRate'}; +field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalMeltingRate'}; field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06 }; @@ -19,4 +19,4 @@ PatchToVec(md.results.SteadystateSolution.Pressure),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.MeltingRate),... + PatchToVec(md.results.SteadystateSolution.BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test520.m =================================================================== --- /issm/trunk/test/NightlyRun/test520.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test520.m (revision 8392) @@ -9,5 +9,5 @@ %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','MeltingRate'}; +field_names ={'Vx','Vy','Vz','Vel','Pressure','Temperature','BasalMeltingRate'}; field_tolerances={1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06 }; @@ -19,4 +19,4 @@ PatchToVec(md.results.SteadystateSolution.Pressure),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.MeltingRate),... + PatchToVec(md.results.SteadystateSolution.BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test525.m =================================================================== --- /issm/trunk/test/NightlyRun/test525.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test525.m (revision 8392) @@ -24,5 +24,5 @@ %Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'DragCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'MeltingRate'}; +field_names ={'Gradient' 'Misfits' 'DragCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalMeltingRate'}; field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; field_values={... @@ -36,4 +36,4 @@ PatchToVec(md.results.SteadystateSolution.Vz),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.MeltingRate) + PatchToVec(md.results.SteadystateSolution.BasalMeltingRate) }; Index: /issm/trunk/test/NightlyRun/test526.m =================================================================== --- /issm/trunk/test/NightlyRun/test526.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test526.m (revision 8392) @@ -24,5 +24,5 @@ %Fields and tolerances to track changes -field_names ={'Gradient' 'Misfits' 'DragCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'MeltingRate'}; +field_names ={'Gradient' 'Misfits' 'DragCoefficient' 'Pressure' 'Vel' 'Vx' 'Vy' 'Vz' 'Temperature' 'BasalMeltingRate'}; field_tolerances={1e-10,1e-10,1e-10,1e-10,1e-6,1e-6,1e-6,1e-6,1e-6,1e-06}; field_values={... @@ -36,4 +36,4 @@ PatchToVec(md.results.SteadystateSolution.Vz),... PatchToVec(md.results.SteadystateSolution.Temperature),... - PatchToVec(md.results.SteadystateSolution.MeltingRate) + PatchToVec(md.results.SteadystateSolution.BasalMeltingRate) }; Index: /issm/trunk/test/NightlyRun/test529.m =================================================================== --- /issm/trunk/test/NightlyRun/test529.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test529.m (revision 8392) @@ -8,11 +8,11 @@ %Fields and tolerances to track changes -field_names ={'Temperature1','MeltingRate1', ... - 'Temperature2','MeltingRate2'}; +field_names ={'Temperature1','BasalMeltingRate1', ... + 'Temperature2','BasalMeltingRate2'}; field_tolerances={1e-13,1e-9,1e-13,1e-9}; field_values={... PatchToVec(md.results.ThermalSolution(1).Temperature),... - PatchToVec(md.results.ThermalSolution(1).MeltingRate),... + PatchToVec(md.results.ThermalSolution(1).BasalMeltingRate),... PatchToVec(md.results.ThermalSolution(2).Temperature),... - PatchToVec(md.results.ThermalSolution(2).MeltingRate),... + PatchToVec(md.results.ThermalSolution(2).BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test530.m =================================================================== --- /issm/trunk/test/NightlyRun/test530.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test530.m (revision 8392) @@ -9,11 +9,11 @@ %Fields and tolerances to track changes -field_names ={'Temperature1','MeltingRate1', ... - 'Temperature2','MeltingRate2'}; +field_names ={'Temperature1','BasalMeltingRate1', ... + 'Temperature2','BasalMeltingRate2'}; field_tolerances={1e-13,1e-8,1e-13,1e-8}; field_values={... PatchToVec(md.results.ThermalSolution(1).Temperature),... - PatchToVec(md.results.ThermalSolution(1).MeltingRate),... + PatchToVec(md.results.ThermalSolution(1).BasalMeltingRate),... PatchToVec(md.results.ThermalSolution(2).Temperature),... - PatchToVec(md.results.ThermalSolution(2).MeltingRate),... + PatchToVec(md.results.ThermalSolution(2).BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test531.m =================================================================== --- /issm/trunk/test/NightlyRun/test531.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test531.m (revision 8392) @@ -10,8 +10,8 @@ %Fields and tolerances to track changes -field_names ={'Temperature','MeltingRate'}; +field_names ={'Temperature','BasalMeltingRate'}; field_tolerances={1e-13,1e-12}; field_values={... PatchToVec(md.results.ThermalSolution.Temperature),... - PatchToVec(md.results.ThermalSolution.MeltingRate),... + PatchToVec(md.results.ThermalSolution.BasalMeltingRate),... }; Index: /issm/trunk/test/NightlyRun/test532.m =================================================================== --- /issm/trunk/test/NightlyRun/test532.m (revision 8391) +++ /issm/trunk/test/NightlyRun/test532.m (revision 8392) @@ -11,8 +11,8 @@ %Fields and tolerances to track changes -field_names ={'Temperature','MeltingRate'}; +field_names ={'Temperature','BasalMeltingRate'}; field_tolerances={1e-11,1e-11}; field_values={... PatchToVec(md.results.ThermalSolution.Temperature),... - PatchToVec(md.results.ThermalSolution.MeltingRate),... + PatchToVec(md.results.ThermalSolution.BasalMeltingRate),... }; Index: /issm/trunk/test/Par/79North.par =================================================================== --- /issm/trunk/test/Par/79North.par (revision 8391) +++ /issm/trunk/test/Par/79North.par (revision 8392) @@ -24,8 +24,8 @@ %Ice shelf melting and accumulation -md.melting_rate=zeros(md.numberofnodes,1); +md.basal_melting_rate=zeros(md.numberofnodes,1); pos=zeros(md.numberofnodes,1); pos(md.elements(find(md.elementoniceshelf),:))=1; -md.melting_rate(find(pos))=10; +md.basal_melting_rate(find(pos))=10; md.accumulation_rate=15*ones(md.numberofnodes,1); md.forcings.accumulation_rate=[15*ones(md.numberofnodes,1);1]; Index: /issm/trunk/test/Par/RoundSheetShelf.par =================================================================== --- /issm/trunk/test/Par/RoundSheetShelf.par (revision 8391) +++ /issm/trunk/test/Par/RoundSheetShelf.par (revision 8392) @@ -48,6 +48,6 @@ md.accumulation_rate=-10*ones(md.numberofnodes,1); md.forcings.accumulation_rate=[-10*ones(md.numberofnodes,1);1]; -md.melting_rate=zeros(md.numberofnodes,1); -pos=find(md.nodeoniceshelf);md.melting_rate(pos)=10; +md.basal_melting_rate=zeros(md.numberofnodes,1); +pos=find(md.nodeoniceshelf);md.basal_melting_rate(pos)=10; %Friction Index: /issm/trunk/test/Par/SquareEISMINT.par =================================================================== --- /issm/trunk/test/Par/SquareEISMINT.par (revision 8391) +++ /issm/trunk/test/Par/SquareEISMINT.par (revision 8392) @@ -29,5 +29,5 @@ md.accumulation_rate=0.2*ones(md.numberofnodes,1); %0m/a md.forcings.accumulation_rate=[0.2*ones(md.numberofnodes,1);1]; %0m/a -md.melting_rate=0*ones(md.numberofnodes,1); %0m/a +md.basal_melting_rate=0*ones(md.numberofnodes,1); %0m/a disp(' boundary conditions '); Index: /issm/trunk/test/Par/SquareSheetShelf.par =================================================================== --- /issm/trunk/test/Par/SquareSheetShelf.par (revision 8391) +++ /issm/trunk/test/Par/SquareSheetShelf.par (revision 8392) @@ -30,5 +30,5 @@ md.accumulation_rate=10*ones(md.numberofnodes,1); md.forcings.accumulation_rate=[10*ones(md.numberofnodes,1);1]; -md.melting_rate=5*ones(md.numberofnodes,1); +md.basal_melting_rate=5*ones(md.numberofnodes,1); %Friction Index: /issm/trunk/test/Par/SquareShelfConstrained.par =================================================================== --- /issm/trunk/test/Par/SquareShelfConstrained.par (revision 8391) +++ /issm/trunk/test/Par/SquareShelfConstrained.par (revision 8392) @@ -27,5 +27,5 @@ md.accumulation_rate=10*ones(md.numberofnodes,1); md.forcings.accumulation_rate=[10*ones(md.numberofnodes,1);1]; -md.melting_rate=5*ones(md.numberofnodes,1); +md.basal_melting_rate=5*ones(md.numberofnodes,1); %Friction Index: /issm/trunk/test/Par/SquareThermal.par =================================================================== --- /issm/trunk/test/Par/SquareThermal.par (revision 8391) +++ /issm/trunk/test/Par/SquareThermal.par (revision 8392) @@ -36,5 +36,5 @@ md.accumulation_rate=ones(md.numberofnodes,1)/md.yts; %1m/a md.forcings.accumulation_rate=[ones(md.numberofnodes,1)/md.yts;1]; %1m/a -md.melting_rate=0*ones(md.numberofnodes,1)/md.yts; %1m/a +md.basal_melting_rate=0*ones(md.numberofnodes,1)/md.yts; %1m/a %Deal with boundary conditions: