Skip to content

Variable units and parameter description correction 4 mar2025 #463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
loganxingfang wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Variable units and parameter description correction 4 mar2025 #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3c1b5cd
Update Classnetall.cpp
loganxingfang Mar 4, 2025
88d56fe
Update Classevap.cpp
loganxingfang Mar 4, 2025
903ce3c
Update ClassevapD.cpp
loganxingfang Mar 4, 2025
35b243a
Update Classevap_Resist.cpp
loganxingfang Mar 4, 2025
0f986ef
Update ClassevapD_Resist.cpp
loganxingfang Mar 4, 2025
16177d7
Update ClassevapX.cpp
loganxingfang Mar 4, 2025
4056301
Update ClassCRHMCanopy.cpp
loganxingfang Mar 4, 2025
f678014
Update ClassCRHMCanopyClearing.cpp
loganxingfang Mar 4, 2025
1814383
Update ClassCRHMCanopyClearingGap.cpp
loganxingfang Mar 4, 2025
a9e3906
Update ClassGreenAmpt.cpp
loganxingfang Mar 4, 2025
50ba581
Update ClassGreencrack.cpp
loganxingfang Mar 4, 2025
d7b6c06
Update ClassSetSoil.cpp
loganxingfang Mar 4, 2025
d01f5b2
Update ClassVolumetric.cpp
loganxingfang Mar 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions crhmcode/src/modules/ClassCRHMCanopy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,14 +581,14 @@ double ClassCRHMCanopy::delta(double t) // Slope of sat vap p vs t, kPa/DEGREE_C
return(3549.0*exp( 21.88 * t/(t+265.5)) / sqr(t+265.5));
}

double ClassCRHMCanopy::lambda(double t) // Latent heat of vaporization (mJ/(kg DEGREE_CELCIUS))
double ClassCRHMCanopy::lambda(double t) // Latent heat of vaporization (MJ/kg)
{
return( 2.501 - 0.002361 * t );
}

double ClassCRHMCanopy::gamma(double Pa, double t) // Psychrometric constant (kPa/DEGREE_CELCIUS)
{
return( 0.00163 * Pa / lambda(t)); // lambda (mJ/(kg DEGREE_CELCIUS))
return( 0.00163 * Pa / lambda(t)); // lambda (MJ/kg)
}

double ClassCRHMCanopy::RHOa(double t, double ea, double Pa) // atmospheric density (kg/m^3)
Expand Down
4 changes: 2 additions & 2 deletions crhmcode/src/modules/ClassCRHMCanopyClearing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,14 +604,14 @@ double ClassCRHMCanopyClearing::delta(double t) // Slope of sat vap p vs t, kPa/
return(3549.0*exp( 21.88 * t/(t+265.5)) / sqr(t+265.5));
}

double ClassCRHMCanopyClearing::lambda(double t) // Latent heat of vaporization (mJ/(kg DEGREE_CELCIUS))
double ClassCRHMCanopyClearing::lambda(double t) // Latent heat of vaporization (MJ/kg)
{
return( 2.501 - 0.002361 * t );
}

double ClassCRHMCanopyClearing::gamma(double Pa, double t) // Psychrometric constant (kPa/DEGREE_CELCIUS)
{
return( 0.00163 * Pa / lambda(t)); // lambda (mJ/(kg DEGREE_CELCIUS))
return( 0.00163 * Pa / lambda(t)); // lambda (MJ/kg)
}

double ClassCRHMCanopyClearing::RHOa(double t, double ea, double Pa) // atmospheric density (kg/m^3)
Expand Down
4 changes: 2 additions & 2 deletions crhmcode/src/modules/ClassCRHMCanopyClearingGap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,14 +683,14 @@ double ClassCRHMCanopyClearingGap::delta(double t) // Slope of sat vap p vs t, k
return(3549.0*exp( 21.88 * t/(t+265.5)) / sqr(t+265.5));
}

