Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
4efa2fb
Changes introduced with feature/SM_irrigation_model to the parent (o…
stefanocasirati Feb 13, 2024
fc5dec2
removed irrigation_rate from lsm_routines
stefanocasirati Feb 14, 2024
a1ad6d7
fixed typos
stefanocasirati Feb 14, 2024
4cd4fc0
integration changes from feature/SM_irrigation_model Part 2 (GEOS_cat…
stefanocasirati Feb 14, 2024
0148a78
cleaned
stefanocasirati Feb 14, 2024
1cc0a97
Bug Fix
stefanocasirati Feb 15, 2024
62a39ea
bug fixed
stefanocasirati Feb 16, 2024
4e07d34
Merge develop
stefanocasirati Apr 24, 2024
a3a560a
added module_irrig_params.F90 in makebcs
stefanocasirati Apr 24, 2024
85e6e0b
restored commented-out code related to irrigation
stefanocasirati Apr 24, 2024
7fbfa8a
fixed typo
stefanocasirati Apr 24, 2024
a253da2
Revert "fixed typo"
stefanocasirati Apr 24, 2024
36aee02
Revert "restored commented-out code related to irrigation"
stefanocasirati Apr 24, 2024
f10d5af
fixed Irrigation bcs
stefanocasirati May 29, 2024
a6aca72
Fixed Irrigation Fractions and minor bugs
stefanocasirati Jun 7, 2024
68d4d49
Merg Develop
stefanocasirati Jun 8, 2024
01bb4f2
fixed bugs irrigation
stefanocasirati Jun 12, 2024
e2734cb
merge develop
stefanocasirati Jun 12, 2024
4de1127
Updated calculation LAI thresholds necessary to trigger Irrigation
stefanocasirati Jun 25, 2024
b14113e
Cleaned code and updated comments
stefanocasirati Jun 25, 2024
a431a6b
Flood irrigation separated into Furrow and Flood irrigation
stefanocasirati Aug 29, 2024
2ee5b6c
Merge branch 'develop' into feature/stefanocasirati/irrigation
stefanocasirati Aug 29, 2024
a9d65c4
fixed typo
stefanocasirati Aug 30, 2024
6b95187
code fix
stefanocasirati Sep 4, 2024
27061a2
Merge branch 'develop' into feature/stefanocasirati/irrigation (manua…
gmao-rreichle Sep 25, 2024
c760970
minor cleanup for Irrigation module
gmao-rreichle Sep 25, 2024
853f1cd
fixed error in manual conflict resolution from most recent merge of d…
gmao-rreichle Sep 25, 2024
c26f496
Merge branch 'develop' into feature/stefanocasirati/irrigation
gmao-rreichle Sep 30, 2024
13c4501
additional minor edits of comments and whitespace cleanup (GEOS_LandG…
gmao-rreichle Sep 30, 2024
04b390d
Addressed some of the comments and fixed a bug
stefanocasirati Oct 14, 2024
a83a485
Merge branch 'develop' into feature/stefanocasirati/irrigation
gmao-rreichle Dec 11, 2024
cffeaeb
added minor comment (GEOS_LandGridComp.F90)
gmao-rreichle Dec 16, 2024
ed1a37f
Merge branch 'develop' into feature/stefanocasirati/irrigation
gmao-rreichle Feb 3, 2025
9486c7d
(tentatively) renamed irrigation exports
gmao-rreichle Feb 3, 2025
d4a2053
make "if RUN_IRRIG" statements consistent across GCs (GEOS_LandGridCo…
gmao-rreichle Feb 8, 2025
d0625a1
make sure soil moisture prognostics (srfexc, rzexc, catdef) remain va…
gmao-rreichle Feb 8, 2025
948cf24
updated LONG_NAME attributes to match M21C convention (GEOS_Irrigatio…
gmao-rreichle Feb 8, 2025
fa23174
added comment about future modifications (GEOS_CatchCNCLM4?GridComp.F90)
gmao-rreichle Feb 8, 2025
6e919a4
first pass renaming irrigation model prognostics and parameters (inte…
gmao-rreichle Feb 8, 2025
43167ab
bug fix in handling of irrigation parameter MIDS_LENGTH (irrigation_m…
gmao-rreichle Feb 8, 2025
97ca013
avoid duplicate hardwiring of NCROPS parameter (module_irrig_params.F90)
gmao-rreichle Feb 8, 2025
fb65cfe
fixed build error from previous commit (GEOS_IrrigationGridComp.F90)
gmao-rreichle Feb 9, 2025
0fab87e
attempt to have makebcs see GEOS_Irrigation lib
gmao-rreichle Feb 9, 2025
9803b4d
another attempt at CMake connections for irrigation
gmao-rreichle Feb 9, 2025
fac3b5c
Merge branch 'develop' into feature/stefanocasirati/irrigation; manua…
gmao-rreichle Feb 24, 2025
28f0374
fixed indent, only white-space changes (mkCatchParam.F90)
gmao-rreichle Feb 24, 2025
c3e0661
Merge branch 'develop' into feature/stefanocasirati/irrigation
gmao-rreichle Feb 25, 2025
3b8abf1
Merge branch 'develop' into feature/stefanocasirati/irrigation
weiyuan-jiang May 2, 2025
019cfbf
export IRRG_RATE_TOT from IrrigationGC instead of Catch[CN]GC
gmao-rreichle Jul 29, 2025
166073d
use consistent order of IRRG_RATE_* terms: SPR, DRP, FRW, PDY
gmao-rreichle Jul 29, 2025
acc3eac
irrigation: changed rc variable names (IRR_EFCOR->IRRG_EFCOR, MIDS_LE…
gmao-rreichle Jul 29, 2025
456b0aa
added call to calc_soil_moist after application of irrigation water (…
gmao-rreichle Jul 29, 2025
fcffb32
cleaned up obsolete comment (irrigation_model.F90)
gmao-rreichle Jul 29, 2025
55c15de
Merge branch 'develop' into feature/stefanocasirati/irrigation
gmao-rreichle Jul 30, 2025
e817fbe
added spurious water balance term for irrigation to capture irrigatio…
gmao-rreichle Jul 30, 2025
d93d833
rename dzsf -> dzsf_in_mm to fix build error in previous commit and m…
gmao-rreichle Jul 30, 2025
85de0e6
removed obsolete comment re. irrigation (GEOS_CatchCNCLM45GridComp.F90)
gmao-rreichle Jul 30, 2025
5cfebed
clarified comments re. soil moisture thresholds for irrigation (GEOS_…
gmao-rreichle Jul 30, 2025
f747b96
clarified precip inputs to Catchment in presence of irrigation (GEOS_…
gmao-rreichle Jul 30, 2025
58bd303
added irrigation "drip_threshold" (IRRG_DRP_THRES) for clarity; edite…
gmao-rreichle Jul 30, 2025
6677718
edited comments (GEOS_IrrigationGridComp.F90, irrigation_model.F90)
gmao-rreichle Jul 30, 2025
9437228
avoid == for real numbers (irrigation_model.F90)
gmao-rreichle Jul 30, 2025
edf8419
irrigation: clean up werror; rename PLS_IN --> PLS_SPR for clarity (G…
gmao-rreichle Jul 30, 2025
09f87e9
remove obsolete local variable RUN_IRRIG (GEOS_CatchCNCLM40GridComp.F90)
gmao-rreichle Jul 30, 2025
340c8a3
replaced EXIT() with _ASSERT() (irrigation_model.F90)
gmao-rreichle Jul 30, 2025
ee9ecba
_ASSERT() allowable values of IRRG_TRIGGER and IRRG_METHOD (GEOS_Irri…
gmao-rreichle Jul 30, 2025
d27718a
fixed/added _ASSERT statements (irrigation_model.F90)
gmao-rreichle Aug 7, 2025
5410421
Merge branch 'develop' into feature/stefanocasirati/irrigation
gmao-rreichle Aug 26, 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
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ set (alldirs
GEOSlana_GridComp
GEOSroute_GridComp
GEOSigni_GridComp
GEOSirrigation_GridComp
)

esma_add_library (${this}
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -671,6 +671,42 @@ subroutine SetServices ( GC, RC )
RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddImportSpec(GC ,&
SHORT_NAME = 'IRRG_RATE_SPR' ,&
LONG_NAME = 'irrigation_flux_sprinkler' ,&
UNITS = 'kg m-2 s-1' ,&
DIMS = MAPL_DimsTileOnly ,&
VLOCATION = MAPL_VLocationNone ,&
RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddImportSpec(GC ,&
SHORT_NAME = 'IRRG_RATE_DRP' ,&
LONG_NAME = 'irrigation_flux_drip' ,&
UNITS = 'kg m-2 s-1' ,&
DIMS = MAPL_DimsTileOnly ,&
VLOCATION = MAPL_VLocationNone ,&
RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddImportSpec(GC ,&
SHORT_NAME = 'IRRG_RATE_FRW' ,&
LONG_NAME = 'irrigation_flux_furrow' ,&
UNITS = 'kg m-2 s-1' ,&
DIMS = MAPL_DimsTileOnly ,&
VLOCATION = MAPL_VLocationNone ,&
RC=STATUS )
VERIFY_(STATUS)

call MAPL_AddImportSpec(GC ,&
SHORT_NAME = 'IRRG_RATE_PDY' ,&
LONG_NAME = 'irrigation_flux_paddy' ,&
UNITS = 'kg m-2 s-1' ,&
DIMS = MAPL_DimsTileOnly ,&
VLOCATION = MAPL_VLocationNone ,&
RC=STATUS )
VERIFY_(STATUS)

! EXPORT STATE:
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'LST', CHILD_ID = CATCHCN, RC=STATUS )
VERIFY_(STATUS)
Expand Down Expand Up @@ -844,6 +880,8 @@ subroutine SetServices ( GC, RC )
VERIFY_(STATUS)
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'SPSNOW' , CHILD_ID = CATCHCN, RC=STATUS )
VERIFY_(STATUS)
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'SPIRRG' , CHILD_ID = CATCHCN, RC=STATUS )
VERIFY_(STATUS)
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'WESNN1' , CHILD_ID = CATCHCN, RC=STATUS )
VERIFY_(STATUS)
call MAPL_AddExportSpec ( GC, SHORT_NAME = 'WESNN2' , CHILD_ID = CATCHCN, RC=STATUS )
Expand Down

Large diffs are not rendered by default.

Loading
Loading