Index: /issm/trunk-jpl/src/c/analyses/BalancethicknessAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/BalancethicknessAnalysis.cpp (revision 17554) +++ /issm/trunk-jpl/src/c/analyses/BalancethicknessAnalysis.cpp (revision 17555) @@ -36,5 +36,5 @@ iomodel->FetchDataToInput(elements,ThicknessEnum); iomodel->FetchDataToInput(elements,SurfaceEnum); - iomodel->FetchDataToInput(elements,BedEnum); + iomodel->FetchDataToInput(elements,BaseEnum); iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); iomodel->FetchDataToInput(elements,VxEnum); Index: /issm/trunk-jpl/src/c/analyses/BalancevelocityAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/BalancevelocityAnalysis.cpp (revision 17554) +++ /issm/trunk-jpl/src/c/analyses/BalancevelocityAnalysis.cpp (revision 17555) @@ -25,5 +25,5 @@ iomodel->FetchDataToInput(elements,ThicknessEnum); iomodel->FetchDataToInput(elements,SurfaceEnum); - iomodel->FetchDataToInput(elements,BedEnum); + iomodel->FetchDataToInput(elements,BaseEnum); iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); iomodel->FetchDataToInput(elements,VxEnum); Index: /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp (revision 17554) +++ /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp (revision 17555) @@ -53,5 +53,5 @@ iomodel->FetchDataToInput(elements,ThicknessEnum); iomodel->FetchDataToInput(elements,SurfaceEnum); - iomodel->FetchDataToInput(elements,BedEnum); + iomodel->FetchDataToInput(elements,BaseEnum); iomodel->FetchDataToInput(elements,FrictionCoefficientEnum); iomodel->FetchDataToInput(elements,FrictionPEnum); Index: /issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp (revision 17554) +++ /issm/trunk-jpl/src/c/analyses/FreeSurfaceBaseAnalysis.cpp (revision 17555) @@ -266,5 +266,5 @@ Input* mb_input = basalelement->GetInput(BasalforcingsMeltingRateEnum); _assert_(mb_input); Input* mb_correction_input = basalelement->GetInput(BasalforcingsMeltingRateCorrectionEnum); - Input* bed_input = basalelement->GetInput(BedEnum); _assert_(bed_input); + Input* base_input = basalelement->GetInput(BaseEnum); _assert_(base_input); Input* vz_input = NULL; switch(dim){ @@ -285,5 +285,5 @@ vz_input->GetInputValue(&vz,gauss); mb_input->GetInputValue(&mb,gauss); - bed_input->GetInputValue(&bed,gauss); + base_input->GetInputValue(&bed,gauss); if(mb_correction_input) mb_correction_input->GetInputValue(&mb_correction,gauss); @@ -363,5 +363,5 @@ }/*}}}*/ void FreeSurfaceBaseAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/ - element->InputUpdateFromSolutionOneDof(solution,BedEnum); + element->InputUpdateFromSolutionOneDof(solution,BaseEnum); }/*}}}*/ void FreeSurfaceBaseAnalysis::UpdateConstraints(FemModel* femmodel){/*{{{*/ Index: /issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (revision 17554) +++ /issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (revision 17555) @@ -49,5 +49,5 @@ } iomodel->FetchDataToInput(elements,ThicknessEnum); - iomodel->FetchDataToInput(elements,BedEnum); + iomodel->FetchDataToInput(elements,BaseEnum); iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); iomodel->FetchDataToInput(elements,MeshElementonbedEnum); @@ -533,5 +533,5 @@ element->GetInputListOnVertices(&old_thickness[0],HydrologydcEplThicknessOldEnum); element->GetInputListOnVertices(&ice_thickness[0],ThicknessEnum); - element->GetInputListOnVertices(&bed[0],BedEnum); + element->GetInputListOnVertices(&bed[0],BaseEnum); if(!active_element){ @@ -742,5 +742,5 @@ rho_ice = element->GetMaterialParameter(MaterialsRhoIceEnum); element-> GetInputValue(&thickness,innode,ThicknessEnum); - element-> GetInputValue(&bed,innode,BedEnum); + element-> GetInputValue(&bed,innode,BaseEnum); h_max=((rho_ice*thickness)/rho_water)+bed; break; Index: /issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp (revision 17554) +++ /issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp (revision 17555) @@ -82,5 +82,5 @@ iomodel->FetchDataToInput(elements,ThicknessEnum); - iomodel->FetchDataToInput(elements,BedEnum); + iomodel->FetchDataToInput(elements,BaseEnum); iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); iomodel->FetchDataToInput(elements,MeshElementonbedEnum); @@ -200,5 +200,5 @@ Input* epl_head_input = basalelement->GetInput(EplHeadEnum); Input* thickness_input = basalelement->GetInput(ThicknessEnum); - Input* bed_input = basalelement->GetInput(BedEnum); + Input* base_input = basalelement->GetInput(BaseEnum); Input* SedTrans_input = basalelement->GetInput(HydrologydcSedimentTransmitivityEnum); _assert_(SedTrans_input); IssmDouble sediment_storing = SedimentStoring(basalelement); @@ -239,5 +239,5 @@ active_element_input->GetInputValue(&active_element); if(active_element){ - transfer=GetHydrologyKMatrixTransfer(basalelement,gauss,epl_thick_input,sed_head_input,epl_head_input,SedTrans_input,thickness_input,bed_input); + transfer=GetHydrologyKMatrixTransfer(basalelement,gauss,epl_thick_input,sed_head_input,epl_head_input,SedTrans_input,thickness_input,base_input); basalelement->NodalFunctions(&basis[0],gauss); D_scalar=transfer*gauss->weight*Jdet*dt; @@ -305,5 +305,5 @@ Input* sed_trans_input = basalelement->GetInput(HydrologydcSedimentTransmitivityEnum); Input* thickness_input = basalelement->GetInput(ThicknessEnum); - Input* bed_input = basalelement->GetInput(BedEnum); + Input* base_input = basalelement->GetInput(BaseEnum); Input* water_input = basalelement->GetInput(BasalforcingsMeltingRateEnum); _assert_(water_input); if(dt!= 0.){old_wh_input = basalelement->GetInput(SedimentHeadOldEnum); _assert_(old_wh_input);} @@ -340,5 +340,5 @@ active_element_input->GetInputValue(&active_element); if(active_element){ - transfer=GetHydrologyPVectorTransfer(basalelement,gauss,epl_thick_input,sed_head_input,epl_head_input,sed_trans_input,thickness_input,bed_input); + transfer=GetHydrologyPVectorTransfer(basalelement,gauss,epl_thick_input,sed_head_input,epl_head_input,sed_trans_input,thickness_input,base_input); } else{ @@ -474,5 +474,5 @@ }/*}}}*/ -IssmDouble HydrologyDCInefficientAnalysis::GetHydrologyDCInefficientHmax(Element* element, Gauss* gauss, Input* thick_input, Input* bed_input){/*{{{*/ +IssmDouble HydrologyDCInefficientAnalysis::GetHydrologyDCInefficientHmax(Element* element, Gauss* gauss, Input* thick_input, Input* base_input){/*{{{*/ int hmax_flag; IssmDouble h_max; @@ -496,9 +496,9 @@ _assert_(thick_input); - _assert_(bed_input); + _assert_(base_input); /*Compute max*/ thick_input->GetInputValue(&thickness,gauss); - bed_input->GetInputValue(&bed,gauss); + base_input->GetInputValue(&bed,gauss); h_max=((rho_ice*thickness)/rho_water)+bed; break; @@ -533,5 +533,5 @@ rho_ice = element->GetMaterialParameter(MaterialsRhoIceEnum); element->GetInputValue(&thickness,innode,ThicknessEnum); - element->GetInputValue(&bed,innode,BedEnum); + element->GetInputValue(&bed,innode,BaseEnum); h_max=((rho_ice*thickness)/rho_water)+bed; break; @@ -546,5 +546,5 @@ } /*}}}*/ -IssmDouble HydrologyDCInefficientAnalysis::GetHydrologyKMatrixTransfer(Element* element, Gauss* gauss, Input* epl_thick_input, Input* sed_head_input, Input* epl_head_input, Input* sed_trans_input, Input* thickness_input, Input* bed_input){/*{{{*/ +IssmDouble HydrologyDCInefficientAnalysis::GetHydrologyKMatrixTransfer(Element* element, Gauss* gauss, Input* epl_thick_input, Input* sed_head_input, Input* epl_head_input, Input* sed_trans_input, Input* thickness_input, Input* base_input){/*{{{*/ int transfermethod; @@ -572,5 +572,5 @@ _assert_(sed_trans_input); _assert_(thickness_input); - _assert_(bed_input); + _assert_(base_input); epl_thick_input->GetInputValue(&epl_thickness,gauss); @@ -581,5 +581,5 @@ if(epl_head>sed_head){ - h_max=GetHydrologyDCInefficientHmax(element,gauss,thickness_input,bed_input); + h_max=GetHydrologyDCInefficientHmax(element,gauss,thickness_input,base_input); if(sed_head>=h_max){ transfer=0.0; @@ -600,5 +600,5 @@ }/*}}}*/ -IssmDouble HydrologyDCInefficientAnalysis::GetHydrologyPVectorTransfer(Element* element, Gauss* gauss, Input* epl_thick_input, Input* sed_head_input, Input* epl_head_input, Input* sed_trans_input, Input* thickness_input, Input* bed_input){/*{{{*/ +IssmDouble HydrologyDCInefficientAnalysis::GetHydrologyPVectorTransfer(Element* element, Gauss* gauss, Input* epl_thick_input, Input* sed_head_input, Input* epl_head_input, Input* sed_trans_input, Input* thickness_input, Input* base_input){/*{{{*/ int transfermethod; @@ -626,5 +626,5 @@ _assert_(sed_trans_input); _assert_(thickness_input); - _assert_(bed_input); + _assert_(base_input); epl_thick_input->GetInputValue(&epl_thickness,gauss); @@ -636,5 +636,5 @@ if(epl_head>sediment_head){ - h_max=GetHydrologyDCInefficientHmax(element,gauss,thickness_input,bed_input); + h_max=GetHydrologyDCInefficientHmax(element,gauss,thickness_input,base_input); if(sediment_head>=h_max){ transfer=0.0; Index: /issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.h (revision 17554) +++ /issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.h (revision 17555) @@ -35,8 +35,8 @@ IssmDouble SedimentStoring(Element* element); IssmDouble EplSpecificStoring(Element* element); - IssmDouble GetHydrologyDCInefficientHmax(Element* element, Gauss* gauss, Input* thickness_input, Input* bed_input); + IssmDouble GetHydrologyDCInefficientHmax(Element* element, Gauss* gauss, Input* thickness_input, Input* base_input); void GetHydrologyDCInefficientHmax(IssmDouble* ph_max,Element* element, Node* innode); - IssmDouble GetHydrologyKMatrixTransfer(Element* element, Gauss* gauss, Input* epl_thick_input, Input* sed_head_input, Input* epl_head_input, Input* sed_trans_input, Input* thickness_input, Input* bed_input); - IssmDouble GetHydrologyPVectorTransfer(Element* element, Gauss* gauss, Input* epl_thick_input, Input* sed_head_input, Input* epl_head_input, Input* sed_trans_input, Input* thickness_input, Input* bed_input); + IssmDouble GetHydrologyKMatrixTransfer(Element* element, Gauss* gauss, Input* epl_thick_input, Input* sed_head_input, Input* epl_head_input, Input* sed_trans_input, Input* thickness_input, Input* base_input); + IssmDouble GetHydrologyPVectorTransfer(Element* element, Gauss* gauss, Input* epl_thick_input, Input* sed_head_input, Input* epl_head_input, Input* sed_trans_input, Input* thickness_input, Input* base_input); void ElementizeEplMask(FemModel* femmodel); }; Index: /issm/trunk-jpl/src/c/analyses/HydrologyShreveAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/HydrologyShreveAnalysis.cpp (revision 17554) +++ /issm/trunk-jpl/src/c/analyses/HydrologyShreveAnalysis.cpp (revision 17555) @@ -43,5 +43,5 @@ iomodel->FetchDataToInput(elements,ThicknessEnum); iomodel->FetchDataToInput(elements,SurfaceEnum); - iomodel->FetchDataToInput(elements,BedEnum); + iomodel->FetchDataToInput(elements,BaseEnum); iomodel->FetchDataToInput(elements,MeshElementonbedEnum); iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); Index: /issm/trunk-jpl/src/c/analyses/L2ProjectionBaseAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/L2ProjectionBaseAnalysis.cpp (revision 17554) +++ /issm/trunk-jpl/src/c/analyses/L2ProjectionBaseAnalysis.cpp (revision 17555) @@ -24,5 +24,5 @@ iomodel->FetchDataToInput(elements,SurfaceEnum); - iomodel->FetchDataToInput(elements,BedEnum); + iomodel->FetchDataToInput(elements,BaseEnum); iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); if(iomodel->meshtype==Mesh3DEnum){ @@ -175,6 +175,6 @@ case SurfaceSlopeXEnum: input2 = basalelement->GetInput(SurfaceEnum); _assert_(input2); break; case SurfaceSlopeYEnum: input2 = basalelement->GetInput(SurfaceEnum); _assert_(input2); break; - case BedSlopeXEnum: input2 = basalelement->GetInput(BedEnum); _assert_(input2); break; - case BedSlopeYEnum: input2 = basalelement->GetInput(BedEnum); _assert_(input2); break; + case BedSlopeXEnum: input2 = basalelement->GetInput(BaseEnum); _assert_(input2); break; + case BedSlopeYEnum: input2 = basalelement->GetInput(BaseEnum); _assert_(input2); break; case LevelsetfunctionSlopeXEnum: input2 = basalelement->GetInput(MaskIceLevelsetEnum); _assert_(input2); break; case LevelsetfunctionSlopeYEnum: input2 = basalelement->GetInput(MaskIceLevelsetEnum); _assert_(input2); break; Index: /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp (revision 17554) +++ /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp (revision 17555) @@ -63,5 +63,5 @@ iomodel->FetchDataToInput(elements,ThicknessEnum); iomodel->FetchDataToInput(elements,SurfaceEnum); - iomodel->FetchDataToInput(elements,BedEnum); + iomodel->FetchDataToInput(elements,BaseEnum); iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); iomodel->FetchDataToInput(elements,MaskGroundediceLevelsetEnum); @@ -76,5 +76,5 @@ if(dakota_analysis){ - elements->InputDuplicate(BedEnum,QmuBedEnum); + elements->InputDuplicate(BaseEnum,QmuBaseEnum); elements->InputDuplicate(ThicknessEnum,QmuThicknessEnum); elements->InputDuplicate(SurfaceEnum,QmuSurfaceEnum); @@ -707,5 +707,5 @@ /*Get previous bed, thickness and surface*/ - basalelement->GetInputListOnNodes(&oldbed[0],BedEnum); + basalelement->GetInputListOnNodes(&oldbed[0],BaseEnum); basalelement->GetInputListOnNodes(&oldsurface[0],SurfaceEnum); basalelement->GetInputListOnNodes(&oldthickness[0],ThicknessEnum); @@ -739,5 +739,5 @@ element->AddBasalInput(ThicknessEnum,newthickness,P1Enum); element->AddBasalInput(SurfaceEnum,newsurface,P1Enum); - element->AddBasalInput(BedEnum,newbed,P1Enum); + element->AddBasalInput(BaseEnum,newbed,P1Enum); /*Free ressources:*/ Index: /issm/trunk-jpl/src/c/analyses/MeltingAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/MeltingAnalysis.cpp (revision 17554) +++ /issm/trunk-jpl/src/c/analyses/MeltingAnalysis.cpp (revision 17555) @@ -29,5 +29,5 @@ iomodel->FetchDataToInput(elements,ThicknessEnum); iomodel->FetchDataToInput(elements,SurfaceEnum); - iomodel->FetchDataToInput(elements,BedEnum); + iomodel->FetchDataToInput(elements,BaseEnum); iomodel->FetchDataToInput(elements,FrictionCoefficientEnum); iomodel->FetchDataToInput(elements,FrictionPEnum); Index: /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeXAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeXAnalysis.cpp (revision 17554) +++ /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeXAnalysis.cpp (revision 17555) @@ -24,5 +24,5 @@ iomodel->FetchDataToInput(elements,SurfaceEnum); - iomodel->FetchDataToInput(elements,BedEnum); + iomodel->FetchDataToInput(elements,BaseEnum); iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); if(iomodel->meshtype==Mesh3DEnum){ Index: /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeYAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeYAnalysis.cpp (revision 17554) +++ /issm/trunk-jpl/src/c/analyses/SmoothedSurfaceSlopeYAnalysis.cpp (revision 17555) @@ -24,5 +24,5 @@ iomodel->FetchDataToInput(elements,SurfaceEnum); - iomodel->FetchDataToInput(elements,BedEnum); + iomodel->FetchDataToInput(elements,BaseEnum); iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); if(iomodel->meshtype==Mesh3DEnum){ Index: /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 17554) +++ /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 17555) @@ -194,5 +194,5 @@ iomodel->FetchDataToInput(elements,ThicknessEnum); iomodel->FetchDataToInput(elements,SurfaceEnum); - iomodel->FetchDataToInput(elements,BedEnum); + iomodel->FetchDataToInput(elements,BaseEnum); iomodel->FetchDataToInput(elements,FrictionCoefficientEnum); iomodel->FetchDataToInput(elements,FrictionPEnum); @@ -809,5 +809,5 @@ if(numrifts){ iomodel->FetchData(&riftinfo,&numriftsegments,NULL,RiftsRiftstructEnum); - iomodel->FetchData(5,RiftsRiftstructEnum,ThicknessEnum,BedEnum,SurfaceEnum,MaskGroundediceLevelsetEnum); + iomodel->FetchData(5,RiftsRiftstructEnum,ThicknessEnum,BaseEnum,SurfaceEnum,MaskGroundediceLevelsetEnum); for(i=0;imy_elements[reCast(*(riftinfo+RIFTINFOSIZE*i+2))-1]){ @@ -816,5 +816,5 @@ } } - iomodel->DeleteData(5,RiftsRiftstructEnum,ThicknessEnum,BedEnum,SurfaceEnum,MaskGroundediceLevelsetEnum); + iomodel->DeleteData(5,RiftsRiftstructEnum,ThicknessEnum,BaseEnum,SurfaceEnum,MaskGroundediceLevelsetEnum); xDelete(riftinfo); } @@ -1486,5 +1486,5 @@ /*Retrieve all inputs and parameters*/ Input* thickness_input = element->GetInput(ThicknessEnum); _assert_(thickness_input); - Input* bed_input = element->GetInput(BedEnum); _assert_(bed_input); + Input* base_input = element->GetInput(BaseEnum); _assert_(base_input); IssmDouble rho_water = element->GetMaterialParameter(MaterialsRhoWaterEnum); IssmDouble rho_ice = element->GetMaterialParameter(MaterialsRhoIceEnum); @@ -1501,5 +1501,5 @@ gauss->GaussPoint(ig); thickness_input->GetInputValue(&thickness,gauss); - bed_input->GetInputValue(&bed,gauss); + base_input->GetInputValue(&bed,gauss); element->JacobianDeterminantSurface(&Jdet,xyz_list_front,gauss); element->NodalFunctions(basis,gauss); @@ -1938,5 +1938,5 @@ /*Retrieve all inputs and parameters*/ Input* thickness_input = element->GetInput(ThicknessEnum); _assert_(thickness_input); - Input* bed_input = element->GetInput(BedEnum); _assert_(bed_input); + Input* base_input = element->GetInput(BaseEnum); _assert_(base_input); IssmDouble rho_water = element->GetMaterialParameter(MaterialsRhoWaterEnum); IssmDouble rho_ice = element->GetMaterialParameter(MaterialsRhoIceEnum); @@ -1952,5 +1952,5 @@ gauss->GaussPoint(ig); thickness_input->GetInputValue(&thickness,gauss); - bed_input->GetInputValue(&bed,gauss); + base_input->GetInputValue(&bed,gauss); element->JacobianDeterminantSurface(&Jdet,xyz_list_front,gauss); element->NodalFunctions(basis,gauss); @@ -3592,5 +3592,5 @@ /*Retrieve all inputs and parameters*/ element->GetVerticesCoordinatesBase(&xyz_list_base); - Input* bed_input=element->GetInput(BedEnum); _assert_(bed_input); + Input* base_input=element->GetInput(BaseEnum); _assert_(base_input); IssmDouble rho_water=element->GetMaterialParameter(MaterialsRhoWaterEnum); IssmDouble gravity =element->GetMaterialParameter(ConstantsGEnum); @@ -3606,5 +3606,5 @@ element->NormalBase(&normal[0],xyz_list_base); _assert_(normal[dim-1]<0.); - bed_input->GetInputValue(&bed, gauss); + base_input->GetInputValue(&bed, gauss); water_pressure=gravity*rho_water*bed; Index: /issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp (revision 17554) +++ /issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp (revision 17555) @@ -32,5 +32,5 @@ iomodel->FetchDataToInput(elements,ThicknessEnum); iomodel->FetchDataToInput(elements,SurfaceEnum); - iomodel->FetchDataToInput(elements,BedEnum); + iomodel->FetchDataToInput(elements,BaseEnum); iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); iomodel->FetchDataToInput(elements,MeshElementonbedEnum); @@ -291,5 +291,5 @@ element->GetVerticesCoordinatesBase(&xyz_list_base); element->GetInputValue(&approximation,ApproximationEnum); - Input* bed_input=element->GetInput(BedEnum); _assert_(bed_input); + Input* base_input=element->GetInput(BaseEnum); _assert_(base_input); Input* basal_melting_input=element->GetInput(BasalforcingsMeltingRateEnum); _assert_(basal_melting_input); Input* vx_input=element->GetInput(VxEnum); _assert_(vx_input); @@ -306,5 +306,5 @@ basal_melting_input->GetInputValue(&basalmeltingvalue,gauss); - bed_input->GetInputDerivativeValue(&slope[0],xyz_list,gauss); + base_input->GetInputDerivativeValue(&slope[0],xyz_list,gauss); vx_input->GetInputValue(&vx,gauss); vy_input->GetInputValue(&vy,gauss); Index: /issm/trunk-jpl/src/c/analyses/ThermalAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/ThermalAnalysis.cpp (revision 17554) +++ /issm/trunk-jpl/src/c/analyses/ThermalAnalysis.cpp (revision 17555) @@ -49,5 +49,5 @@ iomodel->FetchDataToInput(elements,ThicknessEnum); iomodel->FetchDataToInput(elements,SurfaceEnum); - iomodel->FetchDataToInput(elements,BedEnum); + iomodel->FetchDataToInput(elements,BaseEnum); iomodel->FetchDataToInput(elements,FrictionCoefficientEnum); iomodel->FetchDataToInput(elements,FrictionPEnum); Index: /issm/trunk-jpl/src/c/classes/Elements/Element.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Element.cpp (revision 17554) +++ /issm/trunk-jpl/src/c/classes/Elements/Element.cpp (revision 17555) @@ -686,6 +686,6 @@ name==ThicknessEnum || name==SurfaceEnum || + name==BaseEnum || name==BedEnum || - name==BathymetryEnum || name==SurfaceSlopeXEnum || name==SurfaceSlopeYEnum || @@ -729,5 +729,5 @@ name==QmuVzMeshEnum || name==QmuPressureEnum || - name==QmuBedEnum || + name==QmuBaseEnum || name==QmuThicknessEnum || name==QmuSurfaceEnum || Index: /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 17554) +++ /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 17555) @@ -2678,9 +2678,9 @@ /*Now get the average height above floatation*/ Input* surface_input = inputs->GetInput(SurfaceEnum); _assert_(surface_input); - Input* bed_input = inputs->GetInput(BedEnum); _assert_(bed_input); - Input* bathymetry_input = inputs->GetInput(BathymetryEnum); _assert_(bathymetry_input); + Input* base_input = inputs->GetInput(BaseEnum); _assert_(base_input); + Input* bed_input = inputs->GetInput(BedEnum); _assert_(bed_input); surface_input->GetInputAverage(&surface); - bed_input->GetInputAverage(&bed); - bathymetry_input->GetInputAverage(&bathymetry); + base_input->GetInputAverage(&bed); + bed_input->GetInputAverage(&bathymetry); /*Return: */ @@ -3740,5 +3740,5 @@ GetInputListOnVertices(&thickness_init[0],ThicknessEnum); GetInputListOnVertices(&hydrostatic_ratio[0],GeometryHydrostaticRatioEnum); - GetInputListOnVertices(&bed[0],BedEnum); + GetInputListOnVertices(&bed[0],BaseEnum); GetInputListOnVertices(&surface[0],SurfaceEnum); @@ -3793,5 +3793,5 @@ /*Add new inputs: */ this->inputs->AddInput(new PentaInput(ThicknessEnum,thickness,P1Enum)); - this->inputs->AddInput(new PentaInput(BedEnum,bed,P1Enum)); + this->inputs->AddInput(new PentaInput(BaseEnum,bed,P1Enum)); this->inputs->AddInput(new PentaInput(SurfaceEnum,surface,P1Enum)); break; @@ -3899,6 +3899,6 @@ GetInputListOnVertices(&h[0],ThicknessEnum); GetInputListOnVertices(&s[0],SurfaceEnum); - GetInputListOnVertices(&b[0],BedEnum); - GetInputListOnVertices(&r[0],BathymetryEnum); + GetInputListOnVertices(&b[0],BaseEnum); + GetInputListOnVertices(&r[0],BedEnum); GetInputListOnVertices(&phi[0],MaskGroundediceLevelsetEnum); rho_water = matpar->GetRhoWater(); @@ -3977,9 +3977,9 @@ /*Update inputs*/ this->inputs->AddInput(new PentaInput(SurfaceEnum,&s[0],P1Enum)); - this->inputs->AddInput(new PentaInput(BedEnum,&b[0],P1Enum)); + this->inputs->AddInput(new PentaInput(BaseEnum,&b[0],P1Enum)); /*Extrude inputs*/ this->InputExtrude(SurfaceEnum); - this->InputExtrude(BedEnum); + this->InputExtrude(BaseEnum); } /*}}}*/ @@ -3996,5 +3996,5 @@ density=rho_ice/rho_water; GetInputListOnVertices(&h[0],ThicknessEnum); - GetInputListOnVertices(&r[0],BathymetryEnum); + GetInputListOnVertices(&r[0],BedEnum); GetInputListOnVertices(&gl[0],MaskGroundediceLevelsetEnum); Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17554) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 17555) @@ -2109,7 +2109,7 @@ /*Now get the average height*/ Input* surface_input = inputs->GetInput(SurfaceEnum); _assert_(surface_input); - Input* bed_input = inputs->GetInput(BedEnum); _assert_(bed_input); + Input* base_input = inputs->GetInput(BaseEnum); _assert_(base_input); surface_input->GetInputAverage(&surface); - bed_input->GetInputAverage(&bed); + base_input->GetInputAverage(&bed); /*Return: */ @@ -2145,9 +2145,9 @@ /*Now get the average height and bathymetry*/ Input* surface_input = inputs->GetInput(SurfaceEnum); _assert_(surface_input); - Input* bed_input = inputs->GetInput(BedEnum); _assert_(bed_input); - Input* bathymetry_input = inputs->GetInput(BathymetryEnum); _assert_(bathymetry_input); + Input* base_input = inputs->GetInput(BaseEnum); _assert_(base_input); + Input* bed_input = inputs->GetInput(BedEnum); _assert_(bed_input); surface_input->GetInputAverage(&surface); - bed_input->GetInputAverage(&bed); - bathymetry_input->GetInputAverage(&bathymetry); + base_input->GetInputAverage(&bed); + bed_input->GetInputAverage(&bathymetry); /*Return: */ @@ -4136,5 +4136,5 @@ GetInputListOnVertices(&thickness_init[0],ThicknessEnum); GetInputListOnVertices(&hydrostatic_ratio[0],GeometryHydrostaticRatioEnum); - GetInputListOnVertices(&bed[0],BedEnum); + GetInputListOnVertices(&bed[0],BaseEnum); GetInputListOnVertices(&surface[0],SurfaceEnum); @@ -4178,5 +4178,5 @@ /*Add new inputs: */ this->inputs->AddInput(new TriaInput(ThicknessEnum,thickness,P1Enum)); - this->inputs->AddInput(new TriaInput(BedEnum,bed,P1Enum)); + this->inputs->AddInput(new TriaInput(BaseEnum,bed,P1Enum)); this->inputs->AddInput(new TriaInput(SurfaceEnum,surface,P1Enum)); @@ -4255,6 +4255,6 @@ GetInputListOnVertices(&h[0],ThicknessEnum); GetInputListOnVertices(&s[0],SurfaceEnum); - GetInputListOnVertices(&b[0],BedEnum); - GetInputListOnVertices(&r[0],BathymetryEnum); + GetInputListOnVertices(&b[0],BaseEnum); + GetInputListOnVertices(&r[0],BedEnum); GetInputListOnVertices(&phi[0],MaskGroundediceLevelsetEnum); rho_water = matpar->GetRhoWater(); @@ -4333,5 +4333,5 @@ /*Update inputs*/ this->inputs->AddInput(new TriaInput(SurfaceEnum,&s[0],P1Enum)); - this->inputs->AddInput(new TriaInput(BedEnum,&b[0],P1Enum)); + this->inputs->AddInput(new TriaInput(BaseEnum,&b[0],P1Enum)); } @@ -4349,5 +4349,5 @@ density=rho_ice/rho_water; GetInputListOnVertices(&h[0],ThicknessEnum); - GetInputListOnVertices(&r[0],BathymetryEnum); + GetInputListOnVertices(&r[0],BedEnum); GetInputListOnVertices(&gl[0],MaskGroundediceLevelsetEnum); Index: /issm/trunk-jpl/src/c/classes/FemModel.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/FemModel.cpp (revision 17554) +++ /issm/trunk-jpl/src/c/classes/FemModel.cpp (revision 17555) @@ -365,5 +365,5 @@ /*get vertex vectors for bed and thickness: */ GetVectorFromInputsx(&surface ,this, SurfaceEnum,VertexEnum); - GetVectorFromInputsx(&bed ,this, BedEnum, VertexEnum); + GetVectorFromInputsx(&bed ,this, BaseEnum, VertexEnum); /*Allocate vector*/ Index: /issm/trunk-jpl/src/c/classes/Loads/Friction.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Loads/Friction.cpp (revision 17554) +++ /issm/trunk-jpl/src/c/classes/Loads/Friction.cpp (revision 17555) @@ -60,5 +60,5 @@ element->GetInputValue(&drag_q,FrictionQEnum); element->GetInputValue(&thickness, gauss,ThicknessEnum); - element->GetInputValue(&bed, gauss,BedEnum); + element->GetInputValue(&bed, gauss,BaseEnum); element->GetInputValue(&drag_coefficient, gauss,FrictionCoefficientEnum); IssmDouble rho_water = element->GetMaterialParameter(MaterialsRhoWaterEnum); @@ -124,5 +124,5 @@ element->GetInputValue(&drag_q,FrictionQEnum); element->GetInputValue(&thickness, gauss,ThicknessEnum); - element->GetInputValue(&bed, gauss,BedEnum); + element->GetInputValue(&bed, gauss,BaseEnum); element->GetInputValue(&drag_coefficient, gauss,FrictionCoefficientEnum); IssmDouble rho_water = element->GetMaterialParameter(MaterialsRhoWaterEnum); Index: /issm/trunk-jpl/src/c/classes/Loads/Riftfront.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Loads/Riftfront.cpp (revision 17554) +++ /issm/trunk-jpl/src/c/classes/Loads/Riftfront.cpp (revision 17555) @@ -526,6 +526,6 @@ if (h[0]!=h[1])_error_("different thicknesses not supported for rift fronts"); thickness=h[0]; - tria1->GetInputValue(&b[0],nodes[0],BedEnum); - tria2->GetInputValue(&b[1],nodes[1],BedEnum); + tria1->GetInputValue(&b[0],nodes[0],BaseEnum); + tria2->GetInputValue(&b[1],nodes[1],BaseEnum); if (b[0]!=b[1])_error_("different beds not supported for rift fronts"); bed=b[0]; Index: /issm/trunk-jpl/src/c/classes/Vertex.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Vertex.cpp (revision 17554) +++ /issm/trunk-jpl/src/c/classes/Vertex.cpp (revision 17555) @@ -34,12 +34,12 @@ this->meshtype = iomodel->meshtype; - _assert_(iomodel->Data(BedEnum) && iomodel->Data(ThicknessEnum) && iomodel->numbernodetoelementconnectivity); + _assert_(iomodel->Data(BaseEnum) && iomodel->Data(ThicknessEnum) && iomodel->numbernodetoelementconnectivity); switch(iomodel->meshtype){ case Mesh3DEnum: case Mesh2DhorizontalEnum: - this->sigma = (iomodel->Data(MeshZEnum)[i]-iomodel->Data(BedEnum)[i])/(iomodel->Data(ThicknessEnum)[i]); + this->sigma = (iomodel->Data(MeshZEnum)[i]-iomodel->Data(BaseEnum)[i])/(iomodel->Data(ThicknessEnum)[i]); break; case Mesh2DverticalEnum: - this->sigma = (iomodel->Data(MeshYEnum)[i]-iomodel->Data(BedEnum)[i])/(iomodel->Data(ThicknessEnum)[i]); + this->sigma = (iomodel->Data(MeshYEnum)[i]-iomodel->Data(BaseEnum)[i])/(iomodel->Data(ThicknessEnum)[i]); break; } Index: /issm/trunk-jpl/src/c/cores/masstransport_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/cores/masstransport_core.cpp (revision 17554) +++ /issm/trunk-jpl/src/c/cores/masstransport_core.cpp (revision 17555) @@ -37,5 +37,5 @@ InputDuplicatex(femmodel,QmuSurfaceEnum,SurfaceEnum); InputDuplicatex(femmodel,QmuThicknessEnum,ThicknessEnum); - InputDuplicatex(femmodel,QmuBedEnum,BedEnum); + InputDuplicatex(femmodel,QmuBaseEnum,BaseEnum); } @@ -49,5 +49,5 @@ solutionsequence_linear(femmodel); if(meshtype!=Mesh2DhorizontalEnum){ - femmodel->parameters->SetParam(BedEnum,InputToExtrudeEnum); + femmodel->parameters->SetParam(BaseEnum,InputToExtrudeEnum); extrudefrombase_core(femmodel); } @@ -65,5 +65,5 @@ femmodel->parameters->SetParam(ThicknessEnum,InputToExtrudeEnum); extrudefrombase_core(femmodel); - femmodel->parameters->SetParam(BedEnum,InputToExtrudeEnum); + femmodel->parameters->SetParam(BaseEnum,InputToExtrudeEnum); extrudefrombase_core(femmodel); femmodel->parameters->SetParam(SurfaceEnum,InputToExtrudeEnum); Index: /issm/trunk-jpl/src/c/cores/transient_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/cores/transient_core.cpp (revision 17554) +++ /issm/trunk-jpl/src/c/cores/transient_core.cpp (revision 17555) @@ -73,5 +73,5 @@ InputDuplicatex(femmodel,QmuThicknessEnum,ThicknessEnum); InputDuplicatex(femmodel,QmuSurfaceEnum,SurfaceEnum); - InputDuplicatex(femmodel,QmuBedEnum,BedEnum); + InputDuplicatex(femmodel,QmuBaseEnum,BaseEnum); InputDuplicatex(femmodel,QmuMaskIceLevelsetEnum,MaskIceLevelsetEnum); } @@ -162,5 +162,5 @@ GroundinglineMigrationx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); if(save_results){ - int outputs[3] = {SurfaceEnum,BedEnum,MaskGroundediceLevelsetEnum}; + int outputs[3] = {SurfaceEnum,BaseEnum,MaskGroundediceLevelsetEnum}; femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],3); } Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (revision 17554) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (revision 17555) @@ -87,5 +87,5 @@ /*Fetch data:*/ - iomodel->FetchData(6,MeshXEnum,MeshYEnum,MeshZEnum,BedEnum,ThicknessEnum,MaskIceLevelsetEnum); + iomodel->FetchData(6,MeshXEnum,MeshYEnum,MeshZEnum,BaseEnum,ThicknessEnum,MaskIceLevelsetEnum); CreateNumberNodeToElementConnectivity(iomodel); @@ -95,4 +95,4 @@ /*Free data: */ - iomodel->DeleteData(6,MeshXEnum,MeshYEnum,MeshZEnum,BedEnum,ThicknessEnum,MaskIceLevelsetEnum); + iomodel->DeleteData(6,MeshXEnum,MeshYEnum,MeshZEnum,BaseEnum,ThicknessEnum,MaskIceLevelsetEnum); } Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp (revision 17554) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp (revision 17555) @@ -15,5 +15,5 @@ if(isgroundingline){ - iomodel->FetchDataToInput(elements,BathymetryEnum); + iomodel->FetchDataToInput(elements,BedEnum); } } Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 17554) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 17555) @@ -41,6 +41,6 @@ BasalforcingsMeltingRateCorrectionEnum, BasalforcingsMeltingRateEnum, - BathymetryEnum, BedEnum, + BaseEnum, ConstantsGEnum, ConstantsReferencetemperatureEnum, @@ -480,5 +480,5 @@ QmuVzEnum, QmuThicknessEnum, - QmuBedEnum, + QmuBaseEnum, QmuSurfaceEnum, QmuMeltingEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 17554) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 17555) @@ -49,6 +49,6 @@ case BasalforcingsMeltingRateCorrectionEnum : return "BasalforcingsMeltingRateCorrection"; case BasalforcingsMeltingRateEnum : return "BasalforcingsMeltingRate"; - case BathymetryEnum : return "Bathymetry"; case BedEnum : return "Bed"; + case BaseEnum : return "Base"; case ConstantsGEnum : return "ConstantsG"; case ConstantsReferencetemperatureEnum : return "ConstantsReferencetemperature"; @@ -469,5 +469,5 @@ case QmuVzEnum : return "QmuVz"; case QmuThicknessEnum : return "QmuThickness"; - case QmuBedEnum : return "QmuBed"; + case QmuBaseEnum : return "QmuBase"; case QmuSurfaceEnum : return "QmuSurface"; case QmuMeltingEnum : return "QmuMelting"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 17554) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 17555) @@ -49,6 +49,6 @@ else if (strcmp(name,"BasalforcingsMeltingRateCorrection")==0) return BasalforcingsMeltingRateCorrectionEnum; else if (strcmp(name,"BasalforcingsMeltingRate")==0) return BasalforcingsMeltingRateEnum; - else if (strcmp(name,"Bathymetry")==0) return BathymetryEnum; else if (strcmp(name,"Bed")==0) return BedEnum; + else if (strcmp(name,"Base")==0) return BaseEnum; else if (strcmp(name,"ConstantsG")==0) return ConstantsGEnum; else if (strcmp(name,"ConstantsReferencetemperature")==0) return ConstantsReferencetemperatureEnum; @@ -478,5 +478,5 @@ else if (strcmp(name,"QmuVz")==0) return QmuVzEnum; else if (strcmp(name,"QmuThickness")==0) return QmuThicknessEnum; - else if (strcmp(name,"QmuBed")==0) return QmuBedEnum; + else if (strcmp(name,"QmuBase")==0) return QmuBaseEnum; else if (strcmp(name,"QmuSurface")==0) return QmuSurfaceEnum; else if (strcmp(name,"QmuMelting")==0) return QmuMeltingEnum; Index: /issm/trunk-jpl/src/m/classes/geometry.m =================================================================== --- /issm/trunk-jpl/src/m/classes/geometry.m (revision 17554) +++ /issm/trunk-jpl/src/m/classes/geometry.m (revision 17555) @@ -53,6 +53,6 @@ WriteData(fid,'data',obj.surface,'format','DoubleMat','mattype',1,'enum',SurfaceEnum()); WriteData(fid,'data',obj.thickness,'format','DoubleMat','mattype',1,'enum',ThicknessEnum(),'forcinglength',md.mesh.numberofvertices+1); - WriteData(fid,'data',obj.bed,'format','DoubleMat','mattype',1,'enum',BedEnum()); - WriteData(fid,'data',obj.bathymetry,'format','DoubleMat','mattype',1,'enum',BathymetryEnum()); + WriteData(fid,'data',obj.bed,'format','DoubleMat','mattype',1,'enum',BaseEnum()); + WriteData(fid,'data',obj.bathymetry,'format','DoubleMat','mattype',1,'enum',BedEnum()); WriteData(fid,'object',obj,'fieldname','hydrostatic_ratio','format','DoubleMat','mattype',1); end % }}} Index: /issm/trunk-jpl/src/m/classes/geometry.py =================================================================== --- /issm/trunk-jpl/src/m/classes/geometry.py (revision 17554) +++ /issm/trunk-jpl/src/m/classes/geometry.py (revision 17555) @@ -51,6 +51,6 @@ WriteData(fid,'data',self.surface,'format','DoubleMat','mattype',1,'enum',SurfaceEnum()) WriteData(fid,'data',self.thickness,'format','DoubleMat','mattype',1,'enum',ThicknessEnum(),'forcinglength',md.mesh.numberofvertices+1) - WriteData(fid,'data',self.bed,'format','DoubleMat','mattype',1,'enum',BedEnum()) - WriteData(fid,'data',self.bathymetry,'format','DoubleMat','mattype',1,'enum',BathymetryEnum()) + WriteData(fid,'data',self.bed,'format','DoubleMat','mattype',1,'enum',BaseEnum()) + WriteData(fid,'data',self.bathymetry,'format','DoubleMat','mattype',1,'enum',BedEnum()) WriteData(fid,'object',self,'fieldname','hydrostatic_ratio','format','DoubleMat','mattype',1) # }}} Index: /issm/trunk-jpl/src/m/classes/masstransport.m =================================================================== --- /issm/trunk-jpl/src/m/classes/masstransport.m (revision 17554) +++ /issm/trunk-jpl/src/m/classes/masstransport.m (revision 17555) @@ -63,5 +63,5 @@ function list = defaultoutputs(self,md) % {{{ - list = {'Thickness','Surface','Bed'}; + list = {'Thickness','Surface','Base'}; end % }}} Index: /issm/trunk-jpl/src/m/classes/masstransport.py =================================================================== --- /issm/trunk-jpl/src/m/classes/masstransport.py (revision 17554) +++ /issm/trunk-jpl/src/m/classes/masstransport.py (revision 17555) @@ -42,5 +42,5 @@ def defaultoutputs(self,md): # {{{ - return ['Thickness','Surface','Bed'] + return ['Thickness','Surface','Base'] #}}} Index: /issm/trunk-jpl/src/m/enum/BaseEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/BaseEnum.m (revision 17555) +++ /issm/trunk-jpl/src/m/enum/BaseEnum.m (revision 17555) @@ -0,0 +1,11 @@ +function macro=BaseEnum() +%BASEENUM - Enum of Base +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=BaseEnum() + +macro=StringToEnum('Base'); Index: sm/trunk-jpl/src/m/enum/BathymetryEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/BathymetryEnum.m (revision 17554) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=BathymetryEnum() -%BATHYMETRYENUM - Enum of Bathymetry -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh -% Please read src/c/shared/Enum/README for more information -% -% Usage: -% macro=BathymetryEnum() - -macro=StringToEnum('Bathymetry'); Index: /issm/trunk-jpl/src/m/enum/EnumDefinitions.py =================================================================== --- /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 17554) +++ /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 17555) @@ -41,6 +41,6 @@ def BasalforcingsMeltingRateCorrectionEnum(): return StringToEnum("BasalforcingsMeltingRateCorrection")[0] def BasalforcingsMeltingRateEnum(): return StringToEnum("BasalforcingsMeltingRate")[0] -def BathymetryEnum(): return StringToEnum("Bathymetry")[0] def BedEnum(): return StringToEnum("Bed")[0] +def BaseEnum(): return StringToEnum("Base")[0] def ConstantsGEnum(): return StringToEnum("ConstantsG")[0] def ConstantsReferencetemperatureEnum(): return StringToEnum("ConstantsReferencetemperature")[0] @@ -461,5 +461,5 @@ def QmuVzEnum(): return StringToEnum("QmuVz")[0] def QmuThicknessEnum(): return StringToEnum("QmuThickness")[0] -def QmuBedEnum(): return StringToEnum("QmuBed")[0] +def QmuBaseEnum(): return StringToEnum("QmuBase")[0] def QmuSurfaceEnum(): return StringToEnum("QmuSurface")[0] def QmuMeltingEnum(): return StringToEnum("QmuMelting")[0] Index: /issm/trunk-jpl/src/m/enum/QmuBaseEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/QmuBaseEnum.m (revision 17555) +++ /issm/trunk-jpl/src/m/enum/QmuBaseEnum.m (revision 17555) @@ -0,0 +1,11 @@ +function macro=QmuBaseEnum() +%QMUBASEENUM - Enum of QmuBase +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=QmuBaseEnum() + +macro=StringToEnum('QmuBase'); Index: sm/trunk-jpl/src/m/enum/QmuBedEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/QmuBedEnum.m (revision 17554) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=QmuBedEnum() -%QMUBEDENUM - Enum of QmuBed -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh -% Please read src/c/shared/Enum/README for more information -% -% Usage: -% macro=QmuBedEnum() - -macro=StringToEnum('QmuBed'); Index: /issm/trunk-jpl/test/NightlyRun/test110.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test110.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test110.m (revision 17555) @@ -18,5 +18,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -26,5 +26,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -34,5 +34,5 @@ (md.results.TransientSolution(3).Vel),... (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test110.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test110.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test110.py (revision 17555) @@ -27,5 +27,5 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -35,5 +35,5 @@ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ @@ -43,5 +43,5 @@ md.results.TransientSolution[2].Vel,\ md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test111.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test111.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test111.m (revision 17555) @@ -23,5 +23,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -34,5 +34,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -45,5 +45,5 @@ (md.results.TransientSolution(3).Vel),... (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test111.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test111.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test111.py (revision 17555) @@ -32,5 +32,5 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -43,5 +43,5 @@ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ @@ -54,5 +54,5 @@ md.results.TransientSolution[2].Vel,\ md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test1208.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1208.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test1208.m (revision 17555) @@ -30,5 +30,5 @@ %Fields and tolerances to track changes -field_names ={'Vx','Vy','Vz','Vel','Pressure','Thickness','Bed','Surface','Temperature','BasalforcingsMeltingRate'}; +field_names ={'Vx','Vy','Vz','Vel','Pressure','Thickness','Base','Surface','Temperature','BasalforcingsMeltingRate'}; field_tolerances={1e-08,1e-08,1e-07,1e-08,1e-08,1e-08,1e-08,1e-08,1e-07,3e-07}; field_values={... @@ -39,5 +39,5 @@ (md.results.TransientSolution(end).Pressure),... (md.results.TransientSolution(end).Thickness),... - (md.results.TransientSolution(end).Bed),... + (md.results.TransientSolution(end).Base),... (md.results.TransientSolution(end).Surface),... (md.results.TransientSolution(end).Temperature),... Index: /issm/trunk-jpl/test/NightlyRun/test1208.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1208.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test1208.py (revision 17555) @@ -43,5 +43,5 @@ #Fields and tolerances to track changes -field_names =['Vx','Vy','Vz','Vel','Pressure','Thickness','Bed','Surface','Temperature','BasalforcingsMeltingRate'] +field_names =['Vx','Vy','Vz','Vel','Pressure','Thickness','Base','Surface','Temperature','BasalforcingsMeltingRate'] field_tolerances=[1e-08,1e-08,1e-07,1e-08,1e-08,1e-08,1e-08,1e-08,1e-07,1e-07] field_values=[\ @@ -52,5 +52,5 @@ md.results.TransientSolution[-1].Pressure,\ md.results.TransientSolution[-1].Thickness,\ - md.results.TransientSolution[-1].Bed,\ + md.results.TransientSolution[-1].Base,\ md.results.TransientSolution[-1].Surface,\ md.results.TransientSolution[-1].Temperature,\ Index: /issm/trunk-jpl/test/NightlyRun/test122.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test122.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test122.m (revision 17555) @@ -26,5 +26,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -37,5 +37,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -48,5 +48,5 @@ (md.results.TransientSolution(3).Vel),... (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test122.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test122.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test122.py (revision 17555) @@ -35,5 +35,5 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -46,5 +46,5 @@ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ @@ -57,5 +57,5 @@ md.results.TransientSolution[2].Vel,\ md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test124.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test124.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test124.m (revision 17555) @@ -28,5 +28,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -35,5 +35,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -42,5 +42,5 @@ (md.results.TransientSolution(3).Vel),... (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test1501.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1501.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test1501.m (revision 17555) @@ -51,5 +51,5 @@ (md.results.TransientSolution(400).Vel),... (md.results.TransientSolution(400).Pressure),... - (md.results.TransientSolution(400).Bed),... + (md.results.TransientSolution(400).Base),... (md.results.TransientSolution(400).Surface),... (md.results.TransientSolution(400).Thickness),... @@ -59,5 +59,5 @@ (md.results.TransientSolution(800).Vel),... (md.results.TransientSolution(800).Pressure),... - (md.results.TransientSolution(800).Bed),... + (md.results.TransientSolution(800).Base),... (md.results.TransientSolution(800).Surface),... (md.results.TransientSolution(800).Thickness),... @@ -67,5 +67,5 @@ (md.results.TransientSolution(1200).Vel),... (md.results.TransientSolution(1200).Pressure),... - (md.results.TransientSolution(1200).Bed),... + (md.results.TransientSolution(1200).Base),... (md.results.TransientSolution(1200).Surface),... (md.results.TransientSolution(1200).Thickness),... @@ -75,5 +75,5 @@ (md.results.TransientSolution(1600).Vel),... (md.results.TransientSolution(1600).Pressure),... - (md.results.TransientSolution(1600).Bed),... + (md.results.TransientSolution(1600).Base),... (md.results.TransientSolution(1600).Surface),... (md.results.TransientSolution(1600).Thickness),... @@ -83,5 +83,5 @@ (md.results.TransientSolution(2000).Vel),... (md.results.TransientSolution(2000).Pressure),... - (md.results.TransientSolution(2000).Bed),... + (md.results.TransientSolution(2000).Base),... (md.results.TransientSolution(2000).Surface),... (md.results.TransientSolution(2000).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test1501.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1501.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test1501.py (revision 17555) @@ -64,5 +64,5 @@ md.results.TransientSolution[400-1].Vel,\ md.results.TransientSolution[400-1].Pressure,\ - md.results.TransientSolution[400-1].Bed,\ + md.results.TransientSolution[400-1].Base,\ md.results.TransientSolution[400-1].Surface,\ md.results.TransientSolution[400-1].Thickness,\ @@ -72,5 +72,5 @@ md.results.TransientSolution[800-1].Vel,\ md.results.TransientSolution[800-1].Pressure,\ - md.results.TransientSolution[800-1].Bed,\ + md.results.TransientSolution[800-1].Base,\ md.results.TransientSolution[800-1].Surface,\ md.results.TransientSolution[800-1].Thickness,\ @@ -80,5 +80,5 @@ md.results.TransientSolution[1200-1].Vel,\ md.results.TransientSolution[1200-1].Pressure,\ - md.results.TransientSolution[1200-1].Bed,\ + md.results.TransientSolution[1200-1].Base,\ md.results.TransientSolution[1200-1].Surface,\ md.results.TransientSolution[1200-1].Thickness,\ @@ -88,5 +88,5 @@ md.results.TransientSolution[1600-1].Vel,\ md.results.TransientSolution[1600-1].Pressure,\ - md.results.TransientSolution[1600-1].Bed,\ + md.results.TransientSolution[1600-1].Base,\ md.results.TransientSolution[1600-1].Surface,\ md.results.TransientSolution[1600-1].Thickness,\ @@ -96,5 +96,5 @@ md.results.TransientSolution[2000-1].Vel,\ md.results.TransientSolution[2000-1].Pressure,\ - md.results.TransientSolution[2000-1].Bed,\ + md.results.TransientSolution[2000-1].Base,\ md.results.TransientSolution[2000-1].Surface,\ md.results.TransientSolution[2000-1].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test1502.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1502.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test1502.m (revision 17555) @@ -53,5 +53,5 @@ (md.results.TransientSolution(400).Vel),... (md.results.TransientSolution(400).Pressure),... - (md.results.TransientSolution(400).Bed),... + (md.results.TransientSolution(400).Base),... (md.results.TransientSolution(400).Surface),... (md.results.TransientSolution(400).Thickness),... @@ -62,5 +62,5 @@ (md.results.TransientSolution(800).Vel),... (md.results.TransientSolution(800).Pressure),... - (md.results.TransientSolution(800).Bed),... + (md.results.TransientSolution(800).Base),... (md.results.TransientSolution(800).Surface),... (md.results.TransientSolution(800).Thickness),... @@ -71,5 +71,5 @@ (md.results.TransientSolution(1200).Vel),... (md.results.TransientSolution(1200).Pressure),... - (md.results.TransientSolution(1200).Bed),... + (md.results.TransientSolution(1200).Base),... (md.results.TransientSolution(1200).Surface),... (md.results.TransientSolution(1200).Thickness),... @@ -80,5 +80,5 @@ (md.results.TransientSolution(1600).Vel),... (md.results.TransientSolution(1600).Pressure),... - (md.results.TransientSolution(1600).Bed),... + (md.results.TransientSolution(1600).Base),... (md.results.TransientSolution(1600).Surface),... (md.results.TransientSolution(1600).Thickness),... @@ -89,5 +89,5 @@ (md.results.TransientSolution(2000).Vel),... (md.results.TransientSolution(2000).Pressure),... - (md.results.TransientSolution(2000).Bed),... + (md.results.TransientSolution(2000).Base),... (md.results.TransientSolution(2000).Surface),... (md.results.TransientSolution(2000).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test1502.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test1502.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test1502.py (revision 17555) @@ -66,5 +66,5 @@ md.results.TransientSolution[400-1].Vel,\ md.results.TransientSolution[400-1].Pressure,\ - md.results.TransientSolution[400-1].Bed,\ + md.results.TransientSolution[400-1].Base,\ md.results.TransientSolution[400-1].Surface,\ md.results.TransientSolution[400-1].Thickness,\ @@ -75,5 +75,5 @@ md.results.TransientSolution[800-1].Vel,\ md.results.TransientSolution[800-1].Pressure,\ - md.results.TransientSolution[800-1].Bed,\ + md.results.TransientSolution[800-1].Base,\ md.results.TransientSolution[800-1].Surface,\ md.results.TransientSolution[800-1].Thickness,\ @@ -84,5 +84,5 @@ md.results.TransientSolution[1200-1].Vel,\ md.results.TransientSolution[1200-1].Pressure,\ - md.results.TransientSolution[1200-1].Bed,\ + md.results.TransientSolution[1200-1].Base,\ md.results.TransientSolution[1200-1].Surface,\ md.results.TransientSolution[1200-1].Thickness,\ @@ -93,5 +93,5 @@ md.results.TransientSolution[1600-1].Vel,\ md.results.TransientSolution[1600-1].Pressure,\ - md.results.TransientSolution[1600-1].Bed,\ + md.results.TransientSolution[1600-1].Base,\ md.results.TransientSolution[1600-1].Surface,\ md.results.TransientSolution[1600-1].Thickness,\ @@ -102,5 +102,5 @@ md.results.TransientSolution[2000-1].Vel,\ md.results.TransientSolution[2000-1].Pressure,\ - md.results.TransientSolution[2000-1].Bed,\ + md.results.TransientSolution[2000-1].Base,\ md.results.TransientSolution[2000-1].Surface,\ md.results.TransientSolution[2000-1].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test208.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test208.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test208.m (revision 17555) @@ -14,5 +14,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -21,5 +21,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -28,5 +28,5 @@ (md.results.TransientSolution(3).Vel),... (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test208.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test208.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test208.py (revision 17555) @@ -27,5 +27,5 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -34,5 +34,5 @@ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ @@ -41,5 +41,5 @@ md.results.TransientSolution[2].Vel,\ md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test209.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test209.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test209.m (revision 17555) @@ -21,5 +21,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -31,5 +31,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -41,5 +41,5 @@ (md.results.TransientSolution(3).Vel),... (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test209.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test209.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test209.py (revision 17555) @@ -35,5 +35,5 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -45,5 +45,5 @@ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ @@ -55,5 +55,5 @@ md.results.TransientSolution[2].Vel,\ md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test210.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test210.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test210.m (revision 17555) @@ -21,5 +21,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -31,5 +31,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -41,5 +41,5 @@ (md.results.TransientSolution(3).Vel),... (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test210.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test210.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test210.py (revision 17555) @@ -34,5 +34,5 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -44,5 +44,5 @@ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ @@ -54,5 +54,5 @@ md.results.TransientSolution[2].Vel,\ md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test211.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test211.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test211.m (revision 17555) @@ -23,5 +23,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -33,5 +33,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -43,5 +43,5 @@ (md.results.TransientSolution(3).Vel),... (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test211.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test211.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test211.py (revision 17555) @@ -36,5 +36,5 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -46,5 +46,5 @@ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ @@ -56,5 +56,5 @@ md.results.TransientSolution[2].Vel,\ md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test222.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test222.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test222.m (revision 17555) @@ -15,5 +15,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -22,5 +22,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -29,5 +29,5 @@ (md.results.TransientSolution(3).Vel),... (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test222.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test222.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test222.py (revision 17555) @@ -24,5 +24,5 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -31,5 +31,5 @@ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ @@ -38,5 +38,5 @@ md.results.TransientSolution[2].Vel,\ md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test223.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test223.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test223.m (revision 17555) @@ -16,5 +16,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -23,5 +23,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -30,5 +30,5 @@ (md.results.TransientSolution(3).Vel),... (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test223.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test223.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test223.py (revision 17555) @@ -26,5 +26,5 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -33,5 +33,5 @@ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ @@ -40,5 +40,5 @@ md.results.TransientSolution[2].Vel,\ md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test224.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test224.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test224.m (revision 17555) @@ -22,5 +22,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -32,5 +32,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -42,5 +42,5 @@ (md.results.TransientSolution(3).Vel),... (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test224.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test224.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test224.py (revision 17555) @@ -31,5 +31,5 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -41,5 +41,5 @@ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ @@ -51,5 +51,5 @@ md.results.TransientSolution[2].Vel,\ md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test225.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test225.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test225.m (revision 17555) @@ -23,5 +23,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -33,5 +33,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -43,5 +43,5 @@ (md.results.TransientSolution(3).Vel),... (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test225.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test225.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test225.py (revision 17555) @@ -33,5 +33,5 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -43,5 +43,5 @@ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ @@ -53,5 +53,5 @@ md.results.TransientSolution[2].Vel,\ md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test226.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test226.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test226.m (revision 17555) @@ -16,5 +16,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -23,5 +23,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -30,5 +30,5 @@ (md.results.TransientSolution(3).Vel),... (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test226.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test226.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test226.py (revision 17555) @@ -25,5 +25,5 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -32,5 +32,5 @@ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ @@ -39,5 +39,5 @@ md.results.TransientSolution[2].Vel,\ md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test227.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test227.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test227.m (revision 17555) @@ -23,5 +23,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -33,5 +33,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -43,5 +43,5 @@ (md.results.TransientSolution(3).Vel),... (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test227.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test227.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test227.py (revision 17555) @@ -32,5 +32,5 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -42,5 +42,5 @@ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ @@ -52,5 +52,5 @@ md.results.TransientSolution[2].Vel,\ md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test228.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test228.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test228.m (revision 17555) @@ -33,5 +33,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -41,5 +41,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -49,5 +49,5 @@ (md.results.TransientSolution(3).Vel),... (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... @@ -57,5 +57,5 @@ (md.results.TransientSolution(4).Vel),... (md.results.TransientSolution(4).Pressure),... - (md.results.TransientSolution(4).Bed),... + (md.results.TransientSolution(4).Base),... (md.results.TransientSolution(4).Surface),... (md.results.TransientSolution(4).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test228.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test228.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test228.py (revision 17555) @@ -42,5 +42,5 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -50,5 +50,5 @@ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ @@ -58,5 +58,5 @@ md.results.TransientSolution[2].Vel,\ md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ @@ -66,5 +66,5 @@ md.results.TransientSolution[3].Vel,\ md.results.TransientSolution[3].Pressure,\ - md.results.TransientSolution[3].Bed,\ + md.results.TransientSolution[3].Base,\ md.results.TransientSolution[3].Surface,\ md.results.TransientSolution[3].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test229.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test229.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test229.m (revision 17555) @@ -33,5 +33,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -41,5 +41,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -49,5 +49,5 @@ (md.results.TransientSolution(3).Vel),... (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... @@ -57,5 +57,5 @@ (md.results.TransientSolution(4).Vel),... (md.results.TransientSolution(4).Pressure),... - (md.results.TransientSolution(4).Bed),... + (md.results.TransientSolution(4).Base),... (md.results.TransientSolution(4).Surface),... (md.results.TransientSolution(4).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test229.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test229.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test229.py (revision 17555) @@ -42,5 +42,5 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -50,5 +50,5 @@ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ @@ -58,5 +58,5 @@ md.results.TransientSolution[2].Vel,\ md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ @@ -66,5 +66,5 @@ md.results.TransientSolution[3].Vel,\ md.results.TransientSolution[3].Pressure,\ - md.results.TransientSolution[3].Bed,\ + md.results.TransientSolution[3].Base,\ md.results.TransientSolution[3].Surface,\ md.results.TransientSolution[3].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test230.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test230.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test230.m (revision 17555) @@ -35,5 +35,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -44,5 +44,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -53,5 +53,5 @@ (md.results.TransientSolution(3).Vel),... (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... @@ -62,5 +62,5 @@ (md.results.TransientSolution(4).Vel),... (md.results.TransientSolution(4).Pressure),... - (md.results.TransientSolution(4).Bed),... + (md.results.TransientSolution(4).Base),... (md.results.TransientSolution(4).Surface),... (md.results.TransientSolution(4).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test230.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test230.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test230.py (revision 17555) @@ -44,5 +44,5 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -53,5 +53,5 @@ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ @@ -62,5 +62,5 @@ md.results.TransientSolution[2].Vel,\ md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ @@ -71,5 +71,5 @@ md.results.TransientSolution[3].Vel,\ md.results.TransientSolution[3].Pressure,\ - md.results.TransientSolution[3].Bed,\ + md.results.TransientSolution[3].Base,\ md.results.TransientSolution[3].Surface,\ md.results.TransientSolution[3].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test231.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test231.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test231.m (revision 17555) @@ -35,5 +35,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -44,5 +44,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -53,5 +53,5 @@ (md.results.TransientSolution(3).Vel),... (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... @@ -62,5 +62,5 @@ (md.results.TransientSolution(4).Vel),... (md.results.TransientSolution(4).Pressure),... - (md.results.TransientSolution(4).Bed),... + (md.results.TransientSolution(4).Base),... (md.results.TransientSolution(4).Surface),... (md.results.TransientSolution(4).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test231.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test231.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test231.py (revision 17555) @@ -44,5 +44,5 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -53,5 +53,5 @@ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ @@ -62,5 +62,5 @@ md.results.TransientSolution[2].Vel,\ md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ @@ -71,5 +71,5 @@ md.results.TransientSolution[3].Vel,\ md.results.TransientSolution[3].Pressure,\ - md.results.TransientSolution[3].Bed,\ + md.results.TransientSolution[3].Base,\ md.results.TransientSolution[3].Surface,\ md.results.TransientSolution[3].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test233.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test233.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test233.m (revision 17555) @@ -25,5 +25,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -35,5 +35,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -45,5 +45,5 @@ (md.results.TransientSolution(3).Vel),... (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... @@ -55,5 +55,5 @@ (md.results.TransientSolution(4).Vel),... (md.results.TransientSolution(4).Pressure),... - (md.results.TransientSolution(4).Bed),... + (md.results.TransientSolution(4).Base),... (md.results.TransientSolution(4).Surface),... (md.results.TransientSolution(4).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test233.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test233.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test233.py (revision 17555) @@ -35,5 +35,5 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -45,5 +45,5 @@ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ @@ -55,5 +55,5 @@ md.results.TransientSolution[2].Vel,\ md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ @@ -65,5 +65,5 @@ md.results.TransientSolution[3].Vel,\ md.results.TransientSolution[3].Pressure,\ - md.results.TransientSolution[3].Bed,\ + md.results.TransientSolution[3].Base,\ md.results.TransientSolution[3].Surface,\ md.results.TransientSolution[3].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test236.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test236.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test236.m (revision 17555) @@ -60,5 +60,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -69,5 +69,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -78,5 +78,5 @@ (md.results.TransientSolution(3).Vel),... (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test236.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test236.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test236.py (revision 17555) @@ -71,5 +71,5 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -80,5 +80,5 @@ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ @@ -89,5 +89,5 @@ md.results.TransientSolution[2].Vel,\ md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test237.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test237.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test237.m (revision 17555) @@ -67,5 +67,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -79,5 +79,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -91,5 +91,5 @@ (md.results.TransientSolution(3).Vel),... (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test237.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test237.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test237.py (revision 17555) @@ -79,5 +79,5 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -91,5 +91,5 @@ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ @@ -103,5 +103,5 @@ md.results.TransientSolution[2].Vel,\ md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test3010.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3010.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test3010.m (revision 17555) @@ -21,5 +21,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -29,5 +29,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -37,5 +37,5 @@ (md.results.TransientSolution(3).Vel),... (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test3010.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3010.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test3010.py (revision 17555) @@ -29,5 +29,5 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -37,5 +37,5 @@ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ @@ -45,5 +45,5 @@ md.results.TransientSolution[2].Vel,\ md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test3110.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3110.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test3110.m (revision 17555) @@ -21,5 +21,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -29,5 +29,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -37,5 +37,5 @@ (md.results.TransientSolution(3).Vel),... (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test3110.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3110.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test3110.py (revision 17555) @@ -29,5 +29,5 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -37,5 +37,5 @@ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ @@ -45,5 +45,5 @@ md.results.TransientSolution[2].Vel,\ md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test314.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test314.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test314.m (revision 17555) @@ -14,5 +14,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -21,5 +21,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -28,5 +28,5 @@ (md.results.TransientSolution(3).Vel),... (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test314.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test314.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test314.py (revision 17555) @@ -23,5 +23,5 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -30,5 +30,5 @@ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ @@ -37,5 +37,5 @@ md.results.TransientSolution[2].Vel,\ md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test315.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test315.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test315.m (revision 17555) @@ -20,5 +20,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -30,5 +30,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -40,5 +40,5 @@ (md.results.TransientSolution(3).Vel),... (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test315.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test315.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test315.py (revision 17555) @@ -29,5 +29,5 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -39,5 +39,5 @@ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ @@ -49,5 +49,5 @@ md.results.TransientSolution[2].Vel,\ md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test316.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test316.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test316.m (revision 17555) @@ -14,5 +14,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -21,5 +21,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -28,5 +28,5 @@ (md.results.TransientSolution(3).Vel),... (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test316.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test316.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test316.py (revision 17555) @@ -23,5 +23,5 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -30,5 +30,5 @@ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ @@ -37,5 +37,5 @@ md.results.TransientSolution[2].Vel,\ md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test317.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test317.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test317.m (revision 17555) @@ -20,5 +20,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -30,5 +30,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -40,5 +40,5 @@ (md.results.TransientSolution(3).Vel),... (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test317.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test317.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test317.py (revision 17555) @@ -29,5 +29,5 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -39,5 +39,5 @@ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ @@ -49,5 +49,5 @@ md.results.TransientSolution[2].Vel,\ md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test323.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test323.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test323.m (revision 17555) @@ -16,5 +16,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -23,5 +23,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -30,5 +30,5 @@ (md.results.TransientSolution(3).Vel),... (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test323.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test323.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test323.py (revision 17555) @@ -26,5 +26,5 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -33,5 +33,5 @@ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ @@ -40,5 +40,5 @@ md.results.TransientSolution[2].Vel,\ md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test324.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test324.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test324.m (revision 17555) @@ -22,5 +22,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -32,5 +32,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -42,5 +42,5 @@ % (md.results.TransientSolution(3).Vel),... % (md.results.TransientSolution(3).Pressure),... -% (md.results.TransientSolution(3).Bed),... +% (md.results.TransientSolution(3).Base),... % (md.results.TransientSolution(3).Surface),... % (md.results.TransientSolution(3).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test324.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test324.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test324.py (revision 17555) @@ -32,5 +32,5 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -42,5 +42,5 @@ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ @@ -52,5 +52,5 @@ # md.results.TransientSolution[2].Vel,\ # md.results.TransientSolution[2].Pressure,\ -# md.results.TransientSolution[2].Bed,\ +# md.results.TransientSolution[2].Base,\ # md.results.TransientSolution[2].Surface,\ # md.results.TransientSolution[2].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test327.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test327.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test327.m (revision 17555) @@ -29,5 +29,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -40,5 +40,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -51,5 +51,5 @@ (md.results.TransientSolution(3).Vel),... (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test327.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test327.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test327.py (revision 17555) @@ -37,5 +37,5 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -48,5 +48,5 @@ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ @@ -59,5 +59,5 @@ md.results.TransientSolution[2].Vel,\ md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test328.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test328.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test328.m (revision 17555) @@ -19,5 +19,5 @@ (md.results.TransientSolution(1).Vy),... (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -27,5 +27,5 @@ (md.results.TransientSolution(2).Vy),... (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -35,5 +35,5 @@ (md.results.TransientSolution(3).Vy),... (md.results.TransientSolution(3).Vel),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test328.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test328.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test328.py (revision 17555) @@ -30,5 +30,5 @@ md.results.TransientSolution[0].Vy,\ md.results.TransientSolution[0].Vel,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -38,5 +38,5 @@ md.results.TransientSolution[1].Vy,\ md.results.TransientSolution[1].Vel,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ @@ -46,5 +46,5 @@ md.results.TransientSolution[2].Vy,\ md.results.TransientSolution[2].Vel,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test329.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test329.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test329.m (revision 17555) @@ -23,5 +23,5 @@ (md.results.TransientSolution(1).Vz),... (md.results.TransientSolution(1).Vel),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -33,5 +33,5 @@ (md.results.TransientSolution(2).Vz),... (md.results.TransientSolution(2).Vel),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -43,5 +43,5 @@ (md.results.TransientSolution(3).Vz),... (md.results.TransientSolution(3).Vel),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test329.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test329.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test329.py (revision 17555) @@ -34,5 +34,5 @@ md.results.TransientSolution[0].Vz,\ md.results.TransientSolution[0].Vel,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -44,5 +44,5 @@ md.results.TransientSolution[1].Vz,\ md.results.TransientSolution[1].Vel,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ @@ -54,5 +54,5 @@ md.results.TransientSolution[2].Vz,\ md.results.TransientSolution[2].Vel,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test408.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test408.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test408.m (revision 17555) @@ -14,5 +14,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -21,5 +21,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -28,5 +28,5 @@ (md.results.TransientSolution(3).Vel),... (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test408.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test408.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test408.py (revision 17555) @@ -24,5 +24,5 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -31,5 +31,5 @@ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ @@ -38,5 +38,5 @@ md.results.TransientSolution[2].Vel,\ md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test409.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test409.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test409.m (revision 17555) @@ -21,5 +21,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -31,5 +31,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -41,5 +41,5 @@ (md.results.TransientSolution(3).Vel),... (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test409.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test409.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test409.py (revision 17555) @@ -31,5 +31,5 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -41,5 +41,5 @@ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ @@ -51,5 +51,5 @@ md.results.TransientSolution[2].Vel,\ md.results.TransientSolution[2].Pressure,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test424.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test424.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test424.m (revision 17555) @@ -26,5 +26,5 @@ 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13}; field_values={... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -32,5 +32,5 @@ (md.results.TransientSolution(1).IceVolume),... (md.results.TransientSolution(1).IceVolumeAboveFloatation),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -38,5 +38,5 @@ (md.results.TransientSolution(2).IceVolume),... (md.results.TransientSolution(2).IceVolumeAboveFloatation),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test424.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test424.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test424.py (revision 17555) @@ -36,5 +36,5 @@ 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] field_values=[\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -42,5 +42,5 @@ md.results.TransientSolution[0].IceVolume,\ md.results.TransientSolution[0].IceVolumeAboveFloatation,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ @@ -48,5 +48,5 @@ md.results.TransientSolution[1].IceVolume,\ md.results.TransientSolution[1].IceVolumeAboveFloatation,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test425.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test425.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test425.m (revision 17555) @@ -25,13 +25,13 @@ 1e-13,1e-13,1e-13,1e-13}; field_values={... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... (md.results.TransientSolution(1).MaskGroundediceLevelset),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... (md.results.TransientSolution(2).MaskGroundediceLevelset),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test425.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test425.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test425.py (revision 17555) @@ -35,13 +35,13 @@ 1e-13,1e-13,1e-13,1e-13] field_values=[\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ md.results.TransientSolution[0].MaskGroundediceLevelset,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ md.results.TransientSolution[1].MaskGroundediceLevelset,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test426.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test426.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test426.m (revision 17555) @@ -27,5 +27,5 @@ 1e-10,1e-10,1e-10,5e-11,2e-12,5e-12}; field_values={... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -33,5 +33,5 @@ (md.results.TransientSolution(1).IceVolume),... (md.results.TransientSolution(1).IceVolumeAboveFloatation),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -39,5 +39,5 @@ (md.results.TransientSolution(2).IceVolume),... (md.results.TransientSolution(2).IceVolumeAboveFloatation),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test426.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test426.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test426.py (revision 17555) @@ -39,5 +39,5 @@ field_values=[\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -45,5 +45,5 @@ md.results.TransientSolution[0].IceVolume,\ md.results.TransientSolution[0].IceVolumeAboveFloatation,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ @@ -51,5 +51,5 @@ md.results.TransientSolution[1].IceVolume,\ md.results.TransientSolution[1].IceVolumeAboveFloatation,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test427.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test427.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test427.m (revision 17555) @@ -26,13 +26,13 @@ 1e-10,3e-11,1e-10,7e-11}; field_values={... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... (md.results.TransientSolution(1).MaskGroundediceLevelset),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... (md.results.TransientSolution(2).MaskGroundediceLevelset),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test427.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test427.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test427.py (revision 17555) @@ -36,13 +36,13 @@ 1e-10,1e-11,1e-10,1e-13] field_values=[\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ md.results.TransientSolution[0].MaskGroundediceLevelset,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ md.results.TransientSolution[1].MaskGroundediceLevelset,\ - md.results.TransientSolution[2].Bed,\ + md.results.TransientSolution[2].Base,\ md.results.TransientSolution[2].Surface,\ md.results.TransientSolution[2].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test435.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test435.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test435.m (revision 17555) @@ -51,5 +51,5 @@ 1e-10,3e-11,1e-10,7e-11,1e-09,1e-08,1e-09,1e-11}; field_values={... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -59,5 +59,5 @@ (md.results.TransientSolution(1).Vz),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -67,5 +67,5 @@ (md.results.TransientSolution(2).Vz),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test504.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test504.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test504.m (revision 17555) @@ -14,5 +14,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -21,5 +21,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test504.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test504.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test504.py (revision 17555) @@ -23,5 +23,5 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -30,5 +30,5 @@ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test505.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test505.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test505.m (revision 17555) @@ -18,5 +18,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -28,5 +28,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test505.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test505.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test505.py (revision 17555) @@ -27,5 +27,5 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -37,5 +37,5 @@ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test506.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test506.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test506.m (revision 17555) @@ -18,5 +18,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -28,5 +28,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test506.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test506.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test506.py (revision 17555) @@ -27,5 +27,5 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -37,5 +37,5 @@ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test507.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test507.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test507.m (revision 17555) @@ -17,5 +17,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -27,5 +27,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... Index: /issm/trunk-jpl/test/NightlyRun/test507.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test507.py (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test507.py (revision 17555) @@ -26,5 +26,5 @@ md.results.TransientSolution[0].Vel,\ md.results.TransientSolution[0].Pressure,\ - md.results.TransientSolution[0].Bed,\ + md.results.TransientSolution[0].Base,\ md.results.TransientSolution[0].Surface,\ md.results.TransientSolution[0].Thickness,\ @@ -36,5 +36,5 @@ md.results.TransientSolution[1].Vel,\ md.results.TransientSolution[1].Pressure,\ - md.results.TransientSolution[1].Bed,\ + md.results.TransientSolution[1].Base,\ md.results.TransientSolution[1].Surface,\ md.results.TransientSolution[1].Thickness,\ Index: /issm/trunk-jpl/test/NightlyRun/test703.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test703.m (revision 17554) +++ /issm/trunk-jpl/test/NightlyRun/test703.m (revision 17555) @@ -85,5 +85,5 @@ (md.results.TransientSolution(1).Vel),... (md.results.TransientSolution(1).Pressure),... - (md.results.TransientSolution(1).Bed),... + (md.results.TransientSolution(1).Base),... (md.results.TransientSolution(1).Surface),... (md.results.TransientSolution(1).Thickness),... @@ -92,5 +92,5 @@ (md.results.TransientSolution(2).Vel),... (md.results.TransientSolution(2).Pressure),... - (md.results.TransientSolution(2).Bed),... + (md.results.TransientSolution(2).Base),... (md.results.TransientSolution(2).Surface),... (md.results.TransientSolution(2).Thickness),... @@ -99,5 +99,5 @@ (md.results.TransientSolution(3).Vel),... (md.results.TransientSolution(3).Pressure),... - (md.results.TransientSolution(3).Bed),... + (md.results.TransientSolution(3).Base),... (md.results.TransientSolution(3).Surface),... (md.results.TransientSolution(3).Thickness),... @@ -106,5 +106,5 @@ (md1.results.TransientSolution(1).Vel),... (md1.results.TransientSolution(1).Pressure),... - (md1.results.TransientSolution(1).Bed),... + (md1.results.TransientSolution(1).Base),... (md1.results.TransientSolution(1).Surface),... (md1.results.TransientSolution(1).Thickness),... @@ -113,5 +113,5 @@ (md1.results.TransientSolution(2).Vel),... (md1.results.TransientSolution(2).Pressure),... - (md1.results.TransientSolution(2).Bed),... + (md1.results.TransientSolution(2).Base),... (md1.results.TransientSolution(2).Surface),... (md1.results.TransientSolution(2).Thickness),... @@ -120,5 +120,5 @@ (md1.results.TransientSolution(3).Vel),... (md1.results.TransientSolution(3).Pressure),... - (md1.results.TransientSolution(3).Bed),... + (md1.results.TransientSolution(3).Base),... (md1.results.TransientSolution(3).Surface),... (md1.results.TransientSolution(3).Thickness),...