Skip to content

Minor fixes #1

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
samsrabin wants to merge 11 commits into
base: ctsm_sectorwater_pull_request_v2
Choose a base branch
from
Open

Minor fixes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f1788d2
Comment typo fixes.
samsrabin Sep 8, 2023
b4d9613
Reverted some whitespace-only changes.
samsrabin Sep 8, 2023
0a238ab
Corrected indentation.
samsrabin Sep 8, 2023
e0482dd
Deleted some end-of-line whitespace.
samsrabin Sep 8, 2023
d5a3c46
Added a space in endsubroutine.
samsrabin Sep 8, 2023
9cf43e8
Deleted some unnecessary/incomplete comments.
samsrabin Sep 8, 2023
edc2aeb
Lowercased Close().
samsrabin Sep 8, 2023
9efee0f
Missing sector water inputs: error msg now points to correct file.
samsrabin Sep 8, 2023
61e5eae
Replace 86400 with SHR_CONST_CDAY.
samsrabin Sep 8, 2023
eed9bf1
Deleted incorrect "sfc" in some comments.
samsrabin Sep 8, 2023
26a7625
CLMBuildNamelist: Changed else{if{ to elsif{.
samsrabin Sep 8, 2023
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
6 changes: 2 additions & 4 deletions bld/CLMBuildNamelist.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3026,10 +3026,8 @@ sub setup_logic_sectorwater_parameters {
$var = "sectorwater_river_volume_threshold";
if ( &value_is_true($nl->get_value("limit_sectorwater_if_rof_enabled")) ) {
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, $var);
} else {
if (defined($nl->get_value($var))) {
$log->fatal_error("$var can only be set if limit_sectorwater_if_rof_enabled is true");
}
} elsif (defined($nl->get_value($var))) {
$log->fatal_error("$var can only be set if limit_sectorwater_if_rof_enabled is true");
}
}

Expand Down
7 changes: 2 additions & 5 deletions src/biogeophys/HydrologyNoDrainageMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Module HydrologyNoDrainageMod
save
!
! !PUBLIC MEMBER FUNCTIONS:
public :: CalcAndWithdrawSectorWaterFluxes ! Calculates sectorwal water withdrawal, consumption and return flow fluxes; update the fields which are sent to the routing model through the coupler;
public :: CalcAndWithdrawSectorWaterFluxes ! Calculates sectoral water withdrawal, consumption and return flow fluxes; update the fields which are sent to the routing model through the coupler;
public :: CalcAndWithdrawIrrigationFluxes ! Calculates irrigation withdrawal fluxes and withdraws from groundwater
public :: HandleNewSnow ! Handle new snow falling on the ground
public :: HydrologyNoDrainage ! Calculates soil/snow hydrology without drainage
Expand All @@ -52,7 +52,7 @@ Module HydrologyNoDrainageMod
subroutine CalcAndWithdrawSectorWaterFluxes(bounds, soilhydrology_inst, sectorwater_inst, water_inst, volr, rof_prognostic)
!
! !DESCRIPTION:
! Calculates sectorwal water withdrawal, consumption and return flow fluxes;
! Calculates sectoral water withdrawal, consumption and return flow fluxes;
! Updates the fields which are sent to the routing model through the coupler;
!
! !USES:
Expand Down Expand Up @@ -110,9 +110,6 @@ subroutine CalcAndWithdrawSectorWaterFluxes(bounds, soilhydrology_inst, sectorwa
end do

! Update the qflx_sectorwater_col field corresponding to total sectoral consumption (except irrigation)
! Here I am not sure if it is needed to have loop over all tracers (it seems that the tracers mechanism is not maintained anymore)
! So I could in principle just use associate : w => water_inst%bulk_and_tracers(1) which correspond to bulk water.
! To stay in aggreement with the legacy code, I am looping over the tracers.
do i = water_inst%bulk_and_tracers_beg, water_inst%bulk_and_tracers_end
associate(w => water_inst%bulk_and_tracers(i))

Expand Down
4 changes: 2 additions & 2 deletions src/biogeophys/IrrigationMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ module IrrigationMod
real(r8), pointer :: irrig_rate_demand_patch (:) ! current irrigation rate, neglecting surface water source limitation [mm/s]
integer , pointer :: n_irrig_steps_left_patch (:) ! number of time steps for which we still need to irrigate today (if 0, ignore)
real(r8), pointer :: qflx_irrig_demand_patch (:) ! irrigation flux neglecting surface water source limitation [mm/s]

contains
! Public routines
! COMPILER_BUG(wjs, 2014-10-15, pgi 14.7) Add an "Irrigation" prefix to some generic routines like "Init"
Expand Down Expand Up @@ -448,7 +448,7 @@ subroutine ReadNamelist(this, NLFilename, use_aquifer_layer)
limit_irrigation_if_rof_enabled = limit_irrigation_if_rof_enabled, &
use_groundwater_irrigation = use_groundwater_irrigation, &
irrig_method_default = irrig_method_default_int)

if (masterproc) then
write(iulog,*) ' '
write(iulog,*) nmlname//' settings:'
Expand Down
Loading