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.

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

Fix a few glitches in last tag #1747

Merged
merged 29 commits into from
May 18, 2022
Merged
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
57fe523
Update externals, cime update fixes DAE tests #1744, ccs_config updat…
ekluzek May 12, 2022
55512ba
Changes to work on Casper
ekluzek May 13, 2022
672729d
If fates_sp is turned on, make the default for soil_decomp_method to …
ekluzek May 16, 2022
fe2ec37
Use the python version that we have on izumi, so that we can test the…
ekluzek May 16, 2022
d0e5997
Merge branch 'dev95_fix_glitches' of github.com:ekluzek/CTSM into dev…
ekluzek May 16, 2022
8cb27be
Group imports to prevent a pylint issue
ekluzek May 16, 2022
e2ce638
Change to upper-case to prevent a pylint issue on izumi: C0103: Const…
ekluzek May 16, 2022
1ba06ed
Merge remote-tracking branch 'jedwards4b/fix_cime_path' into dev95_fi…
ekluzek May 16, 2022
e365008
Merge remote-tracking branch 'negin513/modify_neon_gcs' into dev95_fi…
ekluzek May 16, 2022
76584a6
Merge branch 'dev95_fix_glitches' of github.com:ekluzek/CTSM into dev…
ekluzek May 16, 2022
6217c4f
Add a simple I2000Clm51FatesSpRsGs compset and test for it
ekluzek May 16, 2022
3d58834
Set no_comp mode and fixed_biogeography to TRUE, just to make it expl…
ekluzek May 16, 2022
195586f
Add some comments
ekluzek May 16, 2022
6cf26e9
Move the setting of PIO_TYPENAME and PIO_REARRANGER_LND into the NEON…
ekluzek May 16, 2022
9fcbcfb
Make simple test just reliant on basic test mod and not the FatesCold…
ekluzek May 17, 2022
d840fe9
Update the README file so that the log names given won't conflict wit…
ekluzek May 17, 2022
2225773
Update ccs_config as suggested by @briandobbins
ekluzek May 17, 2022
9dfde94
Fix user_mod
ekluzek May 17, 2022
9362aa8
Remove two more history fields that shouldn't be in the exclude list
ekluzek May 17, 2022
b286e3a
Start adding a script to manage the python environment, this addresse…
ekluzek May 17, 2022
6d9a687
Merge branch 'dev95_fix_glitches' of github.com:ekluzek/CTSM into dev…
ekluzek May 17, 2022
33491b2
Merge branch 'dev95_fix_glitches' of github.com:ekluzek/CTSM into dev…
ekluzek May 17, 2022
cf5f1cc
Remove tests that are passing from expected fails
ekluzek May 17, 2022
f306310
The FatesSp tests needs to use the FatesColdDefReducedComplexSatPhen …
ekluzek May 17, 2022
48800c7
Don't do a soil-bgc thing when soil decomp is none
ekluzek May 17, 2022
72ce612
Add two options to manage_python_env one to do verbose mode so you se…
ekluzek May 17, 2022
358a58e
Merge remote-tracking branch 'escomp/master' into dev95_fix_glitches
ekluzek May 18, 2022
fa09fa9
Update Change files
ekluzek May 18, 2022
c8a40d1
Update change file
ekluzek May 18, 2022
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
Prev Previous commit
Next Next commit
Don't do a soil-bgc thing when soil decomp is none
  • Loading branch information
ekluzek committed May 17, 2022
commit 48800c777cc59f9e097e1abfa3b7ad39b843f90a
20 changes: 11 additions & 9 deletions src/utils/clmfates_interfaceMod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1135,15 +1135,17 @@ subroutine wrap_update_hlmfates_dyn(this, nc, bounds_clump, &
! but rgknox explains that accomplishing this is more complex given the
! current FATES treatment of other litter fluxes passed to the CTSM.
!------------------------------------------------------------------------
do s = 1, this%fates(nc)%nsites
c = this%f2hmap(nc)%fcolumn(s)
if (is_first_restart_step() .and. .not. copy_fates_var(c)) then
copy_fates_var(c) = .true.
else
soilbiogeochem_carbonflux_inst%litr_lig_c_to_n_col(c) = &
this%fates(nc)%bc_out(s)%litt_flux_ligc_per_n
end if
end do
if ( decomp_method /= no_soil_decomp )then
do s = 1, this%fates(nc)%nsites
c = this%f2hmap(nc)%fcolumn(s)
if (is_first_restart_step() .and. .not. copy_fates_var(c)) then
copy_fates_var(c) = .true.
else
soilbiogeochem_carbonflux_inst%litr_lig_c_to_n_col(c) = &
this%fates(nc)%bc_out(s)%litt_flux_ligc_per_n
end if
end do
end if

!---------------------------------------------------------------------------------
! CHANGING STORED WATER DURING PLANT DYNAMICS IS NOT FULLY IMPLEMENTED
Expand Down