FATES Land use V2 API update #6353

glemieux · 2024-04-17T20:35:13Z

This pull request adds the capability to read a landuse x pft mapping file to then be passed to fates.
It also refactors the use_fates_logging namelist option from a switch to a mode select.
This update allows the user to select a harvest mode that provides the mass or area-based land use harvest rates from the LUH2 landuse timeseries dataset.

The fates pull request associated with this update is NGEET/fates#1116

[non-BFB] for FATES

samsrabin

Like I said, all very minor! But I wanted to log them before I forget them.

components/elm/bld/namelist_files/namelist_definition.xml

components/elm/src/dyn_subgrid/dynFATESLandUseChangeMod.F90

components/elm/src/main/controlMod.F90

components/elm/src/main/elm_initializeMod.F90

components/elm/src/main/elmfates_interfaceMod.F90

glemieux · 2024-04-23T23:15:55Z

To do:

update default parameter file

glemieux · 2024-04-23T23:30:47Z

Cleaned up the code per @samsrabin review via 8cc7ddc. Still need to check a couple of items.

components/elm/src/main/elmfates_interfaceMod.F90

components/elm/bld/namelist_files/namelist_definition.xml

rljacob · 2024-05-30T17:40:06Z

Needs a review approval

rljacob · 2024-06-13T17:37:18Z

Waiting on some FATES-side changes and PR #6419

components/elm/src/main/elmfates_interfaceMod.F90

Adds luh2 harvest data read to fates landuse module This will enables the use of the raw LUH2 harvest data when running with fates in land use mode + wood harvest mode

rljacob · 2024-06-27T17:38:27Z

update: still waiting on some FATES-side changes

Checking the FATES land use x pft data is handled on the FATES side

This corrects a misnamed harvest option

This also adds a new fates_landuse test list that is inherited by the fates test list

… namelists

…n other modes

peterdschwartz · 2024-07-11T22:41:12Z

@ckoven @samsrabin Now that this PR is finalized, it needs final review/approval

…anduse

glemieux · 2024-07-17T19:53:23Z

Status update: Running e3sm_land_developer tests against the current master commit on perlmutter.

ckoven

Thanks @glemieux! This looks good to me.

samsrabin

Looks great!

components/elm/src/main/elmfates_interfaceMod.F90

glemieux · 2024-07-19T16:24:49Z

@peterdschwartz regression testing using e3sm_land_developer on perlmutter against the master baseline is B4B for all expected tests. The DIFFs are all associated with fates tests and are expected.

Results: /pscratch/sd/g/glemieux/e3sm-tests/pr6353-eld-nanfix.fates.pm-cpu..E5b67e86c2a-F1982b003

This pull request adds the capability to read a landuse x pft mapping file to then be passed to fates. It also refactors the use_fates_logging namelist option from a switch to a mode select. This update allows the user to select a harvest mode that provides the mass or area-based land use harvest rates from the LUH2 landuse timeseries dataset. The fates pull request associated with this update is NGEET/fates#1116 [non-BFB] for FATES

peterdschwartz · 2024-07-22T19:29:42Z

merged to next. from the e3sm_developer test suite, expecting diffs in:

  ERS_D_Ld15.f45_g37.IELMFATES.pm-cpu_intel.elm-fates_cold_treedamage (Overall: DIFF) details:
  ERS_Ld20.f45_f45.IELMFATES.pm-cpu_intel.elm-fates (Overall: DIFF) details:
  ERS_Ld30.f45_f45.IELMFATES.pm-cpu_intel.elm-fates_satphen (Overall: DIFF) details:
  SMS_D_Ld20.f45_f45.IELMFATES.pm-cpu_intel.elm-fates_rd (Overall: DIFF) details:
  SMS_Ld20.f45_f45.IELMFATES.pm-cpu_intel.elm-fates_eca (Overall: DIFF) details:
  SMS_Ld5_PS.f19_g16.IELMFATES.pm-cpu_intel.elm-fates_cold (Overall: DIFF) details:

peterdschwartz · 2024-07-23T19:17:28Z

Merged to master. Some machines had issues so there will be a few DIFFs to bless tomorrow

glemieux changed the title ~~FATES Land use V2 API update~~ [WIP] FATES Land use V2 API update Apr 17, 2024

samsrabin reviewed Apr 17, 2024

View reviewed changes

rljacob assigned peterdschwartz Apr 18, 2024

samsrabin reviewed Apr 19, 2024

View reviewed changes

components/elm/src/main/elmfates_interfaceMod.F90 Outdated Show resolved Hide resolved

samsrabin reviewed Apr 28, 2024

View reviewed changes

components/elm/src/main/elmfates_interfaceMod.F90 Outdated Show resolved Hide resolved

samsrabin reviewed Apr 28, 2024

View reviewed changes

components/elm/bld/namelist_files/namelist_definition.xml Outdated Show resolved Hide resolved

rljacob added FATES Land labels May 1, 2024

samsrabin mentioned this pull request May 1, 2024

FATES land use v2 API update (CTSM-side) ESCOMP/CTSM#2507

Merged

glemieux mentioned this pull request May 7, 2024

V2 Land Use Change NGEET/fates#1116

Merged

4 tasks

