Added new files to allow Gross Unrepresented Land Use transition #309
Conversation
|
@lawrencepj1 I think some of the changes in soilbiogeochem files aren't really supposed to be there. I think they are undoing a previous commit. |
|
Hi Erik
I am getting a fail in the build as well. But this is in a file I cloned
from the master not one that I updated. Error message:
Building lnd with output to
/glade/scratch/lawrence/clm50_1deg_GSWP3V1_newgross_hist/bld/lnd.bldlog.180301-183307
/glade/p/work/lawrence/clm5_shiftingcultivation/src/soilbiogeochem/SoilBiogeochemPrecisionControlMod.F90(51):
error #6460: This is not a field name that is defined in the encompassing
structure. [SETTOTVGCTHRESH]
/glade/p/work/lawrence/clm5_shiftingcultivation/src/soilbiogeochem/SoilBiogeochemPrecisionControlMod.F90(58):
error #6460: This is not a field name that is defined in the encompassing
structure. [SETTOTVGCTHRESH]
Component lnd build complete with 2 warnings
clm built in 132.534989 seconds
ERROR: BUILD FAIL: clm.buildlib failed, cat
/glade/scratch/lawrence/clm50_1deg_GSWP3V1_newgross_hist/bld/lnd.bldlog.180301-183307
…--
Dr Peter Lawrence
Terrestrial Science Section
National Center for Atmospheric Research
1850 Table Mesa Drive
Boulder Colorado 80305
Work: 1-303-497-1727
Cell: 1-303-956-6932
On Thu, Mar 1, 2018 at 5:56 PM, Erik Kluzek ***@***.***> wrote:
@lawrencepj1 <https://github.com/lawrencepj1> I think some of the changes
in soilbiogeochem files aren't really supposed to be there. I think they
are undoing a previous commit.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#309 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/ALbkuU6Hgzq3VBaw_ObH3b8rbu8AOHvvks5taJjHgaJpZM4SZFGF>
.
|
|
@lawrencepj1 the files in soilbiogeochem that I mention above are causing your build problems. They are undoing part of the clm4_5_18_r268 commit. Here's the files that were updated in that tag: M components/clm/src/soilbiogeochem/SoilBiogeochemNitrogenStateType.F90 --- Change ncrit to totvegcthresh and SetNCrit to SetTotVgCThresh These are the problems you are running into. |
|
Is this due to copying in files that were originally in SourceMods, or perhaps were on an svn branch off of an older version of the code? The best way to deal with this, in my experience is:
|
…ivation. These files were actually changes in r267 for Keith's simulations. By including the updated files this resulted in a build error.
|
Hi Everyone
Thanks for all of the suggestions. Yes it was two files that Keith had
updated for the r267 runs that I had put in my SourceMods directory. I had
then copied those files over into the new branch.
The two files had nothing to do with the shifting cultivation but caused
the build to fail. With the files returned back to their current master
versions the model builds without issue.
I am re-running the test suite and will create a new push request once the
changes are verified.
thanks
Peter
…--
Dr Peter Lawrence
Terrestrial Science Section
National Center for Atmospheric Research
1850 Table Mesa Drive
Boulder Colorado 80305
Work: 1-303-497-1727
Cell: 1-303-956-6932
On Fri, Mar 2, 2018 at 10:17 AM, Bill Sacks ***@***.***> wrote:
Is this due to copying in files that were originally in SourceMods, or
perhaps were on an svn branch off of an older version of the code? The best
way to deal with this, in my experience is:
1.
Create a branch it git off of the trunk version that was the baseline
for your changes
2.
Copy the changed files in and commit them
3.
git merge up to latest master
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#309 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/ALbkuY8xo42R29sI06BOBXWkBF4L3216ks5taX6kgaJpZM4SZFGF>
.
|
|
@lawrencepj1 - the PR is automatically updated when you push to the branch (which you already did). So no need to create a new PR. |
CLM tests all pass now with the note that the new code changes the DWT_SLASH_CFLUX history variable from the column to the grid cell to be consistent with the other DWT fluxes. An additional variable DWT_SLASH_CFLUX_PATCH has been added to allow subgrid calculation at the patch and column levels as done with other DWT fluxes. This change results in a failure in the ERS_Ly3.f10_f10.I1850Clm50BgcCrop test that requires the user_nl_clm file to specify the hist_fincl3 to use DWT_SLASH_CFLUX_PATCH rather than DWT_SLASH_CFLUX. After this change the test passes. . The result from the test suite are: ================================================================================ These tests failed ================================================================================ ERP_D_Lm9.f10_f10_musgs.IHistClm50BgcCrop.cheyenne_intel.clm-ciso_monthly EXPECTED ERS_Ly5_P72x1.f10_f10_musgs.IHistClm45BgcCrop.cheyenne_intel.clm-cropMonthOutput EXPECTED NCK_Ld1.f10_f10_musgs.I2000Clm50Sp.cheyenne_intel.clm-default EXPECTED SMS_D_Ld5.f45_f45_mg37.I2000Clm50Fates.cheyenne_intel.clm-Fates EXPECTED SMS_D_Lm13.f10_f10_musgs.IHistClm50BgcCrop.cheyenne_intel.clm-ciso_monthly EXPECTED SMS_D_Lm6.f45_f45_mg37.I2000Clm50Fates.cheyenne_intel.clm-Fates EXPECTED SMS_D_Lm6_P144x1.f45_f45_mg37.I2000Clm50Fates.cheyenne_intel.clm-Fates EXPECTED SMS_Ld1.f09_g16.I1850Clm40SpCruGs.cheyenne_intel.clm-40default EXPECTED
…branch for shifting cultivation
|
We want to bring this change in after the CESM2.0 release. |
|
@lawrencepj1 here are the notes on adding namelist items to CTSM: https://wiki.ucar.edu/display/ccsm/Adding+New+Namelist+Items+to+CLM |
Update cime to cime5.7.3 Update cime from cime5.6.10 to cime5.7.3. To support this change, there are also minor code changes related to the pause-resume implementation (from Erik Kluzek). Fixes ESCOMP#384
|
We talked about this. We are going to pull this to master as a second priority for the cesm2.1 critical tasks (the critical tasks are new ndep, paero, and co2 datasets). We do want the switch in here for both cesm2.2 and cesm2.1 if possible. We also plan on updating the surface datasets for cesm2.1/cmip6 with JUST the change adding in the new field MAX PFT/CFT so we can speed up the model for cesm2.1. As a later change we will also do another update of the rawpft files (with changes to crops and coastlines, as well as adding non-zero GRU fields), but that will JUST go on the cesm2.2 development cycle on master (and won't go into the clm5.0 release branch that is being used for cesm2.1 and cmip6 development. |
|
@lawrencepj1 to update this PR, you just need to: You've already checked in your changes we just need to push them to your branch on your fork, and this PR will update. |
… do_grossunrep is set to .false. When set to .true. do_grossunrep turns on shifting cultivation which is read off the landuse_timeseries file.
Add water tracer consistency checks, and other water tracer work 1. Add water tracer consistency checks 2. Add infrastructure for looping over all water tracers - currently just used for the tracer consistency checks 3. Breakout of atm2lnd and lnd2atm water variables, needed for water tracers 4. Add some namelist control over the addition of water tracers 5. Add a system test that exercises the water tracer consistency checks 6. Add a 'ratio' variable for each water tracer 7. Add some unit tests of the new water tracer infrastructure Issues fixed: - Partially addresses ESCOMP#357 - Resolves ESCOMP#479 - Resolves ESCOMP#492
|
Hmmm. OK. I updated to ctsm1.0.dev011 and ran standard testing. I only saw expected fails. But, strangely, I see the following tests as changing answers: ERP_P36x2_Lm13.f10_f10_musgs.IHistClm50Bgc.cheyenne_gnu.clm-monthly I haven't looked into why this is yet. |
billsacks
added
enhancement
|
These are the changes in CLM to take advantage of shifting cultivation from the surface datasets. The other part of this is to add new data to the surface datasets. Note, there are some conflicts that need to be resolved to bring this to master at this point. |
Modularize snow cover fraction method This tag moves the calculation of frac_sno - and the related updates of snow_depth - into a new set of classes, with one class for each parameterization (Niu & Yang 2007 and Swenson & Lawrence 2012). Previously, the code always calculated frac_sno the new way, but then possibly overwrote it if using the older Niu & Yang method. The new code cleans this up, only doing the calculations that are needed for each method. In addition, other code that is specific to one of the two methods is now moved to a home that makes this dependence on method explicit. This includes the addition of newsnow to int_snow: previously, int_snow was always updated using an equation specific to the newer CLM5 parameterization of frac_sno, which was not appropriate if using the Niu & Yang parameterization; this doesn't make a difference currently, since int_snow is only referenced if using the Swenson & Lawrence parameterization, but this clears up some confusion. Also, time-constant parameters read from namelist or the netCDF parameter file now reside in the appropriate class rather than being more global. This tag also renames two namelist options to increase clarity: - subgridflag is renamed to use_subgrid_fluxes, and is now a logical - oldfflag is renamed to snow_cover_fraction_method, and is now a string Conflicts: bld/CLMBuildNamelist.pm bld/namelist_files/namelist_definition_ctsm.xml cime_config/usermods_dirs/cmip6_output/user_nl_clm src/biogeochem/CNVegCarbonFluxType.F90 src/dyn_subgrid/dynSubgridControlMod.F90
…th transient, but SP instead of CN
|
@fischer-ncar told me that he had to change his default shell from tcsh to bash on izumi to get past this error. |
These changes pertain to GU_LULCC tests in this commit.
|
Test-suites completed and dev119 baselines are ready on cheyenne and izumi. @ekluzek this PR is ready to merge, though you may wish to look over my ChangeLog entry first. |
slevis-lmwg
added
PR status: ready
There was a problem hiding this comment.
I have a couple small comments that could be acted on. But, I'm not sure it's worth doing since testing is done.
There's a larger question for Peter to answer though. Depending on his answer we can do the small changes I ask about. We could also go ahead with my suggestions, but only repeat a small part of the testing since the changes are small.
This was an unintentional line removal that Erik realized. I also reordered the error checks that Erik recommended in dynSubgridControlMod.
…than the CN one for it
…M into clm5_shiftingcultivation
|
Hi @slevisconsulting and @ekluzek I just started going through the PR 309 code and noticed some things straight up. The first is that the dynHarvestMod.F90 file that the dynGrossUnrepMod.F90 file is based on has moved to the dyn_subgrid directory from the biogeochem directory since the branch I used back in 2019. There are also subtle changes in the module such as fates flags specifying that harvest is not done with fates on. I am going to do some checks between the updated files from the latest branch without the PR and the version of CTSM I branched from. This may take some work. I have a couple of other tasks that I need to focus on today and tomorrow but I wanted to start on this today. I will let you know more once I have had some more time. Thanks |
|
@lawrencepj1 do you know when you're going to have time to look at this? @ekluzek is suggesting that we bring this in soon, to clear up some other tags, with subsequent changes that need to made for GULU coming in on the CTSM5.2 branch (where we actually have the datasets needed for these transitions). |
|
Hi @wwieder Yes this is the next task after finishing the rankings for the CESM Tutorial applications which are due today. I will make it my first priority for this afternoon or tomorrow morning once I get the applications completed. Peter
|
|
OK, in order to facilitate the next tag that needs to come in, we are bringing in this tag as is. If @lawrencepj1 finds changes that need to happen it can happen in a future tag either on main-dev or in the ctsm5.2 branch. |
|
YES Erik! |
This is the beginning of a pull request to get Gross Unrepresented Land Use transitions working in CLM5