Skip to content

Bugfix develop various #19

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

Merged
jprestop merged 4 commits into from
Feb 9, 2026
Merged

Bugfix develop various #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f69301e
Added if (surflayerSelector == 1) around queryFloatParameter for surf…
jprestop Jan 9, 2026
ce5a1c1
Removed atmosphere_boundary_layer_thickness as a standard name for In…
jprestop Jan 9, 2026
eb60ffe
Corrected the units for qflux
jprestop Jan 9, 2026
d7d586c
Corrected the units for qskin
jprestop Jan 9, 2026
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
10 changes: 6 additions & 4 deletions SRC/HYDRO_CORE/hydro_core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,9 @@ int hydro_coreGetParams(){
errorCode = queryFloatParameter("moistureCondTscale", &moistureCondTscale, 1e-4, 1000.0, PARAM_MANDATORY);
errorCode = queryIntegerParameter("moistureCondBasePres", &moistureCondBasePres, 0, 1, PARAM_MANDATORY);
errorCode = queryFloatParameter("moistureMPcallTscale", &moistureMPcallTscale, 1e-4, 1000.0, PARAM_MANDATORY);
errorCode = queryFloatParameter("surflayer_wq", &surflayer_wq, -5e+0, 5e+0, PARAM_MANDATORY);
if (surflayerSelector == 1){
errorCode = queryFloatParameter("surflayer_wq", &surflayer_wq, -5e+0, 5e+0, PARAM_MANDATORY);
}
if (surflayerSelector == 2){
errorCode = queryFloatParameter("surflayer_qr", &surflayer_qr, -1e+1, 1e+1, PARAM_MANDATORY);
errorCode = queryIntegerParameter("surflayer_qskin_input", &surflayer_qskin_input, 0, 1, PARAM_OPTIONAL);
Expand Down Expand Up @@ -3429,12 +3431,12 @@ int hydro_coreAddFieldAttributes(char *fieldName, int isForcing) {
{"ql", "g kg-1", "Cloud liquid water mixing ratio", "cloud_liquid_water_mixing_ratio"},
{"fricVel", "m s-1", "Surface friction velocity", "surface_friction_velocity"},
{"htFlux", "K m s-1", "Surface sensible heat flux", "surface_upward_sensible_heat_flux"},
{"qFlux", "kg kg-1 m s-1", "Surface latent heat flux", "surface_upward_latent_heat_flux"},
{"qFlux", "g kg-1 m s-1", "Surface latent heat flux", "surface_upward_latent_heat_flux"},
{"tskin", "K", "Surface skin temperature", "surface_temperature"},
{"qskin", "kg kg-1", "Surface skin water vapor mixing ratio", NULL},
{"qskin", "g kg-1", "Surface skin water vapor mixing ratio", NULL},
{"z0m", "m", "Roughness length for momentum", "surface_roughness_length_for_momentum_in_air"},
{"z0t", "m", "Roughness length for heat", "surface_roughness_length_for_heat_in_air"},
{"invOblen", "m-1", "Inverse Obukhov length", "atmosphere_boundary_layer_thickness"},
{"invOblen", "m-1", "Inverse Obukhov length", NULL},
{"CanopyLAD", "m-1", "Leaf area density", "leaf_area_density"},
{"SeaMask", "-", "Sea mask", "sea_area_fraction"},
{NULL, NULL, NULL, NULL} // End marker
Expand Down
6 changes: 3 additions & 3 deletions scripts/python_utilities/post-processing/field_attributes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
"ql": ["g kg-1", "Cloud liquid water mixing ratio", "cloud_liquid_water_mixing_ratio"],
"fricVel": ["m s-1", "Surface friction velocity", "surface_friction_velocity"],
"htFlux": ["K m s-1", "Surface sensible heat flux", "surface_upward_sensible_heat_flux"],
"qFlux": ["kg kg-1 m s-1", "Surface latent heat flux", "surface_upward_latent_heat_flux"],
"qFlux": ["g kg-1 m s-1", "Surface latent heat flux", "surface_upward_latent_heat_flux"],
"tskin": ["K", "Surface skin temperature", "surface_temperature"],
"qskin": ["kg kg-1", "Surface skin water vapor mixing ratio", null],
"qskin": ["g kg-1", "Surface skin water vapor mixing ratio", null],
"z0m": ["m", "Roughness length for momentum", "surface_roughness_length_for_momentum_in_air"],
"z0t": ["m", "Roughness length for heat", "surface_roughness_length_for_heat_in_air"],
"invOblen": ["m-1", "Inverse Obukhov length", "atmosphere_boundary_layer_thickness"],
"invOblen": ["m-1", "Inverse Obukhov length", null],
"cellpert_amp": ["K", "Cell perturbation amplitude", null],
"cellpert_nts": ["-", "Cell perturbation number of time steps", null],
"cellpert_ktop": ["-", "Cell perturbation top grid level", null],
Expand Down