Skip to content

Noah-MP Miguez-Macho and Fan #1418

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 34 commits into
base: master
Choose a base branch
from
Open

Noah-MP Miguez-Macho and Fan #1418

Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
3d00edd
Adds Noah-MP precipitation timestep fix for cases where LIS dt is gre…
Apr 29, 2021
a1ae48b
Merge branch 'master' of https://github.com/NASA-LIS/LISF
Oct 22, 2021
a0051ec
Noah-MP MMF implementation, Shugong Wang
shugongwang Nov 5, 2021
45485bc
Merge branch 'master' of github:NASA-LIS/LISF
Nov 5, 2021
2e8a58a
Commit mmf_start
shugongwang Nov 8, 2021
de93094
SMCEQ maybe a state variable, rather than a parameter
shugongwang Nov 8, 2021
a8fe289
Merge branch 'master' of github:TimLahmers/LISF into noahmp_mmf
Dec 2, 2021
3eed614
Add PSI Fix lost in previous MMF development.
Dec 10, 2021
0f02ec8
Corrects indexing error in Noah-MP MMF Scheme.
Dec 14, 2021
81f7922
Fix restart modules for perfect MMF restarts; includes debug print st…
Feb 1, 2022
13a7607
Fix indexing error with no-data values; comment out debug statements.
Mar 23, 2022
4698bae
Add MMF variables Rech, Qrfs, Qsprings, Wtd to Noah-MP401 output.
Mar 23, 2022
9edba8e
Corrects MMF sub-surface flow errors by removing bug with WTD and ZWT…
Apr 12, 2022
948de67
Update comments in MMF branch.
May 23, 2022
18bd181
Merge branch 'master' of github:NASA-LIS/LISF into noahmp_mmf
May 23, 2022
b3a9708
Merge branch 'master' of github:NASA-LIS/LISF into noahmp_mmf
Jun 14, 2022
59c5c1f
Prevent unphysical SMC values at initialization for MMF
Aug 12, 2022
60c0f06
Fixes Bug with Flux Accumulation Variables in MMF GW Scheme
Nov 14, 2022
e31757c
Merge branch 'master' of github.com:NASA-LIS/LISF into noahmp_mmf
Jan 6, 2023
efad6c2
Merge branch 'master' of github.com:NASA-LIS/LISF into noahmp_mmf
Feb 6, 2023
0f423c1
Merge branch 'master' of github.com:NASA-LIS/LISF into noahmp_mmf
Feb 22, 2023
14c7d95
Update specification of Noah-MP index variables for MMF.
Mar 27, 2023
94d3580
Merge branch 'master' of github.com:NASA-LIS/LISF into noahmp_mmf
May 12, 2023
527e92c
Merge branch 'master' of github.com:NASA-LIS/LISF into noahmp_mmf
Jun 13, 2023
96b24b7
Merge branch 'master' of github.com:NASA-LIS/LISF into noahmp_mmf
Jul 14, 2023
d55d3fc
Merge branch 'master' of github.com:NASA-LIS/LISF into noahmp_mmf
Jul 17, 2023
6947538
Fix MMF Initialization bug for parallel processor configurations.
Aug 10, 2023
5424c4e
Fix bug w/MMF scheme; enable LIS to finish when run with other Noah-M…
Aug 12, 2023
a3a6114
Update indices for coldstart setup to support soil data other than ST…
Sep 22, 2023
a02a3e3
Merge branch 'master' of github.com:NASA-LIS/LISF into noahmp_mmf
Sep 22, 2023
7f9be93
Merge branch 'master' of https://github.com/NASA-LIS/LISF into noahmp…
Jul 31, 2024
074fdd2
Eliminate LIS Noah-MP v4.0.1 MMF Hard-Coded Soil and Veg layer-counts
Aug 2, 2024
9f8a20c
Fix RelSMC output bug; solves problem of RelSMC being moved out of ma…
Aug 6, 2024
529f5d0
Set MMF Urban Classification to be same as LIS_rc%urbanclass
Aug 23, 2024
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
129 changes: 129 additions & 0 deletions lis/core/LIS_histDataMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,26 @@ module LIS_histDataMod
public :: LIS_MOC_SNOWSURFACEQ
!public :: LIS_MOC_SNOWWIND_DIR

! MMF SW
!public :: LIS_MOC_SMCWTD
public :: LIS_MOC_QRF
public :: LIS_MOC_QRFS
public :: LIS_MOC_QSPRING
public :: LIS_MOC_QSPRINGS
public :: LIS_MOC_QSLAT
public :: LIS_MOC_RECH
public :: LIS_MOC_WTD
public :: LIS_MOC_DEEPRECH
!integer :: LIS_MOC_SMCWTD = -9999
integer :: LIS_MOC_QRF = -9999
integer :: LIS_MOC_QRFS = -9999
integer :: LIS_MOC_DEEPRECH = -9999
integer :: LIS_MOC_QSPRING = -9999
integer :: LIS_MOC_QSPRINGS = -9999
integer :: LIS_MOC_QSLAT = -9999
integer :: LIS_MOC_RECH = -9999
integer :: LIS_MOC_WTD = -9999

! SnowModel outputs:
public :: LIS_MOC_SWE_SM
public :: LIS_MOC_SNOWDEPTH_SM
Expand Down Expand Up @@ -1197,6 +1217,115 @@ subroutine LIS_histDataInit(n, ntiles)
!-------------------------------------------------------------------------
! read the meta data attributes for each variable
!-------------------------------------------------------------------------
!!! MMF scheme
!call ESMF_ConfigFindLabel(modelSpecConfig,"SmcWtd:",rc=rc)
!call get_moc_attributes(modelSpecConfig, LIS_histData(n)%head_lsm_list, &
! "SmcWtd",&
! "soil_moisture_between_bottom_of_the_soil_and_the_water_table",&
! "soil moisture between bottom of the soil and the water table",rc)
!if ( rc == 1 ) then
! call register_dataEntry(LIS_MOC_LSM_COUNT,LIS_MOC_SMCWTD,&
! LIS_histData(n)%head_lsm_list,&
! n,1,ntiles,(/"m3/m3"/),1,(/"-"/),1,112,0,&
! model_patch=.true.)
!endif

