Skip to content
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

Draft pr just to compare recent changes #1

Draft
wants to merge 17 commits into
base: update-for-comparing
Choose a base branch
from
Draft

Draft pr just to compare recent changes #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3a1247c
Clean code, add conditions for exit, fix bugs
mvdebolskiy Sep 6, 2024
11d6a23
update tests
mvdebolskiy Sep 10, 2024
36262f8
Add totmyc for nytrogen
mvdebolskiy Sep 10, 2024
19fdafc
Add fixes for various mistakes
mvdebolskiy Sep 10, 2024
e97c6e6
add pools and flux update to decomp
mvdebolskiy Sep 10, 2024
31d9bb4
add single point test
mvdebolskiy Sep 17, 2024
cd5b564
wip balance fix and refactor
mvdebolskiy Sep 17, 2024
8946896
move column vars to flux types for output
mvdebolskiy Sep 19, 2024
1f821aa
Fix bug with decomp
mvdebolskiy Sep 19, 2024
7a650f1
fix enzymes.
mvdebolskiy Sep 20, 2024
5afe259
fix mining
mvdebolskiy Sep 20, 2024
8ae3568
another mining fix
mvdebolskiy Sep 20, 2024
26b7c96
availc changes
elisacw Sep 23, 2024
4e31b79
rename paths, add more out.
mvdebolskiy Sep 24, 2024
d5450eb
revert
elisacw Sep 25, 2024
1f25020
add myc tmp variables
elisacw Oct 25, 2024
b550b56
try
elisacw Oct 28, 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
1 change: 1 addition & 0 deletions cime_config/testdefs/testmods_dirs/clm/mimics/user_nl_clm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ hist_dov2xy = .true., .true.
hist_ndens = 1,1,1,1,1,1
hist_nhtfrq = 1,1
hist_mfilt = 1,1
paramfile = '/cluster/projects/nn2806k/elisacw/parameters/clm_params_mimicsplus_netcdf5_11.09.24.nc'
10 changes: 5 additions & 5 deletions cime_config/testdefs/testmods_dirs/clm/mimicsplus/user_nl_clm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
hist_dov2xy = .true., .true.
! Even though only 2 history tapes are defined here, set ndens to 1 for up to 6 history
! tapes, for the sake of mods that extend these default mods and may add other history tapes
hist_ndens = 1,1,1,1,1,1,1 !1=daily, 0=monthly output
hist_nhtfrq = 0,0,0,0,0,0,0
hist_nhtfrq = 1,1,1,1,1,1,1
hist_mfilt = 1,1,1,1,1,1,1
hist_fincl1 = 'TRAFFICFLUX', 'SNOWLIQ:A','SNOWICE:A'
! Add FCO2 because few (if any) tests send this flux to the coupler, so it isn't checked via cpl hist files
Expand All @@ -17,7 +16,7 @@ hist_dov2xy = .true., .true.

hist_fincl3 = 'TOTMYCC', 'SOILC_vr', 'TOTMICC', 'TOTMYCC', 'TOTLITC', 'TOTSOMC', 'TOTLITC_1m', 'TOTSOMC_1m',
'DYN_COL_SOIL_ADJUSTMENTS_C', 'TOTCOLC', 'TOTECOSYSC', 'LIT_MET_C_vr', 'LIT_STR_C_vr', 'SOM_AVL_C_vr',
'SOM_CHEM_C_vr', 'SOM_PHYS_C_vr', 'MIC_COP_C_vr', 'MIC_OLI_C_vr', 'MYC_ECM_C_vr', 'MYC_AM_C_vr'
'SOM_CHEM_C_vr', 'SOM_PHYS_C_vr', 'MIC_COP_C_vr', 'MIC_OLI_C_vr', 'MYC_ECM_C_vr', 'MYC_AM_C_vr', 'AVAILC'