glemieux mentioned this pull request May 16, 2024

Update fates_harvest_mode to use characters for namelist option select samsrabin/CTSM#3

Merged

add logic to avoid rho and tau calculation when fates is on

4156260

glemieux commented Jun 18, 2024

View reviewed changes

components/elm/src/main/elmfates_interfaceMod.F90 Outdated Show resolved Hide resolved

Add fates landuse x pft API code

8771e50

Adds luh2 harvest data read to fates landuse module This will enables the use of the raw LUH2 harvest data when running with fates in land use mode + wood harvest mode

glemieux force-pushed the lnd/fates-landuse-v2 branch from 0568f12 to 8771e50 Compare June 18, 2024 23:41

glemieux added 10 commits July 8, 2024 15:16

update fates submodule

d6ce037

remove out-of-date comment

e1f94eb

Checking the FATES land use x pft data is handled on the FATES side

change fates_harvest_mode option name

b17beff

This corrects a misnamed harvest option

add clarifying language to FATES namelist options

5dd6c46

rename clmlanduse to hlmlanduse

4b8c230

add new fates luh2 tests and update existing

c1bf030

change logging test to use replacement fates harvest mode

4420c0d

add new fates test mods to test list

8bd0372

This also adds a new fates_landuse test list that is inherited by the fates test list

add trim to the write statement output

512c499

minor change in call to GetLandusePFTData

6c1cb2e

glemieux added 10 commits July 9, 2024 15:09

update fates parameter file

27003a0

refactor fates build namelist options

7b3f8fa

correct how fates sp mode value is passed to add_default for building…

f636d9b

… namelists

update fates build namelist add_default calls for modes that depend o…

342e6f5

…n other modes

add graceful failures to the fates build namelist for land use

df1901d

correct add default call for use_fates_luh option

4bb13ed

correct graceful failure write statement

e43b554

fix use_fates_potentialveg call in build namelist

52f1bd1

add namelist check allowing empty string for fluh_timeseries

1414a18

do not add default for fates landuse files prior to checks

0c94275

glemieux changed the title ~~[WIP] FATES Land use V2 API update~~ FATES Land use V2 API update Jul 11, 2024

glemieux added 4 commits July 11, 2024 10:03

whitespace fixes in elm build namelist

348dc46

add constant simyear range until transient compset working for fates

229fb93

correct flandusepftdat default location name

ebf6dd8

correct fates harvest mode namelist check

09d0bf3

glemieux added 3 commits July 11, 2024 16:12

remove old comment from elmfates_interfaceMod

e565c34

correct how harvest mode setting is passed to add_default for fates l…

1b0772c

…anduse

reinstate default settings for various fates modes

6d21ce5

glemieux mentioned this pull request Jul 15, 2024

state_vector is NaN when land use is off NGEET/fates#1221

Closed

update fates to sci.1.77.1_api.36.0.0

ee9cd55

ckoven approved these changes Jul 18, 2024

View reviewed changes

samsrabin reviewed Jul 19, 2024

View reviewed changes

components/elm/src/main/elmfates_interfaceMod.F90 Show resolved Hide resolved

peterdschwartz added the non-BFB PR makes roundoff changes to answers. label Jul 22, 2024

peterdschwartz merged commit 377b2d3 into E3SM-Project:master Jul 23, 2024
21 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

FATES Land use V2 API update #6353

FATES Land use V2 API update #6353

glemieux commented Apr 17, 2024 •

edited by peterdschwartz

Loading

samsrabin left a comment

glemieux commented Apr 23, 2024 •

edited

Loading

glemieux commented Apr 23, 2024

rljacob commented May 30, 2024

rljacob commented Jun 13, 2024 •

edited

Loading

rljacob commented Jun 27, 2024

peterdschwartz commented Jul 11, 2024

glemieux commented Jul 17, 2024 •

edited

Loading

ckoven left a comment

samsrabin left a comment

glemieux commented Jul 19, 2024 •

edited

Loading

peterdschwartz commented Jul 22, 2024

peterdschwartz commented Jul 23, 2024

FATES Land use V2 API update #6353

FATES Land use V2 API update #6353

Conversation

glemieux commented Apr 17, 2024 • edited by peterdschwartz Loading

samsrabin left a comment

Choose a reason for hiding this comment

glemieux commented Apr 23, 2024 • edited Loading

glemieux commented Apr 23, 2024

rljacob commented May 30, 2024

rljacob commented Jun 13, 2024 • edited Loading

rljacob commented Jun 27, 2024

peterdschwartz commented Jul 11, 2024

glemieux commented Jul 17, 2024 • edited Loading

ckoven left a comment

Choose a reason for hiding this comment

samsrabin left a comment

Choose a reason for hiding this comment

glemieux commented Jul 19, 2024 • edited Loading

peterdschwartz commented Jul 22, 2024

peterdschwartz commented Jul 23, 2024

glemieux commented Apr 17, 2024 •

edited by peterdschwartz

Loading

glemieux commented Apr 23, 2024 •

edited

Loading

rljacob commented Jun 13, 2024 •

edited

Loading

glemieux commented Jul 17, 2024 •

edited

Loading

glemieux commented Jul 19, 2024 •

edited

Loading