Code

v1 Land Use Change#1040

Code

Merged

glemieux merged 132 commits intoNGEET:mainNGEET/fates:mainfrom ckoven:luh2ckoven/fates:luh2Copy head branch name to clipboardDec 19, 2023

+4,001-1,135

Commits

Commits on Mar 10, 2023

• starting to sketch out how the LUH data will be used in FATES

  ckoven

  committed
  0cc9f90

  Copy full SHA for 0cc9f90

• megred main

  ckoven

  committed
  c4ea362

  Copy full SHA for c4ea362

Commits on Mar 11, 2023

• more sketching out of land use change in FATES

  ckoven

  committed
  ece80ee

  Copy full SHA for ece80ee

Commits on Mar 27, 2023

• more landuse

  ckoven

  committed
  8bedc2b

  Copy full SHA for 8bedc2b

• reorganized disturbance loop in spawn patches to avoid need for multiple receiver patches

  ckoven

  committed
  8c942e8

  Copy full SHA for 8c942e8

• first attempt to apply the transition matrix in the disturbance code

  ckoven

  committed
  79c25fb

  Copy full SHA for 79c25fb

Commits on Mar 28, 2023

• added land clearing rulest

  ckoven

  committed
  58b78d5

  Copy full SHA for 58b78d5

• revised and included the clearing ruleset

  ckoven

  committed
  2361d93

  Copy full SHA for 2361d93

Commits on Mar 31, 2023

• more updates to disturbance code

  ckoven

  committed
  ebf3516

  Copy full SHA for ebf3516

• merged main and resolved conflicts

  ckoven

  committed
  27882be

  Copy full SHA for 27882be

Commits on Apr 6, 2023

• added new subroutine to deal with litter fluxes during LU transition with clearing

  ckoven

  committed
  6e04f6e

  Copy full SHA for 6e04f6e

Commits on Apr 7, 2023

• starting to add land use initialization logic

  ckoven

  committed
  ee33871

  Copy full SHA for ee33871

• logic fix

  ckoven

  committed
  9b32d87

  Copy full SHA for 9b32d87

• more initialization

  ckoven

  committed
  83664fa

  Copy full SHA for 83664fa

• adding hlm_use_luh switch

  ckoven

  committed
  abc5311

  Copy full SHA for abc5311

• bugfix

  ckoven

  committed
  dbf3538

  Copy full SHA for dbf3538

• fix for relative vs absolute land use transition rates

  ckoven

  committed
  f7c2070

  Copy full SHA for f7c2070

• name changes to patch%land_use_label and primaryforest to primarylands (and secondary)

  ckoven

  committed
  31ad7a1

  Copy full SHA for 31ad7a1

Commits on Apr 11, 2023

• Add use_luh2 case to set_fates_ctrlparams

  glemieux

  committed
  cafa72d

  Copy full SHA for cafa72d

Commits on Apr 12, 2023

• Move LUH2 allocations

  Show description for 4099345
  glemieux

  committed
  4099345

  Copy full SHA for 4099345

Commits on Apr 17, 2023

• Align naming convention as set in FatesConstantsMod

  glemieux

  committed
  8e1d2d6

  Copy full SHA for 8e1d2d6

• Match constants references to constants module

  glemieux

  committed
  5fd30d2

  Copy full SHA for 5fd30d2

• Match constants to constants module

  glemieux

  committed
  b6a6cdb

  Copy full SHA for b6a6cdb

• Correct non-constant dimension

  Show description for 33bf881
  glemieux

  committed
  33bf881

  Copy full SHA for 33bf881

Commits on Apr 18, 2023

• correct build issues

  glemieux

  committed
  efd8707

  Copy full SHA for efd8707

• adding land-use and LUxLU hist machinery and one hist variable

  ckoven

  committed
  893615c

  Copy full SHA for 893615c

Commits on Apr 19, 2023

• Matching landunit variable naming convention

  glemieux

  committed
  f166ef3

  Copy full SHA for f166ef3

• Fix bad global search and replace

  Show description for 6c894bc
  glemieux

  committed
  6c894bc

  Copy full SHA for 6c894bc

• Align pasture constant name with other landunits

  glemieux

  committed
  1f4633b

  Copy full SHA for 1f4633b

• add landuse transition rate as a patch level variable

  glemieux

  committed
  ebce1c0

  Copy full SHA for ebce1c0

• update loop ids to avoid duplicate name scheme

  Show description for ae2eac1
  glemieux

  committed
  ae2eac1

  Copy full SHA for ae2eac1

• add missing end case statement

  glemieux

  committed
  deb8039

  Copy full SHA for deb8039