hist_fincl5 = 'L1_RESP_FRAC_M1_vr', 'L1_RESP_FRAC_M2_vr', 'L2_RESP_FRAC_M1_vr', 'L2_RESP_FRAC_M2_vr',
'M1_RESP_FRAC_S1_vr', 'M1_RESP_FRAC_S2_vr', 'M1_RESP_FRAC_S3_vr',
Expand All @@ -43,10 +42,11 @@ hist_dov2xy = .true., .true.


use_ssre = .true.
paramfile = '/cluster/projects/nn2806k/elisacw/parameters/clm_params_mimicsplus.nc'
paramfile = '/cluster/projects/nn2806k/elisacw/parameters/clm_params_mimicsplus_netcdf5_11.09.24.nc'


soil_decomp_method = 'MIMICSplusAas2023'
hist_fincl1 += 'TOTMYCC', 'SOILC_vr', 'TOTMICC', 'TOTMYCC', 'TOTLITC', 'TOTSOMC', 'TOTLITC_1m', 'TOTSOMC_1m',
'DYN_COL_SOIL_ADJUSTMENTS_C', 'TOTCOLC', 'TOTECOSYSC', 'LIT_MET_C_vr', 'LIT_STR_C_vr', 'SOM_AVL_C_vr',
'SOM_CHEM_C_vr', 'SOM_PHYS_C_vr', 'MIC_COP_C_vr', 'MIC_OLI_C_vr', 'MYC_ECM_C_vr', 'MYC_AM_C_vr'
'SOM_CHEM_C_vr', 'SOM_PHYS_C_vr', 'MIC_COP_C_vr', 'MIC_OLI_C_vr', 'MYC_ECM_C_vr', 'MYC_AM_C_vr'

2 changes: 2 additions & 0 deletions cime_config/testdefs/testmods_dirs/clm/mimicspluslong/README
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
This test mod turns on the MIMICSplus instead of the MIMICS or CENTURY below-ground
biogeochemistry.
Empty file added cime_config/testdefs/testmods_dirs/clm/mimicspluslong/include_user_mods
View file
Open in desktop
Empty file.
3 changes: 3 additions & 0 deletions cime_config/testdefs/testmods_dirs/clm/mimicspluslong/shell_commands
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash
./xmlchange CLM_FORCE_COLDSTART="on"

52 changes: 52 additions & 0 deletions cime_config/testdefs/testmods_dirs/clm/mimicspluslong/user_nl_clm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
hist_dov2xy = .true., .true.
! Even though only 2 history tapes are defined here, set ndens to 1 for up to 6 history
! tapes, for the sake of mods that extend these default mods and may add other history tapes
hist_nhtfrq = 0,0,0,0,0,0,0
hist_mfilt = 1,1,1,1,1,1,1
hist_fincl1 = 'TRAFFICFLUX', 'SNOWLIQ:A','SNOWICE:A'
! Add FCO2 because few (if any) tests send this flux to the coupler, so it isn't checked via cpl hist files
hist_fincl1 += 'FCO2'
hist_fincl2 = 'LIT_MET_C_TO_MIC_COP_C', 'LIT_MET_C_TO_MIC_OLI_C', 'LIT_STR_C_TO_MIC_COP_C', 'LIT_STR_C_TO_MIC_OLI_C',
'MIC_COP_C_TO_SOM_AVL_C', 'MIC_COP_C_TO_SOM_CHEM_C', 'MIC_COP_C_TO_SOM_PHYS_C',
'MIC_OLI_C_TO_SOM_AVL_C', 'MIC_OLI_C_TO_SOM_CHEM_C', 'MIC_OLI_C_TO_SOM_PHYS_C',
'SOM_CHEM_C_TO_SOM_AVL_C', 'SOM_PHYS_C_TO_SOM_AVL_C',
'SOM_AVL_C_TO_MIC_COP_C', 'SOM_AVL_C_TO_MIC_OLI_C',
'MYC_ECM_C_TO_SOM_AVL_C', 'MYC_ECM_C_TO_SOM_CHEM_C', 'MYC_ECM_C_TO_SOM_PHYS_C',
'MYC_AM_C_TO_SOM_AVL_C', 'MYC_AM_C_TO_SOM_CHEM_C', 'MYC_AM_C_TO_SOM_PHYS_C'

