Index: /issm/trunk-jpl/src/c/analyses/HydrologyGlaDSAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/HydrologyGlaDSAnalysis.cpp (revision 27935) +++ /issm/trunk-jpl/src/c/analyses/HydrologyGlaDSAnalysis.cpp (revision 27936) @@ -146,7 +146,4 @@ iomodel->FetchDataToInput(inputs,elements,"md.hydrology.bump_height",HydrologyBumpHeightEnum); iomodel->FetchDataToInput(inputs,elements,"md.hydrology.sheet_conductivity",HydrologySheetConductivityEnum); - iomodel->FetchDataToInput(inputs,elements,"md.hydrology.omega",HydrologyOmegaEnum); - iomodel->FetchDataToInput(inputs,elements,"md.hydrology.sheet_alpha",HydrologySheetAlphaEnum); - iomodel->FetchDataToInput(inputs,elements,"md.hydrology.sheet_beta",HydrologySheetBetaEnum); iomodel->FetchDataToInput(inputs,elements,"md.hydrology.channel_conductivity",HydrologyChannelConductivityEnum); iomodel->FetchDataToInput(inputs,elements,"md.hydrology.neumannflux",HydrologyNeumannfluxEnum); @@ -188,5 +185,8 @@ parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.channel_alpha",HydrologyChannelAlphaEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.channel_beta",HydrologyChannelBetaEnum)); - parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.islaminar",HydrologyIsLaminarEnum)); + parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.sheet_alpha",HydrologySheetAlphaEnum)); + parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.sheet_beta",HydrologySheetBetaEnum)); + parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.omega",HydrologyOmegaEnum)); + parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.istransition",HydrologyIsTransitionEnum)); parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.englacial_void_ratio",HydrologyEnglacialVoidRatioEnum)); @@ -222,11 +222,7 @@ /*Intermediaries */ IssmDouble Jdet,dphi[3],h,k; - IssmDouble alpha,beta,omega,h_r; + IssmDouble h_r; IssmDouble A,B,n,phi_old,phi,phi_0,H,b,v1; IssmDouble* xyz_list = NULL; - - /*Hard coded coefficients*/ - const IssmPDouble ALPHA = 5./4.; - const IssmPDouble BETA = 3./2.; /*Fetch number of nodes and dof for this finite element*/ @@ -242,6 +238,9 @@ /*Get all inputs and parameters*/ - bool islaminar; - element->FindParam(&islaminar,HydrologyIsLaminarEnum); + bool istransition; + element->FindParam(&istransition,HydrologyIsTransitionEnum); + IssmDouble alpha = element->FindParam(HydrologySheetAlphaEnum); + IssmDouble beta = element->FindParam(HydrologySheetBetaEnum); + IssmDouble omega = element->FindParam(HydrologyOmegaEnum); IssmDouble dt = element->FindParam(TimesteppingTimeStepEnum); IssmDouble rho_water = element->FindParam(MaterialsRhoFreshwaterEnum); @@ -252,7 +251,4 @@ Input* hr_input = element->GetInput(HydrologyBumpHeightEnum);_assert_(hr_input); Input* k_input = element->GetInput(HydrologySheetConductivityEnum);_assert_(k_input); - Input* alpha_input = element->GetInput(HydrologySheetAlphaEnum);_assert_(alpha_input); - Input* beta_input = element->GetInput(HydrologySheetBetaEnum);_assert_(beta_input); - Input* omega_input = element->GetInput(HydrologyOmegaEnum);_assert_(omega_input); Input* phi_input = element->GetInput(HydraulicPotentialEnum); _assert_(phi_input); Input* h_input = element->GetInput(HydrologySheetThicknessEnum); _assert_(h_input); @@ -274,7 +270,4 @@ h_input->GetInputValue(&h,gauss); k_input->GetInputValue(&k,gauss); - omega_input->GetInputValue(&omega,gauss); - alpha_input->GetInputValue(&alpha,gauss); - beta_input->GetInputValue(&beta,gauss); B_input->GetInputValue(&B,gauss); n_input->GetInputValue(&n,gauss); @@ -290,8 +283,8 @@ if(normgradphi < AEPS) normgradphi = AEPS; - /*Use Laminar flow if specified*/ + /*Use transition model if specified*/ IssmDouble nu = mu_water/rho_water; IssmDouble coeff; - if(islaminar==1 && omega>=AEPS){ + if(istransition==1 && omega>=AEPS){ IssmDouble hratio = fabs(h/h_r); IssmDouble coarg = 1. + 4.*pow(hratio,3-2*alpha)*omega*k*pow(h,3)*normgradphi/nu; @@ -300,5 +293,5 @@ else { /*If omega is zero, use standard model, otherwise transition model*/ - coeff = k*pow(h,ALPHA)*pow(normgradphi,BETA-2.); + coeff = k*pow(h,alpha)*pow(normgradphi,beta-2.); } @@ -468,11 +461,7 @@ /*Intermediaries*/ IssmDouble dphi[3],h,k,phi; - IssmDouble alpha,beta,omega,h_r; + IssmDouble h_r; IssmDouble oceanLS,iceLS; IssmDouble* xyz_list = NULL; - - /*Hard coded coefficients*/ - const IssmPDouble ALPHA = 5./4.; - const IssmPDouble BETA = 3./2.; /*Fetch number vertices for this element*/ @@ -495,13 +484,13 @@ /*Retrieve all inputs and parameters*/ - bool islaminar; - element->FindParam(&islaminar,HydrologyIsLaminarEnum); + bool istransition; + element->FindParam(&istransition,HydrologyIsTransitionEnum); + IssmDouble alpha = element->FindParam(HydrologySheetAlphaEnum); + IssmDouble beta = element->FindParam(HydrologySheetBetaEnum); + IssmDouble omega = element->FindParam(HydrologyOmegaEnum); element->GetVerticesCoordinates(&xyz_list); IssmDouble rho_water = element->FindParam(MaterialsRhoFreshwaterEnum); IssmDouble mu_water = element->FindParam(MaterialsMuWaterEnum); Input *k_input = element->GetInput(HydrologySheetConductivityEnum); _assert_(k_input); - Input *omega_input = element->GetInput(HydrologyOmegaEnum); _assert_(omega_input); - Input *alpha_input = element->GetInput(HydrologySheetAlphaEnum); _assert_(alpha_input); - Input *beta_input = element->GetInput(HydrologySheetBetaEnum); _assert_(beta_input); Input *phi_input = element->GetInput(HydraulicPotentialEnum); _assert_(phi_input); Input *hr_input = element->GetInput(HydrologyBumpHeightEnum); _assert_(hr_input); @@ -521,7 +510,4 @@ hr_input->GetInputValue(&h_r,gauss); k_input->GetInputValue(&k,gauss); - omega_input->GetInputValue(&omega,gauss); - alpha_input->GetInputValue(&alpha,gauss); - beta_input->GetInputValue(&beta,gauss); oceanLS_input->GetInputValue(&oceanLS,gauss); iceLS_input->GetInputValue(&iceLS,gauss); @@ -541,5 +527,5 @@ IssmDouble nu = mu_water/rho_water; IssmDouble coeff; - if(islaminar==1 && omega>=AEPS){ + if(istransition==1 && omega>=AEPS){ IssmDouble hratio = fabs(h/h_r); IssmDouble coarg = 1. + 4.*pow(hratio,3-2*alpha)*omega*k*pow(h,3)*normgradphi/nu; @@ -548,5 +534,5 @@ } else { - coeff = k*pow(h,ALPHA)*pow(normgradphi,BETA-2.)/max(AEPS,h); // divide by h to get speed instead of discharge + coeff = k*pow(h,alpha)*pow(normgradphi,beta-2.)/max(AEPS,h); // divide by h to get speed instead of discharge } Index: /issm/trunk-jpl/src/c/classes/Loads/Channel.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Loads/Channel.cpp (revision 27935) +++ /issm/trunk-jpl/src/c/classes/Loads/Channel.cpp (revision 27936) @@ -20,9 +20,4 @@ #define C_W 4.22e3 /*specific heat capacity of water (J/kg/K)*/ -#define ALPHA_C 5./4. -#define BETA_C 3./2. -/*Make sure these are the same as in HydrologyGlaDSAnalysis::CreateKMatrix*/ -#define ALPHA_S 5./4. -#define BETA_S 3./2. #define AEPS 2.2204460492503131E-015 @@ -367,5 +362,5 @@ IssmDouble Jdet,v1,qc,fFactor,Afactor,Bfactor,Xifactor; IssmDouble A,B,n,phi_old,phi,phi_0,dPw,ks,kc,Ngrad; - IssmDouble alpha_s,beta_s,omega,h_r; + IssmDouble h_r; IssmDouble H,h,b,dphi[2],dphids,dphimds,db[2],dbds; IssmDouble xyz_list[NUMVERTICES][3]; @@ -383,6 +378,6 @@ GetVerticesCoordinates(&xyz_list_tria[0][0],tria->vertices,3); - bool islaminar; - element->FindParam(&islaminar,HydrologyIsLaminarEnum); + bool istransition; + element->FindParam(&istransition,HydrologyIsTransitionEnum); IssmDouble L = element->FindParam(MaterialsLatentheatEnum); IssmDouble mu_water = element->FindParam(MaterialsMuWaterEnum); @@ -394,4 +389,7 @@ IssmDouble alpha_c = element->FindParam(HydrologyChannelAlphaEnum); IssmDouble beta_c = element->FindParam(HydrologyChannelBetaEnum); + IssmDouble alpha_s = element->FindParam(HydrologySheetAlphaEnum); + IssmDouble beta_s = element->FindParam(HydrologySheetBetaEnum); + IssmDouble omega = element->FindParam(HydrologyOmegaEnum); Input* h_input = element->GetInput(HydrologySheetThicknessEnum); _assert_(h_input); @@ -402,7 +400,4 @@ Input* ks_input = element->GetInput(HydrologySheetConductivityEnum); _assert_(ks_input); Input* kc_input = element->GetInput(HydrologyChannelConductivityEnum); _assert_(kc_input); - Input* omega_input = element->GetInput(HydrologyOmegaEnum); _assert_(ks_input); - Input* alpha_s_input= element->GetInput(HydrologySheetAlphaEnum); _assert_(alpha_s_input); - Input* beta_s_input = element->GetInput(HydrologySheetBetaEnum); _assert_(beta_s_input); Input* hr_input = element->GetInput(HydrologyBumpHeightEnum);_assert_(hr_input); Input* phi_input = element->GetInput(HydraulicPotentialEnum); _assert_(phi_input); @@ -432,7 +427,4 @@ ks_input->GetInputValue(&ks,gauss); kc_input->GetInputValue(&kc,gauss); - alpha_s_input->GetInputValue(&alpha_s,gauss); - beta_s_input->GetInputValue(&beta_s,gauss); - omega_input->GetInputValue(&omega,gauss); hr_input->GetInputValue(&h_r,gauss); B_input->GetInputValue(&B,gauss); @@ -451,9 +443,9 @@ if(Ngrad=AEPS){ + if(istransition==1 && omega>=AEPS){ IssmDouble hratio = h/h_r; IssmDouble coarg = 1. + 4.*omega*pow(hratio,3-2*alpha_s)*ks*pow(h,3)*Ngrad/nu; @@ -462,6 +454,6 @@ } else { - Ks = ks*pow(h,ALPHA_S)*pow(Ngrad,BETA_S-2.); - Kc = kc * pow(this->S,ALPHA_C) * pow(Ngrad,BETA_C-2.); + Ks = ks*pow(h,alpha_s)*pow(Ngrad,beta_s-2.); + Kc = kc * pow(this->S,alpha_c) * pow(Ngrad,beta_c-2.); } @@ -529,5 +521,5 @@ IssmDouble A,B,n,phi_old,phi,phi_0,dphimds,dphi[2]; IssmDouble H,h,b,db[2],dphids,qc,dPw,ks,kc,Ngrad; - IssmDouble alpha_s,beta_s,omega,h_r; + IssmDouble h_r; IssmDouble xyz_list[NUMVERTICES][3]; IssmDouble xyz_list_tria[3][3]; @@ -542,6 +534,6 @@ GetVerticesCoordinates(&xyz_list_tria[0][0],tria->vertices,3); - bool islaminar; - element->FindParam(&islaminar,HydrologyIsLaminarEnum); + bool istransition; + element->FindParam(&istransition,HydrologyIsTransitionEnum); IssmDouble L = element->FindParam(MaterialsLatentheatEnum); IssmDouble mu_water = element->FindParam(MaterialsMuWaterEnum); @@ -551,4 +543,7 @@ IssmDouble lc = element->FindParam(HydrologyChannelSheetWidthEnum); IssmDouble c_t = element->FindParam(HydrologyPressureMeltCoefficientEnum); + IssmDouble alpha_s = element->FindParam(HydrologySheetAlphaEnum); + IssmDouble beta_s = element->FindParam(HydrologySheetBetaEnum); + IssmDouble omega = element->FindParam(HydrologyOmegaEnum); Input* h_input = element->GetInput(HydrologySheetThicknessEnum); _assert_(h_input); @@ -559,8 +554,5 @@ Input* ks_input = element->GetInput(HydrologySheetConductivityEnum); _assert_(ks_input); Input* kc_input = element->GetInput(HydrologyChannelConductivityEnum); _assert_(kc_input); - Input* omega_input = element->GetInput(HydrologyOmegaEnum); _assert_(omega_input); Input* phi_input = element->GetInput(HydraulicPotentialEnum); _assert_(phi_input); - Input* alpha_s_input= element->GetInput(HydrologySheetAlphaEnum);_assert_(alpha_s_input); - Input* beta_s_input = element->GetInput(HydrologySheetBetaEnum);_assert_(beta_s_input); Input* hr_input = element->GetInput(HydrologyBumpHeightEnum);_assert_(hr_input); @@ -585,5 +577,4 @@ ks_input->GetInputValue(&ks,gauss); kc_input->GetInputValue(&kc,gauss); - omega_input->GetInputValue(&omega,gauss); B_input->GetInputValue(&B,gauss); n_input->GetInputValue(&n,gauss); @@ -591,6 +582,4 @@ b_input->GetInputValue(&b,gauss); H_input->GetInputValue(&H,gauss); - alpha_s_input->GetInputValue(&alpha_s,gauss); - beta_s_input->GetInputValue(&beta_s,gauss); hr_input->GetInputValue(&h_r,gauss); @@ -606,7 +595,7 @@ - /*Approx. discharge in the sheet flowing folwing in the direction of the channel ofver a width lc, use laminar if specified*/ + /*Approx. discharge in the sheet flowing folwing in the direction of the channel ofver a width lc, use transition model if specified*/ IssmDouble Ks; - if (islaminar==1 && omega>=AEPS){ + if (istransition==1 && omega>=AEPS){ IssmDouble hratio = h/h_r; IssmDouble nu = mu_water/rho_water; @@ -615,5 +604,5 @@ } else { - Ks = ks * pow(h,ALPHA_S) * pow(Ngrad,BETA_S-2.); + Ks = ks * pow(h,alpha_s) * pow(Ngrad,beta_s-2.); } @@ -683,5 +672,5 @@ /*Intermediaries */ IssmDouble A,B,n,phi,phi_0,ks,kc,Ngrad; - IssmDouble alpha_s,beta_s,omega,h_r; + IssmDouble h_r; IssmDouble H,h,b,dphi[2],dphids,dphimds,db[2],dbds; IssmDouble xyz_list[NUMVERTICES][3]; @@ -692,6 +681,6 @@ GetVerticesCoordinates(&xyz_list_tria[0][0],tria->vertices,3); - bool islaminar; - element->FindParam(&islaminar,HydrologyIsLaminarEnum); + bool istransition; + element->FindParam(&istransition,HydrologyIsTransitionEnum); IssmDouble L = element->FindParam(MaterialsLatentheatEnum); IssmDouble rho_ice = element->FindParam(MaterialsRhoIceEnum); @@ -704,4 +693,7 @@ IssmDouble alpha_c = element->FindParam(HydrologyChannelAlphaEnum); IssmDouble beta_c = element->FindParam(HydrologyChannelBetaEnum); + IssmDouble alpha_s = element->FindParam(HydrologySheetAlphaEnum); + IssmDouble beta_s = element->FindParam(HydrologySheetBetaEnum); + IssmDouble omega = element->FindParam(HydrologyOmegaEnum); Input* h_input = element->GetInput(HydrologySheetThicknessEnum); _assert_(h_input); @@ -712,8 +704,5 @@ Input* ks_input = element->GetInput(HydrologySheetConductivityEnum); _assert_(ks_input); Input* kc_input = element->GetInput(HydrologyChannelConductivityEnum); _assert_(kc_input); - Input* omega_input = element->GetInput(HydrologyOmegaEnum); _assert_(omega_input); Input* phi_input = element->GetInput(HydraulicPotentialEnum); _assert_(phi_input); - Input* alpha_s_input= element->GetInput(HydrologySheetAlphaEnum);_assert_(alpha_s_input); - Input* beta_s_input = element->GetInput(HydrologySheetBetaEnum); _assert_(beta_s_input); Input* hr_input = element->GetInput(HydrologyBumpHeightEnum);_assert_(hr_input); @@ -731,5 +720,4 @@ ks_input->GetInputValue(&ks,gauss); kc_input->GetInputValue(&kc,gauss); - omega_input->GetInputValue(&omega,gauss); B_input->GetInputValue(&B,gauss); n_input->GetInputValue(&n,gauss); @@ -738,6 +726,4 @@ H_input->GetInputValue(&H,gauss); hr_input->GetInputValue(&h_r,gauss); - alpha_s_input->GetInputValue(&alpha_s,gauss); - beta_s_input->GetInputValue(&beta_s,gauss); @@ -755,7 +741,7 @@ IssmDouble dPw = dphids - dphimds; - /*Approx. discharge in the sheet flowing folwing in the direction of the channel ofver a width lc, use laminar if necessary*/ + /*Approx. discharge in the sheet flowing folwing in the direction of the channel ofver a width lc, use transition model if necessary*/ IssmDouble qc; - if (islaminar==1 && omega>=AEPS){ + if (istransition==1 && omega>=AEPS){ IssmDouble hratio = h/h_r; IssmDouble nu = mu_water/rho_water; @@ -764,5 +750,5 @@ } else { - qc = - ks * pow(h,ALPHA_S) * pow(Ngrad,BETA_S-2.) * dphids; + qc = - ks * pow(h,alpha_s) * pow(Ngrad,beta_s-2.) * dphids; } @@ -771,5 +757,5 @@ IssmDouble C = C_W*c_t*rho_water; - IssmDouble Qprime = -kc * pow(Ngrad,BETA_C-2.)*dphids; + IssmDouble Qprime = -kc * pow(Ngrad,beta_c-2.)*dphids; IssmDouble N = phi_0 - phi; @@ -788,6 +774,6 @@ IssmDouble alpha = 1./(rho_ice*L)*( - fabs(Qprime*pow(Snew,ALPHA_C-1.)*dphids) - + C*Qprime*pow(Snew,ALPHA_C-1.)*dPw + fabs(Qprime*pow(Snew,alpha_c-1.)*dphids) + + C*Qprime*pow(Snew,alpha_c-1.)*dPw ) - 2./pow(n,n)*A*pow(fabs(N),n-1.)*N; @@ -811,5 +797,5 @@ /*Compute new channel discharge for output only*/ - IssmDouble Kc = kc * pow(this->S,ALPHA_C) * pow(Ngrad,BETA_C-2.); + IssmDouble Kc = kc * pow(this->S,alpha_c) * pow(Ngrad,beta_c-2.); this->discharge = -Kc*dphids; Index: /issm/trunk-jpl/src/c/shared/Enum/Enum.vim =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/Enum.vim (revision 27935) +++ /issm/trunk-jpl/src/c/shared/Enum/Enum.vim (revision 27936) @@ -267,5 +267,5 @@ syn keyword cConstant HydrologyEnglacialVoidRatioEnum syn keyword cConstant HydrologyIschannelsEnum -syn keyword cConstant HydrologyIsLaminarEnum +syn keyword cConstant HydrologyIsTransitionEnum syn keyword cConstant HydrologyIsWaterPressureArmaEnum syn keyword cConstant HydrologyMeltFlagEnum @@ -273,8 +273,11 @@ syn keyword cConstant HydrologyNumBasinsEnum syn keyword cConstant HydrologyNumRequestedOutputsEnum +syn keyword cConstant HydrologyOmegaEnum syn keyword cConstant HydrologyPressureMeltCoefficientEnum syn keyword cConstant HydrologyRelaxationEnum syn keyword cConstant HydrologyRequestedOutputsEnum syn keyword cConstant HydrologySedimentKmaxEnum +syn keyword cConstant HydrologySheetAlphaEnum +syn keyword cConstant HydrologySheetBetaEnum syn keyword cConstant HydrologyStepsPerStepEnum syn keyword cConstant HydrologyStorageEnum @@ -898,8 +901,5 @@ syn keyword cConstant HydrologyMoulinInputEnum syn keyword cConstant HydrologyNeumannfluxEnum -syn keyword cConstant HydrologyOmegaEnum syn keyword cConstant HydrologyReynoldsEnum -syn keyword cConstant HydrologySheetAlphaEnum -syn keyword cConstant HydrologySheetBetaEnum syn keyword cConstant HydrologySheetConductivityEnum syn keyword cConstant HydrologySheetThicknessEnum Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 27935) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 27936) @@ -261,5 +261,5 @@ HydrologyEnglacialVoidRatioEnum, HydrologyIschannelsEnum, - HydrologyIsLaminarEnum, + HydrologyIsTransitionEnum, HydrologyIsWaterPressureArmaEnum, HydrologyMeltFlagEnum, @@ -267,8 +267,11 @@ HydrologyNumBasinsEnum, HydrologyNumRequestedOutputsEnum, + HydrologyOmegaEnum, HydrologyPressureMeltCoefficientEnum, HydrologyRelaxationEnum, HydrologyRequestedOutputsEnum, HydrologySedimentKmaxEnum, + HydrologySheetAlphaEnum, + HydrologySheetBetaEnum, HydrologyStepsPerStepEnum, HydrologyStorageEnum, @@ -894,8 +897,5 @@ HydrologyMoulinInputEnum, HydrologyNeumannfluxEnum, - HydrologyOmegaEnum, HydrologyReynoldsEnum, - HydrologySheetAlphaEnum, - HydrologySheetBetaEnum, HydrologySheetConductivityEnum, HydrologySheetThicknessEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 27935) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 27936) @@ -269,5 +269,5 @@ case HydrologyEnglacialVoidRatioEnum : return "HydrologyEnglacialVoidRatio"; case HydrologyIschannelsEnum : return "HydrologyIschannels"; - case HydrologyIsLaminarEnum : return "HydrologyIsLaminar"; + case HydrologyIsTransitionEnum : return "HydrologyIsTransition"; case HydrologyIsWaterPressureArmaEnum : return "HydrologyIsWaterPressureArma"; case HydrologyMeltFlagEnum : return "HydrologyMeltFlag"; @@ -275,8 +275,11 @@ case HydrologyNumBasinsEnum : return "HydrologyNumBasins"; case HydrologyNumRequestedOutputsEnum : return "HydrologyNumRequestedOutputs"; + case HydrologyOmegaEnum : return "HydrologyOmega"; case HydrologyPressureMeltCoefficientEnum : return "HydrologyPressureMeltCoefficient"; case HydrologyRelaxationEnum : return "HydrologyRelaxation"; case HydrologyRequestedOutputsEnum : return "HydrologyRequestedOutputs"; case HydrologySedimentKmaxEnum : return "HydrologySedimentKmax"; + case HydrologySheetAlphaEnum : return "HydrologySheetAlpha"; + case HydrologySheetBetaEnum : return "HydrologySheetBeta"; case HydrologyStepsPerStepEnum : return "HydrologyStepsPerStep"; case HydrologyStorageEnum : return "HydrologyStorage"; @@ -900,8 +903,5 @@ case HydrologyMoulinInputEnum : return "HydrologyMoulinInput"; case HydrologyNeumannfluxEnum : return "HydrologyNeumannflux"; - case HydrologyOmegaEnum : return "HydrologyOmega"; case HydrologyReynoldsEnum : return "HydrologyReynolds"; - case HydrologySheetAlphaEnum : return "HydrologySheetAlpha"; - case HydrologySheetBetaEnum : return "HydrologySheetBeta"; case HydrologySheetConductivityEnum : return "HydrologySheetConductivity"; case HydrologySheetThicknessEnum : return "HydrologySheetThickness"; Index: /issm/trunk-jpl/src/c/shared/Enum/Enumjl.vim =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/Enumjl.vim (revision 27935) +++ /issm/trunk-jpl/src/c/shared/Enum/Enumjl.vim (revision 27936) @@ -260,5 +260,5 @@ syn keyword juliaConstC HydrologyEnglacialVoidRatioEnum syn keyword juliaConstC HydrologyIschannelsEnum -syn keyword juliaConstC HydrologyIsLaminarEnum +syn keyword juliaConstC HydrologyIsTransitionEnum syn keyword juliaConstC HydrologyIsWaterPressureArmaEnum syn keyword juliaConstC HydrologyMeltFlagEnum @@ -266,8 +266,11 @@ syn keyword juliaConstC HydrologyNumBasinsEnum syn keyword juliaConstC HydrologyNumRequestedOutputsEnum +syn keyword juliaConstC HydrologyOmegaEnum syn keyword juliaConstC HydrologyPressureMeltCoefficientEnum syn keyword juliaConstC HydrologyRelaxationEnum syn keyword juliaConstC HydrologyRequestedOutputsEnum syn keyword juliaConstC HydrologySedimentKmaxEnum +syn keyword juliaConstC HydrologySheetAlphaEnum +syn keyword juliaConstC HydrologySheetBetaEnum syn keyword juliaConstC HydrologyStepsPerStepEnum syn keyword juliaConstC HydrologyStorageEnum @@ -891,8 +894,5 @@ syn keyword juliaConstC HydrologyMoulinInputEnum syn keyword juliaConstC HydrologyNeumannfluxEnum -syn keyword juliaConstC HydrologyOmegaEnum syn keyword juliaConstC HydrologyReynoldsEnum -syn keyword juliaConstC HydrologySheetAlphaEnum -syn keyword juliaConstC HydrologySheetBetaEnum syn keyword juliaConstC HydrologySheetConductivityEnum syn keyword juliaConstC HydrologySheetThicknessEnum Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 27935) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 27936) @@ -275,5 +275,5 @@ else if (strcmp(name,"HydrologyEnglacialVoidRatio")==0) return HydrologyEnglacialVoidRatioEnum; else if (strcmp(name,"HydrologyIschannels")==0) return HydrologyIschannelsEnum; - else if (strcmp(name,"HydrologyIsLaminar")==0) return HydrologyIsLaminarEnum; + else if (strcmp(name,"HydrologyIsTransition")==0) return HydrologyIsTransitionEnum; else if (strcmp(name,"HydrologyIsWaterPressureArma")==0) return HydrologyIsWaterPressureArmaEnum; else if (strcmp(name,"HydrologyMeltFlag")==0) return HydrologyMeltFlagEnum; @@ -281,8 +281,11 @@ else if (strcmp(name,"HydrologyNumBasins")==0) return HydrologyNumBasinsEnum; else if (strcmp(name,"HydrologyNumRequestedOutputs")==0) return HydrologyNumRequestedOutputsEnum; + else if (strcmp(name,"HydrologyOmega")==0) return HydrologyOmegaEnum; else if (strcmp(name,"HydrologyPressureMeltCoefficient")==0) return HydrologyPressureMeltCoefficientEnum; else if (strcmp(name,"HydrologyRelaxation")==0) return HydrologyRelaxationEnum; else if (strcmp(name,"HydrologyRequestedOutputs")==0) return HydrologyRequestedOutputsEnum; else if (strcmp(name,"HydrologySedimentKmax")==0) return HydrologySedimentKmaxEnum; + else if (strcmp(name,"HydrologySheetAlpha")==0) return HydrologySheetAlphaEnum; + else if (strcmp(name,"HydrologySheetBeta")==0) return HydrologySheetBetaEnum; else if (strcmp(name,"HydrologyStepsPerStep")==0) return HydrologyStepsPerStepEnum; else if (strcmp(name,"HydrologyStorage")==0) return HydrologyStorageEnum; @@ -380,11 +383,11 @@ else if (strcmp(name,"MassFluxSegments")==0) return MassFluxSegmentsEnum; else if (strcmp(name,"MassFluxSegmentsPresent")==0) return MassFluxSegmentsPresentEnum; - else if (strcmp(name,"MasstransportHydrostaticAdjustment")==0) return MasstransportHydrostaticAdjustmentEnum; - else if (strcmp(name,"MasstransportIsfreesurface")==0) return MasstransportIsfreesurfaceEnum; - else if (strcmp(name,"MasstransportMinThickness")==0) return MasstransportMinThicknessEnum; else stage=4; } if(stage==4){ - if (strcmp(name,"MasstransportNumRequestedOutputs")==0) return MasstransportNumRequestedOutputsEnum; + if (strcmp(name,"MasstransportHydrostaticAdjustment")==0) return MasstransportHydrostaticAdjustmentEnum; + else if (strcmp(name,"MasstransportIsfreesurface")==0) return MasstransportIsfreesurfaceEnum; + else if (strcmp(name,"MasstransportMinThickness")==0) return MasstransportMinThicknessEnum; + else if (strcmp(name,"MasstransportNumRequestedOutputs")==0) return MasstransportNumRequestedOutputsEnum; else if (strcmp(name,"MasstransportPenaltyFactor")==0) return MasstransportPenaltyFactorEnum; else if (strcmp(name,"MasstransportRequestedOutputs")==0) return MasstransportRequestedOutputsEnum; @@ -503,11 +506,11 @@ else if (strcmp(name,"SealevelchangeTidalK2")==0) return SealevelchangeTidalK2Enum; else if (strcmp(name,"SealevelchangeTidalH2")==0) return SealevelchangeTidalH2Enum; - else if (strcmp(name,"SealevelchangeTidalL2")==0) return SealevelchangeTidalL2Enum; - else if (strcmp(name,"SolidearthSettingsSealevelLoading")==0) return SolidearthSettingsSealevelLoadingEnum; - else if (strcmp(name,"SolidearthSettingsGRD")==0) return SolidearthSettingsGRDEnum; else stage=5; } if(stage==5){ - if (strcmp(name,"SolidearthSettingsRunFrequency")==0) return SolidearthSettingsRunFrequencyEnum; + if (strcmp(name,"SealevelchangeTidalL2")==0) return SealevelchangeTidalL2Enum; + else if (strcmp(name,"SolidearthSettingsSealevelLoading")==0) return SolidearthSettingsSealevelLoadingEnum; + else if (strcmp(name,"SolidearthSettingsGRD")==0) return SolidearthSettingsGRDEnum; + else if (strcmp(name,"SolidearthSettingsRunFrequency")==0) return SolidearthSettingsRunFrequencyEnum; else if (strcmp(name,"SolidearthSettingsTimeAcc")==0) return SolidearthSettingsTimeAccEnum; else if (strcmp(name,"SolidearthSettingsHoriz")==0) return SolidearthSettingsHorizEnum; @@ -626,11 +629,11 @@ else if (strcmp(name,"SmbSemicTmin")==0) return SmbSemicTminEnum; else if (strcmp(name,"SmbSemicTmid")==0) return SmbSemicTmidEnum; - else if (strcmp(name,"SmbSemicTmax")==0) return SmbSemicTmaxEnum; - else if (strcmp(name,"SmbStepsPerStep")==0) return SmbStepsPerStepEnum; - else if (strcmp(name,"SmbSwIdx")==0) return SmbSwIdxEnum; else stage=6; } if(stage==6){ - if (strcmp(name,"SmbSWgrad")==0) return SmbSWgradEnum; + if (strcmp(name,"SmbSemicTmax")==0) return SmbSemicTmaxEnum; + else if (strcmp(name,"SmbStepsPerStep")==0) return SmbStepsPerStepEnum; + else if (strcmp(name,"SmbSwIdx")==0) return SmbSwIdxEnum; + else if (strcmp(name,"SmbSWgrad")==0) return SmbSWgradEnum; else if (strcmp(name,"SmbT0dry")==0) return SmbT0dryEnum; else if (strcmp(name,"SmbT0wet")==0) return SmbT0wetEnum; @@ -749,11 +752,11 @@ else if (strcmp(name,"BasalforcingsGroundediceMeltingRateObs")==0) return BasalforcingsGroundediceMeltingRateObsEnum; else if (strcmp(name,"BasalforcingsLinearBasinId")==0) return BasalforcingsLinearBasinIdEnum; - else if (strcmp(name,"BasalforcingsPerturbationMeltingRate")==0) return BasalforcingsPerturbationMeltingRateEnum; - else if (strcmp(name,"BasalforcingsSpatialDeepwaterElevation")==0) return BasalforcingsSpatialDeepwaterElevationEnum; - else if (strcmp(name,"BasalforcingsSpatialDeepwaterMeltingRate")==0) return BasalforcingsSpatialDeepwaterMeltingRateEnum; else stage=7; } if(stage==7){ - if (strcmp(name,"BasalforcingsSpatialUpperwaterElevation")==0) return BasalforcingsSpatialUpperwaterElevationEnum; + if (strcmp(name,"BasalforcingsPerturbationMeltingRate")==0) return BasalforcingsPerturbationMeltingRateEnum; + else if (strcmp(name,"BasalforcingsSpatialDeepwaterElevation")==0) return BasalforcingsSpatialDeepwaterElevationEnum; + else if (strcmp(name,"BasalforcingsSpatialDeepwaterMeltingRate")==0) return BasalforcingsSpatialDeepwaterMeltingRateEnum; + else if (strcmp(name,"BasalforcingsSpatialUpperwaterElevation")==0) return BasalforcingsSpatialUpperwaterElevationEnum; else if (strcmp(name,"BasalforcingsSpatialUpperwaterMeltingRate")==0) return BasalforcingsSpatialUpperwaterMeltingRateEnum; else if (strcmp(name,"BasalforcingsIsmip6BasinId")==0) return BasalforcingsIsmip6BasinIdEnum; @@ -872,11 +875,11 @@ else if (strcmp(name,"FrictionM")==0) return FrictionMEnum; else if (strcmp(name,"FrictionP")==0) return FrictionPEnum; - else if (strcmp(name,"FrictionPressureAdjustedTemperature")==0) return FrictionPressureAdjustedTemperatureEnum; - else if (strcmp(name,"FrictionQ")==0) return FrictionQEnum; - else if (strcmp(name,"FrictionSedimentCompressibilityCoefficient")==0) return FrictionSedimentCompressibilityCoefficientEnum; else stage=8; } if(stage==8){ - if (strcmp(name,"FrictionTillFrictionAngle")==0) return FrictionTillFrictionAngleEnum; + if (strcmp(name,"FrictionPressureAdjustedTemperature")==0) return FrictionPressureAdjustedTemperatureEnum; + else if (strcmp(name,"FrictionQ")==0) return FrictionQEnum; + else if (strcmp(name,"FrictionSedimentCompressibilityCoefficient")==0) return FrictionSedimentCompressibilityCoefficientEnum; + else if (strcmp(name,"FrictionTillFrictionAngle")==0) return FrictionTillFrictionAngleEnum; else if (strcmp(name,"FrictionWaterLayer")==0) return FrictionWaterLayerEnum; else if (strcmp(name,"FrictionWaterPressure")==0) return FrictionWaterPressureEnum; @@ -921,8 +924,5 @@ else if (strcmp(name,"HydrologyMoulinInput")==0) return HydrologyMoulinInputEnum; else if (strcmp(name,"HydrologyNeumannflux")==0) return HydrologyNeumannfluxEnum; - else if (strcmp(name,"HydrologyOmega")==0) return HydrologyOmegaEnum; else if (strcmp(name,"HydrologyReynolds")==0) return HydrologyReynoldsEnum; - else if (strcmp(name,"HydrologySheetAlpha")==0) return HydrologySheetAlphaEnum; - else if (strcmp(name,"HydrologySheetBeta")==0) return HydrologySheetBetaEnum; else if (strcmp(name,"HydrologySheetConductivity")==0) return HydrologySheetConductivityEnum; else if (strcmp(name,"HydrologySheetThickness")==0) return HydrologySheetThicknessEnum; Index: /issm/trunk-jpl/src/m/classes/hydrologyglads.m =================================================================== --- /issm/trunk-jpl/src/m/classes/hydrologyglads.m (revision 27935) +++ /issm/trunk-jpl/src/m/classes/hydrologyglads.m (revision 27936) @@ -11,7 +11,7 @@ cavity_spacing = 0.; bump_height = NaN; - omega = 0; % TH - sheet_alpha = 5.0/4.0; % TH - sheet_beta = 3.0/2.0; % TH + omega = 0; + sheet_alpha = NaN; + sheet_beta = NaN; %Channels @@ -19,6 +19,6 @@ channel_conductivity = NaN; channel_sheet_width = 0.; - channel_alpha = 5.0/4.0; % TH - channel_beta = 3.0/2.0; % TH + channel_alpha = NaN; + channel_beta = NaN; %Other @@ -29,5 +29,5 @@ requested_outputs = {}; melt_flag = 0; - islaminar = 0; + istransition = 0; end methods @@ -51,5 +51,7 @@ self.pressure_melt_coefficient = 7.5e-8; %K/Pa (See table 1 in Erder et al. 2013) self.cavity_spacing = 2.; %m - self.omega = 1./2000.; % TH + self.sheet_alpha = 5.0/4.0; + self.sheet_beta = 3.0/2.0; + self.omega = 1./2000.; %Channel parameters @@ -57,10 +59,12 @@ self.channel_conductivity = 5.e-2; %Dow's default, Table uses 0.1 self.channel_sheet_width = 2.; %m + self.channel_alpha = 5.0/4.0; + self.channel_beta = 3.0/2.0; - %Otherself.omega = 1./2000.; % TH + %Otherself.omega = 1./2000.; self.englacial_void_ratio = 1.e-5;% Dow's default, Table from Werder et al. uses 1e-3; self.requested_outputs={'default'}; self.melt_flag=0; - self.islaminar = 0; %by default use GlaDS default turbulent code + self.istransition = 0; %by default use GlaDS default turbulent code end % }}} function md = checkconsistency(self,md,solution,analyses) % {{{ @@ -76,7 +80,7 @@ md = checkfield(md,'fieldname','hydrology.cavity_spacing','numel',[1],'>',0); md = checkfield(md,'fieldname','hydrology.bump_height','size',[md.mesh.numberofvertices 1],'>=',0,'NaN',1,'Inf',1); - md = checkfield(md,'fieldname','hydrology.omega', 'numel', [1], '>=', 0); % TH - md = checkfield(md,'fieldname','hydrology.sheet_alpha', 'numel', [1], '>', 0); % TH - md = checkfield(md,'fieldname','hydrology.sheet_beta', 'numel', [1], '>', 0); % TH + md = checkfield(md,'fieldname','hydrology.omega', 'numel', [1], '>=', 0); + md = checkfield(md,'fieldname','hydrology.sheet_alpha', 'numel', [1], '>', 0); + md = checkfield(md,'fieldname','hydrology.sheet_beta', 'numel', [1], '>', 0); %Channels @@ -84,6 +88,6 @@ md = checkfield(md,'fieldname','hydrology.channel_conductivity','size',[md.mesh.numberofvertices 1],'>=',0,'NaN',1,'Inf',1); md = checkfield(md,'fieldname','hydrology.channel_sheet_width','numel',[1],'>=',0); - md = checkfield(md,'fieldname','hydrology.channel_alpha', 'numel', [1], '>', 0); % TH - md = checkfield(md,'fieldname','hydrology.channel_beta', 'numel', [1], '>', 0); % TH + md = checkfield(md,'fieldname','hydrology.channel_alpha', 'numel', [1], '>', 0); + md = checkfield(md,'fieldname','hydrology.channel_beta', 'numel', [1], '>', 0); %Other @@ -94,5 +98,5 @@ md = checkfield(md,'fieldname','hydrology.requested_outputs','stringrow',1); md = checkfield(md,'fieldname','hydrology.melt_flag','numel',[1],'values',[0 1 2]); - md = checkfield(md,'fieldname','hydrology.islaminar','numel',[1],'values',[0 1]); + md = checkfield(md,'fieldname','hydrology.istransition','numel',[1],'values',[0 1]); if self.melt_flag==1 || self.melt_flag==2 md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'timeseries',1); @@ -104,14 +108,14 @@ fielddisplay(self,'pressure_melt_coefficient','Pressure melt coefficient (c_t) [K Pa^-1]'); fielddisplay(self,'sheet_conductivity','sheet conductivity (k) [m^(7/4) kg^(-1/2)]'); - fielddisplay(self,'sheet_alpha','First sheet-flow exponent (alpha_s) []'); % TH - fielddisplay(self,'sheet_beta','Second sheet-flow exponent (beta_s) []'); % TH + fielddisplay(self,'sheet_alpha','First sheet-flow exponent (alpha_s) []'); + fielddisplay(self,'sheet_beta','Second sheet-flow exponent (beta_s) []'); fielddisplay(self,'cavity_spacing','cavity spacing (l_r) [m]'); fielddisplay(self,'bump_height','typical bump height (h_r) [m]'); - fielddisplay(self,'omega','transition parameter (omega) []'); % TH + fielddisplay(self,'omega','transition parameter (omega) []'); disp(sprintf(' CHANNELS')); fielddisplay(self,'ischannels','Do we allow for channels? 1: yes, 0: no'); fielddisplay(self,'channel_conductivity','channel conductivity (k_c) [m^(3/2) kg^(-1/2)]'); - fielddisplay(self,'channel_alpha','First channel-flow exponent (alpha_s) []'); % TH - fielddisplay(self,'channel_beta','Second channel-flow exponent (beta_s) []'); % TH + fielddisplay(self,'channel_alpha','First channel-flow exponent (alpha_s) []'); + fielddisplay(self,'channel_beta','Second channel-flow exponent (beta_s) []'); fielddisplay(self,'channel_sheet_width','channel sheet width [m]'); disp(sprintf(' OTHER')); @@ -122,5 +126,5 @@ fielddisplay(self,'requested_outputs','additional outputs requested'); fielddisplay(self,'melt_flag','User specified basal melt? 0: no (default), 1: use md.basalforcings.groundedice_melting_rate'); - fielddisplay(self,'islaminar','do we use laminar [1] or turbulent physics [0, default]'); + fielddisplay(self,'istransition','do we use transition [1] or turbulent physics [0, default]'); end % }}} function marshall(self,prefix,md,fid) % {{{ @@ -131,12 +135,12 @@ WriteData(fid,prefix,'name','md.hydrology.model','data',5,'format','Integer'); - %Sheet + %Sheet WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','pressure_melt_coefficient','format','Double'); WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','sheet_conductivity','format','DoubleMat','mattype',1); WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','cavity_spacing','format','Double'); WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','bump_height','format','DoubleMat','mattype',1); - WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','omega','format','Double'); % TH - WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','sheet_alpha','format','Double'); % TH - WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','sheet_beta','format','Double'); % TH + WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','omega','format','Double'); + WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','sheet_alpha','format','Double'); + WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','sheet_beta','format','Double'); %Channels @@ -144,6 +148,6 @@ WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','channel_conductivity','format','DoubleMat','mattype',1); WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','channel_sheet_width','format','Double'); - WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','channel_alpha','format','Double'); % TH - WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','channel_beta','format','Double'); % TH + WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','channel_alpha','format','Double'); + WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','channel_beta','format','Double'); %Others @@ -153,5 +157,5 @@ WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','englacial_void_ratio','format','Double'); WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','melt_flag','format','Integer'); - WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','islaminar','format','Boolean'); + WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','istransition','format','Boolean'); outputs = self.requested_outputs; pos = find(ismember(outputs,'default')); Index: /issm/trunk-jpl/src/m/classes/hydrologyglads.py =================================================================== --- /issm/trunk-jpl/src/m/classes/hydrologyglads.py (revision 27935) +++ /issm/trunk-jpl/src/m/classes/hydrologyglads.py (revision 27936) @@ -14,12 +14,12 @@ def __init__(self, *args): # {{{ - # Sheet + # Sheet self.pressure_melt_coefficient = 0. self.sheet_conductivity = np.nan self.cavity_spacing = 0. self.bump_height = np.nan - self.omega = 0.; #TH - self.sheet_alpha = 5.0/4.0; # TH - self.sheet_beta = 3.0/2.0; # TH + self.omega = 0.; + self.sheet_alpha = np.nan; + self.sheet_beta = np.nan; # Channels @@ -27,6 +27,6 @@ self.channel_conductivity = np.nan self.channel_sheet_width = 0. - self.channel_alpha = 5.0/4.0; # TH - self.channel_beta = 3.0/2.0; # TH + self.channel_alpha = np.nan; + self.channel_beta = np.nan; # Other @@ -37,5 +37,5 @@ self.requested_outputs = [] self.melt_flag = 0 - self.islaminar = 0 + self.istransition = 0 nargs = len(args) @@ -72,5 +72,5 @@ s += '{}\n'.format(fielddisplay(self, 'requested_outputs', 'additional outputs requested')) s += '{}\n'.format(fielddisplay(self, 'melt_flag', 'User specified basal melt? 0: no (default), 1: use md.basalforcings.groundedice_melting_rate')) - s += '{}\n'.format(fielddisplay(self, 'islaminar','do we use laminar [1] or turbulent physics [0, default]')) + s += '{}\n'.format(fielddisplay(self, 'istransition','do we use transition [1] or turbulent physics [0, default]')) return string # }}} @@ -96,5 +96,7 @@ self.pressure_melt_coefficient = 7.5e-8 #K / Pa (See table 1 in Erder et al. 2013) self.cavity_spacing = 2. #m - self.omega = 1./2000.; #TH + self.sheet_alpha = 5.0/4.0; + self.sheet_beta = 3.0/2.0; + self.omega = 1./2000.; # Channel parameters @@ -102,5 +104,6 @@ self.channel_conductivity = 5.e-2 #Dow's default, Table uses 0.1 self.channel_sheet_width = 2. #m - self.islaminar = 0 #by default use turbulent physics + self.channel_alpha = 5.0/4.0; + self.channel_beta = 3.0/2.0; # Other @@ -108,5 +111,5 @@ self.requested_outputs = ['default'] self.melt_flag = 0 - self.islaminar = 0 #by default use turbulent physics + self.istransition = 0 #by default use turbulent physics return self @@ -123,7 +126,7 @@ md = checkfield(md, 'fieldname', 'hydrology.cavity_spacing', 'numel', [1], '>', 0) md = checkfield(md, 'fieldname', 'hydrology.bump_height', 'size', [md.mesh.numberofvertices], '>=', 0, 'np.nan', 1, 'Inf', 1) - md = checkfield(md,'fieldname','hydrology.omega', 'numel', [1], '>=', 0); # TH - md = checkfield(md,'fieldname','hydrology.sheet_alpha', 'numel', [1], '>', 0); # TH - md = checkfield(md,'fieldname','hydrology.sheet_beta', 'numel', [1], '>', 0); # TH + md = checkfield(md,'fieldname','hydrology.omega', 'numel', [1], '>=', 0); + md = checkfield(md,'fieldname','hydrology.sheet_alpha', 'numel', [1], '>', 0); + md = checkfield(md,'fieldname','hydrology.sheet_beta', 'numel', [1], '>', 0); # Channels @@ -131,6 +134,6 @@ md = checkfield(md, 'fieldname', 'hydrology.channel_conductivity', 'size', [md.mesh.numberofvertices], '>', 0) md = checkfield(md, 'fieldname', 'hydrology.channel_sheet_width', 'numel', [1], '>=', 0) - md = checkfield(md,'fieldname','hydrology.channel_alpha', 'numel', [1], '>', 0); # TH - md = checkfield(md,'fieldname','hydrology.channel_beta', 'numel', [1], '>', 0); # TH + md = checkfield(md,'fieldname','hydrology.channel_alpha', 'numel', [1], '>', 0); + md = checkfield(md,'fieldname','hydrology.channel_beta', 'numel', [1], '>', 0); # Other @@ -141,5 +144,5 @@ md = checkfield(md, 'fieldname', 'hydrology.requested_outputs', 'stringrow', 1) md = checkfield(md, 'fieldname', 'hydrology.melt_flag', 'numel', [1], 'values', [0, 1]) - md = checkfield(md, 'fieldname', 'hydrology.islaminar', 'numel', [1], 'values', [0, 1]) + md = checkfield(md, 'fieldname', 'hydrology.istransition', 'numel', [1], 'values', [0, 1]) if self.melt_flag == 1 or self.melt_flag == 2: md = checkfield(md, 'fieldname', 'basalforcings.groundedice_melting_rate', 'NaN', 1, 'Inf', 1, 'timeseries', 1) @@ -151,12 +154,12 @@ WriteData(fid, prefix, 'name', 'md.hydrology.model', 'data', 5, 'format', 'Integer') - # Sheet + # Sheet WriteData(fid, prefix, 'object', self, 'class', 'hydrology', 'fieldname', 'pressure_melt_coefficient', 'format', 'Double') WriteData(fid, prefix, 'object', self, 'class', 'hydrology', 'fieldname', 'sheet_conductivity', 'format', 'DoubleMat', 'mattype', 1) WriteData(fid, prefix, 'object', self, 'class', 'hydrology', 'fieldname', 'cavity_spacing', 'format', 'Double') WriteData(fid, prefix, 'object', self, 'class', 'hydrology', 'fieldname', 'bump_height', 'format', 'DoubleMat', 'mattype', 1) - WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','omega','format','Double'); # TH - WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','sheet_alpha','format','Double'); # TH - WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','sheet_beta','format','Double'); # TH + WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','omega','format','Double'); + WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','sheet_alpha','format','Double'); + WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','sheet_beta','format','Double'); # Channels @@ -164,6 +167,6 @@ WriteData(fid, prefix, 'object', self, 'class', 'hydrology', 'fieldname', 'channel_conductivity', 'format', 'DoubleMat', 'mattype', 1) WriteData(fid, prefix, 'object', self, 'class', 'hydrology', 'fieldname', 'channel_sheet_width', 'format', 'Double') - WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','channel_alpha','format','Double'); # TH - WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','channel_beta','format','Double'); # TH + WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','channel_alpha','format','Double'); + WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','channel_beta','format','Double'); # Others @@ -173,5 +176,5 @@ WriteData(fid, prefix, 'object', self, 'class', 'hydrology', 'fieldname', 'englacial_void_ratio', 'format', 'Double') WriteData(fid, prefix, 'object', self, 'class', 'hydrology', 'fieldname', 'melt_flag', 'format', 'Integer') - WriteData(fid, prefix, 'object', self, 'class', 'hydrology', 'fieldname', 'islaminar', 'format', 'Boolean') + WriteData(fid, prefix, 'object', self, 'class', 'hydrology', 'fieldname', 'istransition', 'format', 'Boolean') outputs = self.requested_outputs