• replace site level disturbance variables with one

  glemieux

  committed
  f419c94

  Copy full SHA for f419c94

• adding new maxpatch category registration

  glemieux

  committed
  b4a7f3a

  Copy full SHA for b4a7f3a

• adding and updating new variable definitions

  glemieux

  committed
  b1c4571

  Copy full SHA for b1c4571

Commits on Apr 20, 2023

• logic fix for receiver patch label during land use change

  ckoven

  committed
  713aa87

  Copy full SHA for 713aa87

• adding use statements for land use change mod

  glemieux

  committed
  fb7b4eb

  Copy full SHA for fb7b4eb

• updated diagnostic disturbance rates variables

  ckoven

  committed
  6c8f560

  Copy full SHA for 6c8f560

Commits on Apr 21, 2023

• fixing the math on prior

  ckoven

  committed
  3f2fc4b

  Copy full SHA for 3f2fc4b

• simplifying labeling logic for disturbance types

  ckoven

  committed
  825d327

  Copy full SHA for 825d327

• bugfix on prior

  ckoven

  committed
  3026872

  Copy full SHA for 3026872

Commits on Apr 22, 2023

• copy patch xml file

  glemieux

  committed
  a616aa7

  Copy full SHA for a616aa7

• update xml patch file with necessary changes

  glemieux

  committed
  b994fd9

  Copy full SHA for b994fd9

• Merge tag 'sci.1.65.4_api.25.4.0' into luh2

  Show description for 9961b01
  glemieux

  committed
  9961b01

  Copy full SHA for 9961b01

• add api25.4 fates default paramfile to archive

  glemieux

  committed
  9a9ef83

  Copy full SHA for 9a9ef83

Commits on Apr 24, 2023

• changing some variable names in patch fusion

  ckoven

  committed
  bf35c78

  Copy full SHA for bf35c78

Commits on Apr 25, 2023

• Correct type and reintroduce site variable

  Show description for a35aec2
  glemieux

  committed
  a35aec2

  Copy full SHA for a35aec2

• Correcting typos

  glemieux

  committed
  87362b4

  Copy full SHA for 87362b4

• fix runtime issues

  glemieux

  committed
  f5bb2d0

  Copy full SHA for f5bb2d0

Commits on Apr 26, 2023

• fix runtime issues to avoid NaN

  Show description for 6a935ad
  glemieux

  committed
  6a935ad

  Copy full SHA for 6a935ad

Commits on Apr 27, 2023

• add primary_to_primary accumulation

  glemieux

  committed
  b19cedf

  Copy full SHA for b19cedf

Commits on May 1, 2023

• removing site%disturbance_rates_primary_to_primary variable

  ckoven

  committed
  4469620

  Copy full SHA for 4469620

Commits on May 4, 2023

• refactor land use mapping

  glemieux

  committed
  ac181bc

  Copy full SHA for ac181bc

• remove comment and update getindex fullname

  glemieux

  committed
  7bc6e4c

  Copy full SHA for 7bc6e4c

• align procedure names

  glemieux

  committed
  e69d6e3

  Copy full SHA for e69d6e3

Commits on May 23, 2023

• add logic to handle incoming NaNs from LUH2

  glemieux

  committed
  dd916b6

  Copy full SHA for dd916b6

• correct logic on transition matrix update

  glemieux

  committed
  a4cb742

  Copy full SHA for a4cb742

Commits on May 24, 2023

• transfer luh2 nan check into its own procedure

  glemieux

  committed
  c94158f

  Copy full SHA for c94158f

• remove diagnostics

  glemieux

  committed
  7033cef

  Copy full SHA for 7033cef

• remove unnessary use statements

  glemieux

  committed
  a20b696

  Copy full SHA for a20b696

Commits on Jun 5, 2023

• fixed units on LU transition rates

  ckoven

  committed
  32be05b

  Copy full SHA for 32be05b

• adding logic to handle case where disturbance_rate is slightly greater than one.

  ckoven

  committed
  12749be

  Copy full SHA for 12749be

Commits on Jun 6, 2023

• update patch insertion to account for more landuse types

  glemieux

  committed
  2c8193b

  Copy full SHA for 2c8193b

• add fix to age indexing

  glemieux

  committed
  3b19f3d

  Copy full SHA for 3b19f3d

• remove old diagnostic write statements

  glemieux

  committed
  9c209b5

  Copy full SHA for 9c209b5

• remove missed diagnostic write

  glemieux

  committed
  1377f2d

  Copy full SHA for 1377f2d

• remove tail of old write statment

  glemieux

  committed
  71737af

  Copy full SHA for 71737af

• increasing variable character length

  glemieux

  committed
  feba193

  Copy full SHA for feba193