hist_fincl3 = 'TOTMYCC', 'SOILC_vr', 'TOTMICC', 'TOTMYCC', 'TOTLITC', 'TOTSOMC', 'TOTLITC_1m', 'TOTSOMC_1m',
'DYN_COL_SOIL_ADJUSTMENTS_C', 'TOTCOLC', 'TOTECOSYSC', 'LIT_MET_C_vr', 'LIT_STR_C_vr', 'SOM_AVL_C_vr',
'SOM_CHEM_C_vr', 'SOM_PHYS_C_vr', 'MIC_COP_C_vr', 'MIC_OLI_C_vr', 'MYC_ECM_C_vr', 'MYC_AM_C_vr'

hist_fincl5 = 'L1_RESP_FRAC_M1_vr', 'L1_RESP_FRAC_M2_vr', 'L2_RESP_FRAC_M1_vr', 'L2_RESP_FRAC_M2_vr',
'M1_RESP_FRAC_S1_vr', 'M1_RESP_FRAC_S2_vr', 'M1_RESP_FRAC_S3_vr',
'M2_RESP_FRAC_S1_vr', 'M2_RESP_FRAC_S2_vr', 'M2_RESP_FRAC_S3_vr',
'S2_RESP_FRAC_S1_vr', 'S3_RESP_FRAC_S1_vr',
'S1_RESP_FRAC_M1_vr', 'S1_RESP_FRAC_M2_vr',
'MYC1_RESP_FRAC_S1_vr', 'MYC1_RESP_FRAC_S2_vr', 'MYC1_RESP_FRAC_S3_vr',
'MYC2_RESP_FRAC_S1_vr', 'MYC2_RESP_FRAC_S2_vr', 'MYC2_RESP_FRAC_S3_vr'

hist_fincl6 = 'L1_PATHFRAC_M1_vr', 'L1_PATHFRAC_M2_vr', 'L2_PATHFRAC_M1_vr', 'L2_PATHFRAC_M2_vr',
'M1_PATHFRAC_S1_vr', 'M1_PATHFRAC_S2_vr', 'M1_PATHFRAC_S3_vr',
'M2_PATHFRAC_S1_vr', 'M2_PATHFRAC_S2_vr', 'M2_PATHFRAC_S3_vr',
'S2_PATHFRAC_S1_vr', 'S3_PATHFRAC_S1_vr',
'S1_PATHFRAC_M1_vr', 'S1_PATHFRAC_M2_vr',
'MYC1_PATHFRAC_S1_vr', 'MYC1_PATHFRAC_S2_vr', 'MYC1_PATHFRAC_S3_vr',
'MYC2_PATHFRAC_S1_vr', 'MYC2_PATHFRAC_S2_vr', 'MYC2_PATHFRAC_S3_vr'

hist_fincl7 = 'LIT_MET_HR_M1', 'LIT_MET_HR_M2', 'LIT_STR_HR_M1', 'LIT_STR_HR_M2',
'MIC_COP_HR_S1', 'MIC_COP_HR_S2', 'MIC_COP_HR_S3',
'MIC_OLI_HR_S1', 'MIC_OLI_HR_S2', 'MIC_OLI_HR_S3',
'SOM_AVL_HR_M1', 'SOM_AVL_HR_M2',



use_ssre = .true.
paramfile = '/cluster/projects/nn2806k/elisacw/parameters/clm_params_mimicsplus_netcdf5_11.09.24.nc'