double ClassCRHMCanopyClearingGap::lambda(double t) // Latent heat of vaporization (mJ/(kg DEGREE_CELSIUS))
double ClassCRHMCanopyClearingGap::lambda(double t) // Latent heat of vaporization (MJ/kg)
{
return( 2.501 - 0.002361 * t );
}

double ClassCRHMCanopyClearingGap::gamma(double Pa, double t) // Psychrometric constant (kPa/DEGREE_CELSIUS)
{
return( 0.00163 * Pa / lambda(t)); // lambda (mJ/(kg DEGREE_CELSIUS))
return( 0.00163 * Pa / lambda(t)); // lambda (MJ/kg)
}

double ClassCRHMCanopyClearingGap::RHOa(double t, double ea, double Pa) // atmospheric density (kg/m^3)
Expand Down
2 changes: 1 addition & 1 deletion crhmcode/src/modules/ClassGreenAmpt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ void ClassGreenAmpt::decl(void) {
declparam("hru_area", TDim::NHRU, "[1]", "1e-6", "1e+09", "hru area", "(km^2)", &hru_area);

declparam("soil_type", TDim::NHRU, "[4]", "0", "12",
"water/sand/loamsand/sandloam/loam/siltloam/sasclloam/clayloam/siclloam/sandclay/siltclay/clay/pavement" //
"water/sand/loamsand/sandloam/loam/siltloam/saclloam/clayloam/siclloam/sandclay/siltclay/clay/pavement" //
" 0 - 12", "()", &soil_type);

declparam("soil_moist_max", TDim::NHRU, "[375.0]", "0.0", "5000.0",
Expand Down
2 changes: 1 addition & 1 deletion crhmcode/src/modules/ClassGreencrack.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ void ClassGreencrack::decl(void) {
decldiagparam("Major", TDim::NHRU, "[5]", "1", "100", "threshold for major melt", "(mm/d)", &Major);

declparam("soil_type", TDim::NHRU, "[4]", "0", "12",
"water/sand/loamsand/sandloam/loam/siltloam/sasclloam/clayloam/siclloam/sandclay/siltclay/clay/pavement" //
"water/sand/loamsand/sandloam/loam/siltloam/saclloam/clayloam/siclloam/sandclay/siltclay/clay/pavement" //
" 0 - 12", "()", &soil_type);

declparam("soil_moist_max", TDim::NHRU, "[375.0]", "0.0", "5000.0",
Expand Down
4 changes: 2 additions & 2 deletions crhmcode/src/modules/ClassSetSoil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@ void ClassSetSoil::decl(void) {
declparam("Vol_h2o_content", TDim::NHRU, "[0.5]", "0.01", "0.7", "initial volumetric water content", "()", &Vol_h2o_content);

declparam("soil_type_rechr", TDim::NHRU, "[4]", "0", "12",
"water/sand/loamsand/sandloam/loam/siltloam/sasclloam/clayloam/siclloam/sandclay/siltclay/clay/pavement" //
"water/sand/loamsand/sandloam/loam/siltloam/saclloam/clayloam/siclloam/sandclay/siltclay/clay/pavement" //
" 0 - 12", "()", &soiltype_rechr);

declparam("soil_type", TDim::NHRU, "[4]", "0", "12",
"water/sand/loamsand/sandloam/loam/siltloam/sasclloam/clayloam/siclloam/sandclay/siltclay/clay/pavement" //
"water/sand/loamsand/sandloam/loam/siltloam/saclloam/clayloam/siclloam/sandclay/siltclay/clay/pavement" //
" 0 - 12", "()", &soil_type);

declparam("soil_rechr_max", TDim::NHRU, "[60.0]", "0.0", "350.0",
Expand Down
2 changes: 1 addition & 1 deletion crhmcode/src/modules/ClassVolumetric.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ void ClassVolumetric::decl(void) {
declvar("Si_V", TDim::NHRU, "Si_V copy of parameter Si", "()", &Si_V);

declparam("soil_type", TDim::NHRU, "[4]", "0", "12",
"water/sand/loamsand/sandloam/loam/siltloam/sasclloam/clayloam/siclloam/sandclay/siltclay/clay/pavement" //
"water/sand/loamsand/sandloam/loam/siltloam/saclloam/clayloam/siclloam/sandclay/siltclay/clay/pavement" //
" 0 - 12", "()", &soil_type);

declparam("soil_moist_max", TDim::NHRU, "[375.0]", "0.0", "5000.0",
Expand Down
10 changes: 5 additions & 5 deletions crhmcode/src/modules/Classevap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ void Classevap::decl(void) {

declparam("Zwind", TDim::NHRU, "[10]", "0.01", "100.0", "wind measurement height (Penman-Monteith)", "(m)", &Zwind);

declgetvar("*", "Rn", "(mm/m^2*int)", &Rn);
declgetvar("*", "RnD", "(mm/m^2*d)", &RnD);
declgetvar("*", "RnD_POS", "(mm/m^2*d)", &RnD_POS);
declgetvar("*", "Rn", "(mm/int)", &Rn);
declgetvar("*", "RnD", "(mm/d)", &RnD);
declgetvar("*", "RnD_POS", "(mm/d)", &RnD_POS);

declgetvar("*", "hru_t", "(" + string(DEGREE_CELSIUS) + ")", &hru_t);
declgetvar("*", "hru_u", "(m/s)", &hru_u);
Expand Down Expand Up @@ -226,10 +226,10 @@ void Classevap::finish(bool good) {

double Classevap::gamma(double Pa, double t) // Psychrometric constant (kPa/DEGREE_CELSIUS
{
return( 0.00163 * Pa / lambda(t)); // lambda (mJ/(kg DEGREE_CELSIUS))
return( 0.00163 * Pa / lambda(t)); // lambda (MJ/kg)
}

double Classevap::lambda(double t) // Latent heat of vaporization (mJ/(kg DEGREE_CELSIUS))
double Classevap::lambda(double t) // Latent heat of vaporization (MJ/kg)
{
return( 2.501 - 0.002361 * t );
}
Expand Down
6 changes: 3 additions & 3 deletions crhmcode/src/modules/ClassevapD.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ void ClassevapD::decl(void) {

decldiagparam("F_Qg", TDim::NHRU, "[0.1]", "0.0", "1.0", "fraction to ground flux, Qg = F_Qg*Rn", "()", &F_Qg);

declgetvar("*", "RnD", "(mm/m^2*d)", &RnD);
declgetvar("*", "RnD", "(mm/d)", &RnD);

declgetvar("*", "hru_tmean", "(" + string(DEGREE_CELSIUS) + ")", &hru_tmean);
declgetvar("*", "hru_umean", "(m/s)", &hru_umean);
Expand Down Expand Up @@ -165,11 +165,11 @@ void ClassevapD::finish(bool good) {

double ClassevapD::gamma(double Pa, double t) // Psychrometric constant (kPa/DEGREE_CELSIUS)
{
return( 0.00163 * Pa / lambda(t)); // lambda (mJ/(kg DEGREE_CELSIUS))
return( 0.00163 * Pa / lambda(t)); // lambda (MJ/kg)
}


double ClassevapD::lambda(double t) // Latent heat of vaporization (mJ/(kg DEGREE_CELSIUS))
double ClassevapD::lambda(double t) // Latent heat of vaporization (MJ/kg)
{
return( 2.501 - 0.002361 * t );
}
Expand Down
8 changes: 4 additions & 4 deletions crhmcode/src/modules/ClassevapD_Resist.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,11 @@ void ClassevapD_Resist::decl(void) {
declparam("PM_method", TDim::NHRU, "[0]", "0", "2", "Penman-Monteith method, 0 = RC min, 1 = LAI, 2 = bulk", "()", &PM_method);

declparam("soil_type", TDim::NHRU, "[2]", " 1", "12",
"HRU soil type (1->11): sand/loamsand/sandloam/loam/siltloam/sasclloam/clayloam/siclloam/sandclay/siltclay/clay", "()", &soil_type);
"HRU soil type (1->11): sand/loamsand/sandloam/loam/siltloam/saclloam/clayloam/siclloam/sandclay/siltclay/clay", "()", &soil_type);

declparam("soil_Depth", TDim::NHRU, "[1.0]", "0.0", "10.0", "depth of soil column", "(m)", &soil_Depth);

declgetvar("*", "RnD", "(mm/m^2*d)", &RnD);
declgetvar("*", "RnD", "(mm/d)", &RnD);
declgetvar("*", "hru_tmean", "(" + string(DEGREE_CELSIUS) + ")", &hru_tmean);
declgetvar("*", "hru_umean", "(m/s)", &hru_umean);
declgetvar("*", "hru_eamean", "(kPa)", &hru_eamean);
Expand Down Expand Up @@ -251,11 +251,11 @@ void ClassevapD_Resist::finish(bool good) {

double ClassevapD_Resist::gamma(double Pa, double t) // Psychrometric constant (kPa/DEGREE_CELSIUS)
{
return(0.00163 * Pa / lambda(t)); // lambda (mJ/(kg DEGREE_CELSIUS))
return(0.00163 * Pa / lambda(t)); // lambda (MJ/kg)
}


double ClassevapD_Resist::lambda(double t) // Latent heat of vaporization (mJ/(kg DEGREE_CELSIUS))
double ClassevapD_Resist::lambda(double t) // Latent heat of vaporization (MJ/kg)
{
return(2.501 - 0.002361 * t);
}
Expand Down
12 changes: 6 additions & 6 deletions crhmcode/src/modules/ClassevapX.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,15 @@ void ClassevapX::decl(void) {
declparam("PM_method", TDim::NHRU, "[0]", "0", "2", "Penman-Monteith method (used by Penman-Monteith), 0 = RC min, 1 = LAI, 2 = bulk.", "()", &PM_method);

declparam("soil_type", TDim::NHRU, "[2]", " 1", "12",
"HRU soil type (used by Penman-Monteith) [1->11]: sand/loamsand/sandloam/loam/siltloam/sasclloam/clayloam/siclloam/sandclay/siltclay/clay.", "()", &soil_type);
"HRU soil type (used by Penman-Monteith) [1->11]: sand/loamsand/sandloam/loam/siltloam/saclloam/clayloam/siclloam/sandclay/siltclay/clay.", "()", &soil_type);

declparam("soil_Depth", TDim::NHRU, "[1.0]", "0.0", "10.0", "depth of soil column (used by Penman-Monteith).", "(m)", &soil_Depth);

declgetvar("*", "soil_moist", "(mm)", &soil_moist);

declgetvar("*", "Rn", "(mm/m^2*int)", &Rn);
declgetvar("*", "RnD", "(mm/m^2*d)", &RnD);
declgetvar("*", "RnD_POS", "(mm/m^2*d)", &RnD_POS);
declgetvar("*", "Rn", "(mm/int)", &Rn);
declgetvar("*", "RnD", "(mm/d)", &RnD);
declgetvar("*", "RnD_POS", "(mm/d)", &RnD_POS);

declgetvar("*", "hru_t", "(" + string(DEGREE_CELSIUS) + ")", &hru_t);
declgetvar("*", "hru_u", "(m/s)", &hru_u);
Expand Down Expand Up @@ -278,10 +278,10 @@ void ClassevapX::finish(bool good) {

double ClassevapX::gamma(double Pa, double t) // Psychrometric constant (kPa/DEGREE_CELSIUS)
{
return( 0.00163 * Pa / lambda(t)); // lambda (mJ/(kg DEGREE_CELSIUS))
return( 0.00163 * Pa / lambda(t)); // lambda (MJ/kg)
}

double ClassevapX::lambda(double t) // Latent heat of vaporization (mJ/(kg DEGREE_CELSIUS))
double ClassevapX::lambda(double t) // Latent heat of vaporization (MJ/kg)
{
return( 2.501 - 0.002361 * t );
}
Expand Down
12 changes: 6 additions & 6 deletions crhmcode/src/modules/Classevap_Resist.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,14 @@ void Classevap_Resist::decl(void) {
declparam("PMmethod", TDim::NHRU, "[0]", "0", "1", "Penman-Monteith method, 0 = RC min, 1 = LAI", "()", &PM_method);

declparam("soil_type", TDim::NHRU, "[2]", "1", "12",
"HRU soil type (1->11): sand/loamsand/sandloam/loam/siltloam/sasclloam/clayloam/siclloam/sandclay/siltclay/clay",
"HRU soil type (1->11): sand/loamsand/sandloam/loam/siltloam/saclloam/clayloam/siclloam/sandclay/siltclay/clay",
"()", &soil_type);

declparam("soil_Depth", TDim::NHRU, "[1.0]", "0.0", "10.0", "depth of soil column", "(m)", &soil_Depth);

declgetvar("*", "Rn", "(mm/m^2*int)", &Rn);
declgetvar("*", "RnD", "(mm/m^2*d)", &RnD);
declgetvar("*", "RnD_POS", "(mm/m^2*d)", &RnD_POS);
declgetvar("*", "Rn", "(mm/int)", &Rn);
declgetvar("*", "RnD", "(mm/d)", &RnD);
declgetvar("*", "RnD_POS", "(mm/d)", &RnD_POS);

declgetvar("*", "hru_t", "(" + string(DEGREE_CELSIUS) + ")", &hru_t);
declgetvar("*", "hru_u", "(m/s)", &hru_u);
Expand Down Expand Up @@ -320,10 +320,10 @@ void Classevap_Resist::finish(bool good) {

double Classevap_Resist::gamma(double Pa, double t) // Psychrometric constant (kPa/DEGREE_CELCIUS)
{
return(0.00163 * Pa / lambda(t)); // lambda (mJ/(kg DEGREE_CELCIUS))
return(0.00163 * Pa / lambda(t)); // lambda (MJ/kg)
}

double Classevap_Resist::lambda(double t) // Latent heat of vaporization (mJ/(kg DEGREE_CELCIUS))
double Classevap_Resist::lambda(double t) // Latent heat of vaporization (MJ/kg)
{
return(2.501 - 0.002361 * t);
}
Expand Down
8 changes: 4 additions & 4 deletions crhmcode/src/modules/Classnetall.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ void Classnetall::decl(void) {

declvar("net", TDim::NHRU, "net all-wave radiation over time step", "(MJ/m^2*int)", &net);

decldiag("Rn", TDim::NHRU, "net all-wave radiation over time step", "(mm/m^2*int)", &Rn);
decldiag("Rn", TDim::NHRU, "net all-wave radiation over time step", "(mm/int)", &Rn);

declvar("netD", TDim::NHRU, "net all-wave radiation per day", "(MJ/m^2*d)", &netD);

declvar("RnD", TDim::NHRU, "net all-wave radiation per day", "(mm/m^2*d)", &RnD);
declvar("RnD", TDim::NHRU, "net all-wave radiation per day", "(mm/d)", &RnD);

decldiag("RnD_POS", TDim::NHRU, "Sum of positive net all-wave radiation per day", "(mm/m^2*d)", &RnD_POS);
decldiag("RnD_POS", TDim::NHRU, "Sum of positive net all-wave radiation per day", "(mm/d)", &RnD_POS);

declstatdiag("cum_net", TDim::NHRU, "cumulative net all-wave radiation", "(MJ/m^2)", &cum_net);

Expand Down Expand Up @@ -108,7 +108,7 @@ void Classnetall::run(void) {
double Net = (shortw*(1.0f-Albedo[hh]) + netlong/Global::Freq); // MJ/interval
netD[hh] += Net;

Net = Net/(2.501f-0.002361f*tday_intvls[ff][hh]); // MJ/m^2 to mm/m^2
Net = Net/(2.501f-0.002361f*tday_intvls[ff][hh]); // MJ/interval to mm/interval

RnD[hh] += Net;
if(Net > 0.0) RnD_POS[hh] += Net;
Expand Down