Commits on Jun 8, 2023

• initial commit to create insert_patch procedure

  glemieux

  committed
  47122a9

  Copy full SHA for 47122a9

• add simplest insertion method

  glemieux

  committed
  63b335d

  Copy full SHA for 63b335d

• adding option 1 and 4

  glemieux

  committed
  a3100a9

  Copy full SHA for a3100a9

• add other patch insertion options

  Show description for f542db6
  glemieux

  committed
  f542db6

  Copy full SHA for f542db6

• fix missing end if

  glemieux

  committed
  c325d72

  Copy full SHA for c325d72

• remote erroneous pointer attribute from currentSite

  glemieux

  committed
  68e2eff

  Copy full SHA for 68e2eff

• correct insert patch option 2

  glemieux

  committed
  f13e621

  Copy full SHA for f13e621

Commits on Jun 9, 2023

• initial commmit for patch termination update

  glemieux

  committed
  bc91bd6

  Copy full SHA for bc91bd6

• add additional comments clarifying potential patch fusion

  glemieux

  committed
  aa7804b

  Copy full SHA for aa7804b

• add missing gotfused flag

  glemieux

  committed
  ad8701b

  Copy full SHA for ad8701b

• correct typo

  glemieux

  committed
  5a2f818

  Copy full SHA for 5a2f818

Commits on Aug 9, 2023

• Merge tag 'sci.1.65.5_api.25.4.0' into luh2-refactor_merge

  Show description for b3ae8c2
  glemieux

  committed
  b3ae8c2

  Copy full SHA for b3ae8c2

• Merge tag 'sci.1.65.7_api.25.4.0' into luh2-refactor_merge

  Show description for 562ed50
  glemieux

  committed
  562ed50

  Copy full SHA for 562ed50

• Merge tag 'sci.1.66.0_api.25.5.0' into luh2-refactor_merge

  Show description for a3cc2d4
  glemieux

  committed
  a3cc2d4

  Copy full SHA for a3cc2d4

• Merge tag 'sci.1.67.0_api.25.5.0' into luh2-refactor_merge

  Show description for 4c59f81
  glemieux

  committed
  4c59f81

  Copy full SHA for 4c59f81

Commits on Aug 10, 2023

• updating parameter file and archives

  glemieux

  committed
  672bae3

  Copy full SHA for 672bae3

• Merge tag 'sci.1.67.1_api.26.0.0' into luh2-refactor_merge

  Show description for 68c7fc6
  glemieux

  committed
  68c7fc6

  Copy full SHA for 68c7fc6

• correct refactor merge issues

  glemieux

  committed
  7ba2e79

  Copy full SHA for 7ba2e79

Commits on Aug 11, 2023

• correcting additonal bad refactor merge

  glemieux

  committed
  1502710

  Copy full SHA for 1502710

Commits on Aug 15, 2023

• Add landuse to initialization procedures

  glemieux

  committed
  698b91c

  Copy full SHA for 698b91c

• Merge branch 'luh2' into luh2-insert_patch

  glemieux

  committed
  0b5d890

  Copy full SHA for 0b5d890

• convert insert patch else if to case select

  glemieux

  committed
  c55d7ae

  Copy full SHA for c55d7ae

Commits on Aug 17, 2023

• Merge branch 'luh2' into luh2-fuse-youngest

  glemieux

  committed
  33754e1

  Copy full SHA for 33754e1

• update case names for InsertPatch and clarify comments

  glemieux

  committed
  ae880a8

  Copy full SHA for ae880a8

Commits on Aug 18, 2023

• Update the terminate patch process for fusion of different landuse labels

  Show description for b640df0
  glemieux

  committed
  b640df0

  Copy full SHA for b640df0

• Merge branch 'luh2-fuse-youngest' into luh2-insert-fuse

  glemieux

  committed
  de2f8a5

  Copy full SHA for de2f8a5

• correct case statements and variable name mismatch

  glemieux

  committed
  0da2f92

  Copy full SHA for 0da2f92

• Merge branch 'luh2-insert_patch' into luh2-insert-fuse

  glemieux

  committed
  a9ad185

  Copy full SHA for a9ad185

• fix single line if statements

  glemieux

  committed
  cc967cf

  Copy full SHA for cc967cf

• Merge branch 'luh2-fuse-youngest' into luh2-insert-fuse

  glemieux

  committed
  ee47d14

  Copy full SHA for ee47d14

• adjust patch termination comments

  glemieux

  committed
  f6687de

  Copy full SHA for f6687de

Commits on Aug 19, 2023

• correct logic for checking youngest landuse type patch

  glemieux

  committed
  0dce77f

  Copy full SHA for 0dce77f