soil_decomp_method = 'MIMICSplusAas2023'
hist_fincl1 += 'TOTMYCC', 'SOILC_vr', 'TOTMICC', 'TOTMYCC', 'TOTLITC', 'TOTSOMC', 'TOTLITC_1m', 'TOTSOMC_1m',
'DYN_COL_SOIL_ADJUSTMENTS_C', 'TOTCOLC', 'TOTECOSYSC', 'LIT_MET_C_vr', 'LIT_STR_C_vr', 'SOM_AVL_C_vr',
'SOM_CHEM_C_vr', 'SOM_PHYS_C_vr', 'MIC_COP_C_vr', 'MIC_OLI_C_vr', 'MYC_ECM_C_vr', 'MYC_AM_C_vr'

2 changes: 2 additions & 0 deletions cime_config/testdefs/testmods_dirs/clm/mimicspluspoi/README
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
This test mod turns on the MIMICSplus instead of the MIMICS or CENTURY below-ground
biogeochemistry.
Empty file added cime_config/testdefs/testmods_dirs/clm/mimicspluspoi/include_user_mods
View file
Open in desktop
Empty file.
5 changes: 5 additions & 0 deletions cime_config/testdefs/testmods_dirs/clm/mimicspluspoi/shell_commands
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bash
./xmlchange CLM_FORCE_COLDSTART="on"
./xmlchange NTASKS=1
./xmlchange PTS_LON=170.0
./xmlchange PTS_LAT=-42.0
52 changes: 52 additions & 0 deletions cime_config/testdefs/testmods_dirs/clm/mimicspluspoi/user_nl_clm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
hist_dov2xy = .true., .true.
! Even though only 2 history tapes are defined here, set ndens to 1 for up to 6 history
! tapes, for the sake of mods that extend these default mods and may add other history tapes
hist_nhtfrq = 1,1,1,1,1,1,1
hist_mfilt = 1,1,1,1,1,1,1
hist_fincl1 = 'TRAFFICFLUX', 'SNOWLIQ:A','SNOWICE:A'
! Add FCO2 because few (if any) tests send this flux to the coupler, so it isn't checked via cpl hist files
hist_fincl1 += 'FCO2'
hist_fincl2 = 'LIT_MET_C_TO_MIC_COP_C', 'LIT_MET_C_TO_MIC_OLI_C', 'LIT_STR_C_TO_MIC_COP_C', 'LIT_STR_C_TO_MIC_OLI_C',
'MIC_COP_C_TO_SOM_AVL_C', 'MIC_COP_C_TO_SOM_CHEM_C', 'MIC_COP_C_TO_SOM_PHYS_C',
'MIC_OLI_C_TO_SOM_AVL_C', 'MIC_OLI_C_TO_SOM_CHEM_C', 'MIC_OLI_C_TO_SOM_PHYS_C',
'SOM_CHEM_C_TO_SOM_AVL_C', 'SOM_PHYS_C_TO_SOM_AVL_C',
'SOM_AVL_C_TO_MIC_COP_C', 'SOM_AVL_C_TO_MIC_OLI_C',
'MYC_ECM_C_TO_SOM_AVL_C', 'MYC_ECM_C_TO_SOM_CHEM_C', 'MYC_ECM_C_TO_SOM_PHYS_C',
'MYC_AM_C_TO_SOM_AVL_C', 'MYC_AM_C_TO_SOM_CHEM_C', 'MYC_AM_C_TO_SOM_PHYS_C'

hist_fincl3 = 'TOTMYCC', 'SOILC_vr', 'TOTMICC', 'TOTMYCC', 'TOTLITC', 'TOTSOMC', 'TOTLITC_1m', 'TOTSOMC_1m',
'DYN_COL_SOIL_ADJUSTMENTS_C', 'TOTCOLC', 'TOTECOSYSC', 'LIT_MET_C_vr', 'LIT_STR_C_vr', 'SOM_AVL_C_vr',
'SOM_CHEM_C_vr', 'SOM_PHYS_C_vr', 'MIC_COP_C_vr', 'MIC_OLI_C_vr', 'MYC_ECM_C_vr', 'MYC_AM_C_vr'

