mix of fixes for catchCN CLM 5.1#1154
Draft
biljanaorescanin wants to merge 30 commits intofeature/jkolassa_cnclm51from
Draft
mix of fixes for catchCN CLM 5.1#1154biljanaorescanin wants to merge 30 commits intofeature/jkolassa_cnclm51from
biljanaorescanin wants to merge 30 commits intofeature/jkolassa_cnclm51from
Conversation
|
This PR is being prevented from merging because you have not added one of our required labels: 0 diff, 0 diff trivial, Non 0-diff, 0 diff structural, 0-diff trivial, Not 0-diff, 0-diff, automatic, 0-diff uncoupled, github_actions. Please add one so that the PR can be merged. |
…PFT to zero, which got lost in merge of 0-diff changes from Jana's branch (CNCLM_DriverMod.F90)
…d.F90, CNVegCarbonFluxType.F90, CNVegCarbonStateType.F90, CNVegNitrogenStateType.F90, SoilBiogeochemNitrogenStateType.F90)
….F90, CNVegNitrogenStateType.F90)
…CNVegStateType.F90, CanopyStateType.F90, SoilBiogeochemNitrogenStateType.F90)
…(SurfaceAlbedoType.F90)
…(CNCLM_DriverMod.F90)
…geochemNitrogenStateType.F90)
… (GEOS_CatchCNCLM51GridComp.F90)
…en CatchCN and CTSM (clm_varpar.F90, CNCLM_DriverMod.F90, SoilBiogeochemCarbonStateType.F90, SoilBiogeochemNitrogenStateType.F90)
…(CNCLM_DriverMod.F90)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR is an attempt to fix several issues on the CatchCN PR branch associated with #1129.
Related PRs:
Fixes implemented in this PR:
Fixed indices:
CanopyStateType.F90: readvegwpfromcnpft(...,76..79)(not78+).CNVegCarbonFluxType.F90: read litterfall accumulators fromcnpft(...,80/81)(not82/83).PhotosynthesisMod.F90: do not read76/77for alpha (those arevegwpnow)Fixed calculation of multi-day averages in GEOS_CatchCNCLM51GridComp.F90:
T2MMIN5DSNDZM5DFixed inconsistent application of
CN_zone_weightwhen translating between CNCOL restart array and CTSM structures:CNProductsMod.F90: forprod100/prod10(C: slots 7/8; N: slots 21/22).CNVegCarbonStateType.F90:seedc_grc.CNVegNitrogenStateType.F90:seedn_grc.In CNCLM_Driver.F90, subroutine CN_exit(), fixed assignment: "CNCOL(nc,nz,[8,22]) = prod10_grc".
Surface albedo: Added missing if condition to fix mapping of CNPFT(nc,nv,nz,[73,74]) to [LAI,SAI].
Consistent use of FVEG_MIN=1.e-4 parameter for the minimum vegetation area fraction that is needed for a patch to become active.
Open issues:
PhotosynthesisMod.F90: setalphapsn* = 0._r8at init -- not sure if this is correct, or if these variables should be in the restart file.iclass,map_pft). List of CTSM veg classes is in GEOS_CatchCNCLM51GridComp.F90:GEOSgcm_GridComp/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/GEOScatchCNCLM51_GridComp/GEOS_CatchCNCLM51GridComp.F90
Line 136 in 3717bd2
totn_colis needed in restart; should be calculated as sum of component pools (CNVegNitrogenStateType.F90). Keepingtotn_colin the restart should not be an error as such.ANNAVG_T2M_COLshould be a temperature in units of K). See excel sheet of all restart variables, including names, units (where available) and min/mean/max values:Restart file for Y2000/M01/D01 from Eunjee's "cycle3" global spinup simulation
GEOSldas_CN51_280_global_c3.catchcnclm51_internal_rst_stats.xlsx
History of PR:
Disabled after after bc6d321 (because resetting restart variables to 0. does not make them scientifically meaningful):
totn_colandNBALSoilBiogeochemNitrogenStateType.Init): clamp mineral N (24/36/37) and the soil pool components that build totals (17, 18–20, 25–28).Code testing:
On 12 September 2025, @gmao-rreichle verified the consistency of CNCOL and CNPFT variable indices between filling and reading out data from/to CTSM structures.
@gmao-rreichle @weiyuan-jiang