call ESMF_ConfigFindLabel(modelSpecConfig,"Qrf:",rc=rc)
call get_moc_attributes(modelSpecConfig, LIS_histData(n)%head_lsm_list, &
"Qrf",&
"groundwater_river_water_flux",&
"groundwater river water flux",rc)
if ( rc == 1 ) then
call register_dataEntry(LIS_MOC_LSM_COUNT,LIS_MOC_QRF,&
LIS_histData(n)%head_lsm_list,&
n,1,ntiles,(/"mm"/),1,(/"-"/),1,112,0,&
model_patch=.true.)
endif

call ESMF_ConfigFindLabel(modelSpecConfig,"Qrfs:",rc=rc)
call get_moc_attributes(modelSpecConfig, LIS_histData(n)%head_lsm_list, &
"Qrfs",&
"cumulated_groundwater_river_water_flux",&
"cumulated groundwater river water flux",rc)
if ( rc == 1 ) then
call register_dataEntry(LIS_MOC_LSM_COUNT,LIS_MOC_QRFS,&
LIS_histData(n)%head_lsm_list,&
n,1,ntiles,(/"mm"/),1,(/"-"/),1,112,0,&
model_patch=.true.)
endif

call ESMF_ConfigFindLabel(modelSpecConfig,"Qspring:",rc=rc)
call get_moc_attributes(modelSpecConfig, LIS_histData(n)%head_lsm_list, &
"Qspring",&
"water_springing_at_the_surface_from_groundwater_convergence_in_the_column",&
"water springing at the surface from groundwater convergence in the column",rc)
if ( rc == 1 ) then
call register_dataEntry(LIS_MOC_LSM_COUNT,LIS_MOC_QSPRING,&
LIS_histData(n)%head_lsm_list,&
n,1,ntiles,(/"mm"/),1,(/"-"/),1,112,0,&
model_patch=.true.)
endif

call ESMF_ConfigFindLabel(modelSpecConfig,"Qsprings:",rc=rc)
call get_moc_attributes(modelSpecConfig, LIS_histData(n)%head_lsm_list, &
"Qsprings",&
"accumulated_water_springing_at_the_surface_from_groundwater_convergence_in_the_column",&
"accumulated water springing at the surface from groundwater convergence in the column",rc)
if ( rc == 1 ) then
call register_dataEntry(LIS_MOC_LSM_COUNT,LIS_MOC_QSPRINGS,&
LIS_histData(n)%head_lsm_list,&
n,1,ntiles,(/"mm"/),1,(/"-"/),1,112,0,&
model_patch=.true.)
endif

call ESMF_ConfigFindLabel(modelSpecConfig,"Qslat:",rc=rc)
call get_moc_attributes(modelSpecConfig, LIS_histData(n)%head_lsm_list, &
"Qslat",&
"accumulated_lateral_flow", &
"accumulated lateral flow",rc)
if ( rc == 1 ) then
call register_dataEntry(LIS_MOC_LSM_COUNT,LIS_MOC_QSLAT,&
LIS_histData(n)%head_lsm_list,&
n,1,ntiles,(/"mm"/),1,(/"-"/),1,112,0,&
model_patch=.true.)
endif

call ESMF_ConfigFindLabel(modelSpecConfig,"Rech:",rc=rc)
call get_moc_attributes(modelSpecConfig, LIS_histData(n)%head_lsm_list, &
"Rech",&
"accumulated_recharge", &
"accumulated recharge",rc)
if ( rc == 1 ) then
call register_dataEntry(LIS_MOC_LSM_COUNT,LIS_MOC_RECH,&
LIS_histData(n)%head_lsm_list,&
n,1,ntiles,(/"mm"/),1,(/"-"/),1,112,0,&
model_patch=.true.)
endif

call ESMF_ConfigFindLabel(modelSpecConfig,"DeepRech:",rc=rc)
call get_moc_attributes(modelSpecConfig, LIS_histData(n)%head_lsm_list, &
"DeepRech",&
"accumulated_recharge_when_deep", &
"accumulated recharge when deep",rc)
if ( rc == 1 ) then
call register_dataEntry(LIS_MOC_LSM_COUNT,LIS_MOC_DEEPRECH,&
LIS_histData(n)%head_lsm_list,&
n,1,ntiles,(/"mm"/),1,(/"-"/),1,112,0,&
model_patch=.true.)
endif

call ESMF_ConfigFindLabel(modelSpecConfig,"Wtd:",rc=rc)
call get_moc_attributes(modelSpecConfig, LIS_histData(n)%head_lsm_list, &
"Wtd",&
"accumulated_groundwater_river_water_flux",&
"accumulated groundwater river water flux",rc)
if ( rc == 1 ) then
call register_dataEntry(LIS_MOC_LSM_COUNT,LIS_MOC_WTD,&
LIS_histData(n)%head_lsm_list,&
n,1,ntiles,(/"m"/),1,(/"-"/),1,112,0,&
model_patch=.true.)
endif

!!! JULES
call ESMF_ConfigFindLabel(modelSpecConfig,"SnowSoot:",rc=rc)
call get_moc_attributes(modelSpecConfig, LIS_histData(n)%head_lsm_list, &
Expand Down
Loading