hist_fincl5 = 'L1_RESP_FRAC_M1_vr', 'L1_RESP_FRAC_M2_vr', 'L2_RESP_FRAC_M1_vr', 'L2_RESP_FRAC_M2_vr',
'M1_RESP_FRAC_S1_vr', 'M1_RESP_FRAC_S2_vr', 'M1_RESP_FRAC_S3_vr',
'M2_RESP_FRAC_S1_vr', 'M2_RESP_FRAC_S2_vr', 'M2_RESP_FRAC_S3_vr',
'S2_RESP_FRAC_S1_vr', 'S3_RESP_FRAC_S1_vr',
'S1_RESP_FRAC_M1_vr', 'S1_RESP_FRAC_M2_vr',
'MYC1_RESP_FRAC_S1_vr', 'MYC1_RESP_FRAC_S2_vr', 'MYC1_RESP_FRAC_S3_vr',
'MYC2_RESP_FRAC_S1_vr', 'MYC2_RESP_FRAC_S2_vr', 'MYC2_RESP_FRAC_S3_vr'

hist_fincl6 = 'L1_PATHFRAC_M1_vr', 'L1_PATHFRAC_M2_vr', 'L2_PATHFRAC_M1_vr', 'L2_PATHFRAC_M2_vr',
'M1_PATHFRAC_S1_vr', 'M1_PATHFRAC_S2_vr', 'M1_PATHFRAC_S3_vr',
'M2_PATHFRAC_S1_vr', 'M2_PATHFRAC_S2_vr', 'M2_PATHFRAC_S3_vr',
'S2_PATHFRAC_S1_vr', 'S3_PATHFRAC_S1_vr',
'S1_PATHFRAC_M1_vr', 'S1_PATHFRAC_M2_vr',
'MYC1_PATHFRAC_S1_vr', 'MYC1_PATHFRAC_S2_vr', 'MYC1_PATHFRAC_S3_vr',
'MYC2_PATHFRAC_S1_vr', 'MYC2_PATHFRAC_S2_vr', 'MYC2_PATHFRAC_S3_vr'

hist_fincl7 = 'LIT_MET_HR_M1', 'LIT_MET_HR_M2', 'LIT_STR_HR_M1', 'LIT_STR_HR_M2',
'MIC_COP_HR_S1', 'MIC_COP_HR_S2', 'MIC_COP_HR_S3',
'MIC_OLI_HR_S1', 'MIC_OLI_HR_S2', 'MIC_OLI_HR_S3',
'SOM_AVL_HR_M1', 'SOM_AVL_HR_M2',



use_ssre = .true.
paramfile = '/cluster/projects/nn2806k/elisacw/parameters/clm_params_mimicsplus_netcdf5_11.09.24.nc'


soil_decomp_method = 'MIMICSplusAas2023'
hist_fincl1 += 'TOTMYCC', 'SOILC_vr', 'TOTMICC', 'TOTMYCC', 'TOTLITC', 'TOTSOMC', 'TOTLITC_1m', 'TOTSOMC_1m',
'DYN_COL_SOIL_ADJUSTMENTS_C', 'TOTCOLC', 'TOTECOSYSC', 'LIT_MET_C_vr', 'LIT_STR_C_vr', 'SOM_AVL_C_vr',
'SOM_CHEM_C_vr', 'SOM_PHYS_C_vr', 'MIC_COP_C_vr', 'MIC_OLI_C_vr', 'MYC_ECM_C_vr', 'MYC_AM_C_vr'

5 changes: 3 additions & 2 deletions src/biogeochem/CNBalanceCheckMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ subroutine Init(this, bounds)
this%cwarning = 1.e-8_r8
this%nwarning = 1.e-7_r8
this%nerror = 1.e-3_r8
this%cerror = 1.e-7_r8
this%cerror = 1.e-9_r8 ! original 1.e-7_r8
end subroutine Init