Commits on Aug 21, 2023

• add debug check to write statements in fusion

  glemieux

  committed
  f0e8aa1

  Copy full SHA for f0e8aa1

Commits on Sep 5, 2023

• add landuse x pft dimension

  glemieux

  committed
  b1f36bc

  Copy full SHA for b1f36bc

Commits on Sep 12, 2023

• pasted code from grazing branch for adding land use dimension to paramter file

  ckoven

  committed
  800136d

  Copy full SHA for 800136d

• changing parameter read infrastructure for maxpatches by landuse consolidation

  ckoven

  committed
  e2378fb

  Copy full SHA for e2378fb

• more changes for maxpatches by landuse consolidation

  ckoven

  committed
  4392c39

  Copy full SHA for 4392c39

• fixed/updated clearing matrix logic

  ckoven

  committed
  62a6553

  Copy full SHA for 62a6553

• merged main and resolved conflicts

  ckoven

  committed
  93fd29d

  Copy full SHA for 93fd29d

Commits on Sep 13, 2023

• update patch xml with combined maxpatch variable

  glemieux

  committed
  ffdbb86

  Copy full SHA for ffdbb86

• align maxpatches by landuse variable names

  glemieux

  committed
  beeb0fa

  Copy full SHA for beeb0fa

Commits on Sep 15, 2023

• fix total area variable name

  glemieux

  committed
  059a03e

  Copy full SHA for 059a03e

Commits on Sep 19, 2023

• fixed dimension order

  ckoven

  committed
  df91bb2

  Copy full SHA for df91bb2

Commits on Oct 5, 2023

• adding some more comments to spawn_patches

  ckoven

  committed
  dd58c11

  Copy full SHA for dd58c11

• added restart capability for site-level disturbance rate diagnostic

  ckoven

  committed
  853efcf

  Copy full SHA for 853efcf

• reset n_dist_types back to 4

  ckoven

  committed
  26d6a9f

  Copy full SHA for 26d6a9f

• various fixes per review comments

  ckoven

  committed
  12132bd

  Copy full SHA for 12132bd

Commits on Oct 6, 2023

• minor build fix

  glemieux

  committed
  3fc589e

  Copy full SHA for 3fc589e

• manually revert back to previous terminate patches subroutine method

  glemieux

  committed
  2ae2f91

  Copy full SHA for 2ae2f91

• minor comment alignments and fixing bad copies

  glemieux

  committed
  bc8fddd

  Copy full SHA for bc8fddd

• remove largestpatch missed in manual reversion

  glemieux

  committed
  40d74ad

  Copy full SHA for 40d74ad

• update last ditch fusion to have donor give reciever the same age_since

  glemieux

  committed
  f47f009

  Copy full SHA for f47f009

Commits on Oct 13, 2023

• update diagnostics

  glemieux

  committed
  3d5e878

  Copy full SHA for 3d5e878

Commits on Oct 16, 2023

• remove diagnostic statments

  glemieux

  committed
  8cf5d47

  Copy full SHA for 8cf5d47

Commits on Nov 15, 2023

• Merge branch 'main' into luh2

  glemieux

  committed
  51c0125

  Copy full SHA for 51c0125

Commits on Nov 29, 2023

• add graceful failure if the HLM state name is not found in the fates list

  glemieux

  committed
  3c361de

  Copy full SHA for 3c361de

• correct findloc check for landuse state name check

  glemieux

  committed
  cde7e7d

  Copy full SHA for cde7e7d

• Merge tag 'sci.1.69.0_api.31.0.0' into luh2

  Show description for ef1c454
  glemieux

  committed
  ef1c454

  Copy full SHA for ef1c454

Commits on Nov 30, 2023

• fix merge that snuck in old anthro disturbance label

  glemieux

  committed
  1cf7bca

  Copy full SHA for 1cf7bca

• rename the parameter patch file to reflect the actual next tag

  glemieux

  committed
  ea24aa8

  Copy full SHA for ea24aa8

Commits on Dec 14, 2023

• refactor to replace findloc intrinsic

  Show description for 4966a98
  glemieux

  committed
  4966a98

  Copy full SHA for 4966a98

Commits on Dec 15, 2023

• fix array size call

  glemieux

  committed
  ece937c

  Copy full SHA for ece937c

• Reduce the sum of fates_maxpatches_per_landuse to 16 as default

  Show description for 56eec56
  glemieux

  committed
  56eec56

  Copy full SHA for 56eec56

• rename the patch paramfile for api 32

  Show description for 7a7a8a3
  glemieux

  committed
  7a7a8a3

  Copy full SHA for 7a7a8a3