Skip to content

Modified Suleiman-Ritchie soil evaporation #471

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

Modified Suleiman-Ritchie soil evaporation #471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
dc2d299
Proposed change to Suleiman-Ritchie soil evaporation
Jan 9, 2025
18daef5
ESR modifications unfinished
Jan 14, 2025
15c82a7
ESR_SoilEvap_mod - complete, needs testing
Jan 15, 2025
a9c093a
bug fixes - runs for all DSSAT experiments / treatments
Jan 20, 2025
9a1f4d3
clean up notes in old S-R routine
Jan 20, 2025
4caa176
Work on VBOSE problem.
Feb 6, 2025
fdc3530
In IPSIM.for, move all switch and method code checking to after exter…
Feb 7, 2025
bc52b0a
Remove some debugging code
Feb 7, 2025
1df2b66
ALOHA bug fix for VBOSE = 0
Feb 7, 2025
df70961
Remove checks from External_SimControls
Feb 7, 2025
3cd4c25
SAVE MEPHO, ISWSYM switches when using external controls
Feb 11, 2025
c0b1da4
IPSIM - fix for ISWSYM
Feb 11, 2025
77b75c2
Write the daily output for GHG.OUT file
Feb 13, 2025
799f093
Merge branch 'develop' of https://github.com/dssat/dssat-csm-os into …
Mar 2, 2025
61960a2
Merge branch 'vbose' of https://github.com/chporter/dssat-csm-os into…
Mar 3, 2025
15d5eed
Suleiman-Ritchie method uses 30 cm to limit soil evaporation (instead…
Mar 3, 2025
7c4d6ac
Modify Modified Suleiman-Ritchie soil evap method
Mar 13, 2025
5c95aba
remove ratio of diffusion methods
Mar 14, 2025
79f5fa7
Mod SR - use Ayman Suleiman's A & B coefficients from the paper
Mar 14, 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
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,6 +632,7 @@ set(
"Soil/SoilWater/WBAL.for"
"Soil/SoilWater/WBSUBS.for"
"SPAM/ESR_SoilEvap.for"
"SPAM/ESR_SoilEvap_mod.for"
"SPAM/ETPHOT.for"
"SPAM/ETPHR.for"
"SPAM/OPETPHOT.for"
Expand Down
28 changes: 14 additions & 14 deletions CSM_Main/LAND.for
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ C Soil Processes Module Variables
C-----------------------------------------------------------------------
REAL SNOW, WINF
REAL, DIMENSION(NL) :: NH4_plant, NO3_plant, SPi_Avail, SKi_Avail
REAL, DIMENSION(NL) :: ST, UPPM, SW, SWDELTS, UPFLOW
REAL, DIMENSION(NL) :: ST, UPPM, SW, SWDELTS, UPFLOW, ES_LYR
TYPE (SoilType) SOILPROP !type defined in ModuleDefs
TYPE (FloodWatType) FLOODWAT
TYPE (FloodNType) FloodN
Expand Down Expand Up @@ -166,7 +166,7 @@ C-----------------------------------------------------------------------
C Read initial soil data
C-----------------------------------------------------------------------
CALL SOIL(CONTROL, ISWITCH,
& ES, FERTDATA, FracRts, HARVRES, IRRAMT, !Input
& ES, ES_LYR, FERTDATA, FracRts, HARVRES, IRRAMT, !Input
& KTRANS, KUptake, OMAData, PUptake, RLV, !Input
& SENESCE, ST, SWDELTX,TILLVALS, UNH4, UNO3, !Input
& WEATHER, XHLAI, !Input
Expand All @@ -183,7 +183,7 @@ C-----------------------------------------------------------------------
& PSTRES1, PORMIN, RLV, RWUMX, SOILPROP, SW, !Input
& SWDELTS, UH2O, WEATHER, WINF, XHLAI, XLAI, !Input
& FLOODWAT, SWDELTU, !I/O
& EO, EOP, EOS, EP, ES, RWU, SRFTEMP, ST, !Output
& EO, EOP, EOS, EP, ES, ES_LYR, RWU, SRFTEMP, ST, !Output
& SWDELTX, TRWU, TRWUP, UPFLOW) !Output

C-----------------------------------------------------------------------
Expand Down Expand Up @@ -236,7 +236,7 @@ C-----------------------------------------------------------------------
C Seasonal initialization for soil processes
C-----------------------------------------------------------------------
CALL SOIL(CONTROL, ISWITCH,
& ES, FERTDATA, FracRts, HARVRES, IRRAMT, !Input
& ES, ES_LYR, FERTDATA, FracRts, HARVRES, IRRAMT, !Input
& KTRANS, KUptake, OMAData, PUptake, RLV, !Input
& SENESCE, ST, SWDELTX,TILLVALS, UNH4, UNO3, !Input
& WEATHER, XHLAI, !Input
Expand All @@ -255,7 +255,7 @@ C-----------------------------------------------------------------------
& PSTRES1, PORMIN, RLV, RWUMX, SOILPROP, SW, !Input
& SWDELTS, UH2O, WEATHER, WINF, XHLAI, XLAI, !Input
& FLOODWAT, SWDELTU, !I/O
& EO, EOP, EOS, EP, ES, RWU, SRFTEMP, ST, !Output
& EO, EOP, EOS, EP, ES, ES_LYR, RWU, SRFTEMP, ST, !Output
& SWDELTX, TRWU, TRWUP, UPFLOW) !Output

C-----------------------------------------------------------------------
Expand Down Expand Up @@ -308,7 +308,7 @@ C Call Soil processes module to determine today's rates of
C change of soil properties.
C-----------------------------------------------------------------------
CALL SOIL(CONTROL, ISWITCH,
& ES, FERTDATA, FracRts, HARVRES, IRRAMT, !Input
& ES, ES_LYR, FERTDATA, FracRts, HARVRES, IRRAMT, !Input
& KTRANS, KUptake, OMAData, PUptake, RLV, !Input
& SENESCE, ST, SWDELTX,TILLVALS, UNH4, UNO3, !Input
& WEATHER, XHLAI, !Input
Expand All @@ -326,7 +326,7 @@ C-----------------------------------------------------------------------
& PSTRES1, PORMIN, RLV, RWUMX, SOILPROP, SW, !Input
& SWDELTS, UH2O, WEATHER, WINF, XHLAI, XLAI, !Input
& FLOODWAT, SWDELTU, !I/O
& EO, EOP, EOS, EP, ES, RWU, SRFTEMP, ST, !Output
& EO, EOP, EOS, EP, ES, ES_LYR, RWU, SRFTEMP, ST, !Output
& SWDELTX, TRWU, TRWUP, UPFLOW) !Output

C-----------------------------------------------------------------------
Expand Down Expand Up @@ -356,7 +356,7 @@ C***********************************************************************
C Integrate soil state variables
C-----------------------------------------------------------------------
CALL SOIL(CONTROL, ISWITCH,
& ES, FERTDATA, FracRts, HARVRES, IRRAMT, !Input
& ES, ES_LYR, FERTDATA, FracRts, HARVRES, IRRAMT, !Input
& KTRANS, KUptake, OMAData, PUptake, RLV, !Input
& SENESCE, ST, SWDELTX,TILLVALS, UNH4, UNO3, !Input
& WEATHER, XHLAI, !Input
Expand All @@ -373,7 +373,7 @@ C-----------------------------------------------------------------------
& PSTRES1, PORMIN, RLV, RWUMX, SOILPROP, SW, !Input
& SWDELTS, UH2O, WEATHER, WINF, XHLAI, XLAI, !Input
& FLOODWAT, SWDELTU, !I/O
& EO, EOP, EOS, EP, ES, RWU, SRFTEMP, ST, !Output
& EO, EOP, EOS, EP, ES, ES_LYR, RWU, SRFTEMP, ST, !Output
& SWDELTX, TRWU, TRWUP, UPFLOW) !Output

C-----------------------------------------------------------------------
Expand Down Expand Up @@ -413,7 +413,7 @@ C***********************************************************************
CALL WEATHR(CONTROL, ISWITCH, WEATHER, YREND)

CALL SOIL(CONTROL, ISWITCH,
& ES, FERTDATA, FracRts, HARVRES, IRRAMT, !Input
& ES, ES_LYR, FERTDATA, FracRts, HARVRES, IRRAMT, !Input
& KTRANS, KUptake, OMAData, PUptake, RLV, !Input
& SENESCE, ST, SWDELTX,TILLVALS, UNH4, UNO3, !Input
& WEATHER, XHLAI, !Input
Expand All @@ -427,7 +427,7 @@ C***********************************************************************
& PSTRES1, PORMIN, RLV, RWUMX, SOILPROP, SW, !Input
& SWDELTS, UH2O, WEATHER, WINF, XHLAI, XLAI, !Input
& FLOODWAT, SWDELTU, !I/O
& EO, EOP, EOS, EP, ES, RWU, SRFTEMP, ST, !Output
& EO, EOP, EOS, EP, ES, ES_LYR, RWU, SRFTEMP, ST, !Output
& SWDELTX, TRWU, TRWUP, UPFLOW) !Output

C-----------------------------------------------------------------------
Expand Down Expand Up @@ -463,7 +463,7 @@ C Call WEATHER module to close current weather file

C Print seasonal summaries and close files.
CALL SOIL(CONTROL, ISWITCH,
& ES, FERTDATA, FracRts, HARVRES, IRRAMT, !Input
& ES, ES_LYR, FERTDATA, FracRts, HARVRES, IRRAMT, !Input
& KTRANS, KUptake, OMAData, PUptake, RLV, !Input
& SENESCE, ST, SWDELTX,TILLVALS, UNH4, UNO3, !Input
& WEATHER, XHLAI, !Input
Expand All @@ -477,7 +477,7 @@ C Print seasonal summaries and close files.
& PSTRES1, PORMIN, RLV, RWUMX, SOILPROP, SW, !Input
& SWDELTS, UH2O, WEATHER, WINF, XHLAI, XLAI, !Input
& FLOODWAT, SWDELTU, !I/O
& EO, EOP, EOS, EP, ES, RWU, SRFTEMP, ST, !Output
& EO, EOP, EOS, EP, ES, ES_LYR, RWU, SRFTEMP, ST, !Output
& SWDELTX, TRWU, TRWUP, UPFLOW) !Output

CALL PLANT(CONTROL, ISWITCH,
Expand Down Expand Up @@ -538,7 +538,7 @@ C End of Run
C***********************************************************************
ELSE IF (DYNAMIC .EQ. ENDRUN) THEN
CALL SOIL(CONTROL, ISWITCH,
& ES, FERTDATA, FracRts, HARVRES, IRRAMT, !Input
& ES, ES_LYR, FERTDATA, FracRts, HARVRES, IRRAMT, !Input
& KTRANS, KUptake, OMAData, PUptake, RLV, !Input
& SENESCE, ST, SWDELTX,TILLVALS, UNH4, UNO3, !Input
& WEATHER, XHLAI, !Input
Expand Down
Loading