!-----------------------------------------------------------------------
Expand Down Expand Up @@ -497,6 +497,7 @@ subroutine NBalanceCheck(this, bounds, num_soilc, filter_soilc, &
use clm_varctl, only : use_crop
use subgridAveMod, only: c2g
use atm2lndType, only: atm2lnd_type
use SoilBiogeochemDecompCascadeConType, only: decomp_method, mimicsplus_decomp
!
! !ARGUMENTS:
class(cn_balance_type) , intent(inout) :: this
Expand Down Expand Up @@ -595,7 +596,7 @@ subroutine NBalanceCheck(this, bounds, num_soilc, filter_soilc, &
col_ninputs(c) = col_ninputs(c) + fates_litter_flux(c)
end if

if(use_fun)then
if(use_fun .or. decomp_method == mimicsplus_decomp) then
col_ninputs(c) = col_ninputs(c) + ffix_to_sminn(c) ! for FUN, free living fixation is a seprate flux. RF.
endif

Expand Down
32 changes: 30 additions & 2 deletions src/biogeochem/CNCStateUpdate1Mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ module CNCStateUpdate1Mod
use clm_varpar , only : i_litr_min, i_litr_max, i_cwd
use pftconMod , only : npcropmin, nc3crop, pftcon
use abortutils , only : endrun
use decompMod , only : bounds_type
use clm_varctl , only : iulog
use decompMod , only : bounds_type, subgrid_level_patch
use CNVegCarbonStateType , only : cnveg_carbonstate_type
use CNVegCarbonFluxType , only : cnveg_carbonflux_type
use CropType , only : crop_type
Expand All @@ -37,6 +38,8 @@ module CNCStateUpdate1Mod
public :: CStateUpdate0
public :: CStateUpdate1
!-----------------------------------------------------------------------
character(len=*), parameter, private :: sourcefile = &
__FILE__

contains

Expand Down Expand Up @@ -272,7 +275,12 @@ subroutine CStateUpdate1( num_soilc, filter_soilc, num_soilp, filter_soilp, &
soilpatch_loop: do fp = 1,num_soilp
p = filter_soilp(fp)
c = patch%column(p)
if (cs_veg%cpool_patch(p) < -1.0e-09_r8 .or. cs_veg%cpool_patch(p) > 1.0e6_r8) then
write(iulog,*) 'ERROR: cpool_patch=',cs_veg%cpool_patch(p)

call endrun(subgrid_index=p, subgrid_level=subgrid_level_patch, &
msg= errMsg(sourcefile, __LINE__))
end if
! phenology: transfer growth fluxes

!
Expand Down Expand Up @@ -350,7 +358,12 @@ subroutine CStateUpdate1( num_soilc, filter_soilc, num_soilp, filter_soilp, &

check_cpool = cs_veg%cpool_patch(p)- cf_veg%psnsun_to_cpool_patch(p)*dt-cf_veg%psnshade_to_cpool_patch(p)*dt
cpool_delta = cs_veg%cpool_patch(p)
if (cs_veg%cpool_patch(p) < -1.0e-09_r8) then
write(iulog,*) 'ERROR: cpool_patch=',cs_veg%cpool_patch(p),cf_veg%availc_patch(p)

call endrun(subgrid_index=p, subgrid_level=subgrid_level_patch, &
msg= errMsg(sourcefile, __LINE__))
end if
! maintenance respiration fluxes from cpool

cs_veg%cpool_patch(p) = cs_veg%cpool_patch(p) - cf_veg%cpool_to_xsmrpool_patch(p)*dt
Expand All @@ -372,7 +385,12 @@ subroutine CStateUpdate1( num_soilc, filter_soilc, num_soilp, filter_soilp, &

!RF Add in the carbon spent on uptake respiration.
cs_veg%cpool_patch(p)= cs_veg%cpool_patch(p) - cf_veg%soilc_change_patch(p)*dt

if (cs_veg%cpool_patch(p) < -1.0e-09_r8 .or. cs_veg%cpool_patch(p) > 1.0e6_r8) then
write(iulog,*) 'ERROR: cpool_patch=',cs_veg%cpool_patch(p),cf_veg%cpool_to_resp_patch(p)*dt,cf_veg%soilc_change_patch(p)*dt,cf_veg%availc_patch(p)

call endrun(subgrid_index=p, subgrid_level=subgrid_level_patch, &
msg= errMsg(sourcefile, __LINE__))
end if
! maintenance respiration fluxes from xsmrpool
cs_veg%xsmrpool_patch(p) = cs_veg%xsmrpool_patch(p) + cf_veg%cpool_to_xsmrpool_patch(p)*dt
cs_veg%xsmrpool_patch(p) = cs_veg%xsmrpool_patch(p) - cf_veg%leaf_xsmr_patch(p)*dt
Expand Down Expand Up @@ -403,6 +421,16 @@ subroutine CStateUpdate1( num_soilc, filter_soilc, num_soilp, filter_soilp, &
cs_veg%leafc_storage_patch(p) = cs_veg%leafc_storage_patch(p) + cf_veg%cpool_to_leafc_storage_patch(p)*dt
cs_veg%frootc_patch(p) = cs_veg%frootc_patch(p) + cf_veg%cpool_to_frootc_patch(p)*dt
cs_veg%frootc_storage_patch(p) = cs_veg%frootc_storage_patch(p) + cf_veg%cpool_to_frootc_storage_patch(p)*dt

if (cs_veg%cpool_patch(p) < -1.0e-09_r8 .or. cs_veg%cpool_patch(p) > 1.0e6_r8) then
write(iulog,*) 'ERROR: cpool_patch=',cs_veg%cpool_patch(p)
write(iulog,*) 'ERROR: cpool_to_leafc_patch=',cf_veg%cpool_to_leafc_patch(p)*dt
write(iulog,*) 'ERROR: cpool_to_leafc_storage_patch=',cf_veg%cpool_to_leafc_storage_patch(p)*dt
write(iulog,*) 'ERROR: cpool_to_frootc_patch=',cf_veg%cpool_to_frootc_patch(p)*dt
write(iulog,*) 'ERROR: cpool_to_frootc_storage_patch=',cf_veg%cpool_to_frootc_storage_patch(p)*dt
call endrun(subgrid_index=p, subgrid_level=subgrid_level_patch, &
msg= errMsg(sourcefile, __LINE__))
end if
!
! For the matrix solution the actual state update comes after the matrix
! multiply in VegMatrix, but the matrix needs to be setup with
Expand Down
3 changes: 2 additions & 1 deletion src/biogeochem/CNDriverMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,7 +541,8 @@ subroutine CNDriverNoLeaching(bounds,
cn_decomp_pools=cn_decomp_pools(begc:endc,1:nlevdecomp,1:ndecomp_pools), &
p_decomp_cpool_loss=p_decomp_cpool_loss(begc:endc,1:nlevdecomp,1:ndecomp_cascade_transitions), &
pmnf_decomp_cascade=pmnf_decomp_cascade(begc:endc,1:nlevdecomp,1:ndecomp_cascade_transitions), &
p_decomp_npool_to_din=p_decomp_npool_to_din(begc:endc,1:nlevdecomp,1:ndecomp_cascade_transitions))
p_decomp_npool_to_din=p_decomp_npool_to_din(begc:endc,1:nlevdecomp,1:ndecomp_cascade_transitions), &
cnfunmimicsplus_inst=cnfunmimicsplus_inst)

call t_stopf('SoilBiogeochemDecomp')

Expand Down
Loading
Loading