Code

V2 Land Use Change#1116

Code

Merged

glemieux merged 131 commits intoNGEET:mainNGEET/fates:mainfrom ckoven:luh2_nocomp_mergeckoven/fates:luh2_nocomp_mergeCopy head branch name to clipboardJul 8, 2024

+3,888-698

Commits

Commits on Jul 14, 2023

• first attempt to reconcile patch initialization logic with land-use + nocomp

  ckoven

  committed
  0c35e38

  Copy full SHA for 0c35e38

• starting to put in logic to handle nocomp PFT transitions during LU change

  ckoven

  committed
  2d9dd68

  Copy full SHA for 2d9dd68

Commits on Jul 28, 2023

• fixing some bugs I see while reading through code

  ckoven

  committed
  9a08430

  Copy full SHA for 9a08430

Commits on Jul 31, 2023

• added new generalized split_patch function

  ckoven

  committed
  a93efe4

  Copy full SHA for a93efe4

• refactored and reused logic to put new patches into linked list

  ckoven

  committed
  255e709

  Copy full SHA for 255e709

Commits on Aug 9, 2023

• some compile-time bugfixes

  ckoven

  committed
  b4159dc

  Copy full SHA for b4159dc

• more compile-time bugfixes

  ckoven

  committed
  148eaf4

  Copy full SHA for 148eaf4

• adding logic to clean up temporary patches

  ckoven

  committed
  c594f80

  Copy full SHA for c594f80

Commits on Aug 10, 2023

• adding logic to handle crop PFTs on crop land use types

  ckoven

  committed
  e842bdd

  Copy full SHA for e842bdd

• adding logic for crops at recruitmetn step

  ckoven

  committed
  74fefd3

  Copy full SHA for 74fefd3

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

  ckoven

  committed
  66a5b2d

  Copy full SHA for 66a5b2d

Commits on Aug 11, 2023

• passing crop landuse/PFT info through parameter interface

  ckoven

  committed
  6c43b61

  Copy full SHA for 6c43b61

Commits on Aug 14, 2023

• merged main and resolved conflicts

  ckoven

  committed
  5380c7f

  Copy full SHA for 5380c7f

Commits on Aug 22, 2023

• merged luh2 and resolved conflicts (both had new patch insertion subroutine)

  ckoven

  committed
  3e9925a

  Copy full SHA for 3e9925a

Commits on Sep 6, 2023

• added logic to handle transitioning from a restart with no-land-use to land-use

  ckoven

  committed
  6b462cc

  Copy full SHA for 6b462cc

Commits on Sep 18, 2023

• merged luh2 and resolved conflicts

  ckoven

  committed
  b56044b

  Copy full SHA for b56044b

• added edparamsmod changed to merge

  ckoven

  committed
  a441e93

  Copy full SHA for a441e93

• fixed merged conflict

  ckoven

  committed
  b94fefa

  Copy full SHA for b94fefa

Commits on Sep 19, 2023

• Merge branch 'luh1' into luh2_nocomp_merge

  ckoven

  committed
  7d05c7a

  Copy full SHA for 7d05c7a

Commits on Oct 6, 2023

• merged luh2 and resolved conflicts

  ckoven

  committed
  50494e7

  Copy full SHA for 50494e7

Commits on Oct 12, 2023

• added logic to handle case where nocomp and land use are on but not enough patches for a given land use type to acomodate all PFTs prescribed

  ckoven

  committed
  71deea8

  Copy full SHA for 71deea8

• error/edge-case handling for if the LU x PFT area dataset has NaNs

  ckoven

  committed
  01212d1

  Copy full SHA for 01212d1

• startign to add logic to handle PFT_level harvest parameters for both logging and land use change

  ckoven

  committed
  110ef78

  Copy full SHA for 110ef78

Commits on Oct 13, 2023

• adding parameter values and passing to land use change and logging subroutines

  ckoven

  committed
  94ed776

  Copy full SHA for 94ed776

• do nocomp PFT shuffle for newly secondary lands as well in case primary and secondary PFT maps differ

  ckoven

  committed
  c823fb6

  Copy full SHA for c823fb6

Commits on Oct 16, 2023

• Merge branch 'luh2' into luh2_nocomp_merge

  ckoven

  committed
  4985e94

  Copy full SHA for 4985e94

Commits on Oct 18, 2023

• various compile-time bugfixes

  ckoven

  committed
  75df884

  Copy full SHA for 75df884

• more compile-time bugfixes

  ckoven

  committed
  b2e427d

  Copy full SHA for b2e427d

Commits on Oct 20, 2023

• various runtime-failure fixes and attempted fixes

  ckoven

  committed
  a967b7f

  Copy full SHA for a967b7f

• more runtime bugfixes

  ckoven

  committed
  e1813e8

  Copy full SHA for e1813e8

Commits on Oct 21, 2023

• tiny bugfixes

  ckoven

  committed
  7d5ce7e

  Copy full SHA for 7d5ce7e

Commits on Oct 27, 2023

• various bugfixes and the diagnostics used to identify them

  ckoven

  committed
  7d632a0

  Copy full SHA for 7d632a0

• moar bugfix

  ckoven

  committed
  fbcaa33

  Copy full SHA for fbcaa33

Commits on Oct 30, 2023

• fixed anothe rbug and turning disturbance back on

  ckoven

  committed
  f698158

  Copy full SHA for f698158

Commits on Oct 31, 2023

• more bugfixes; add diagnostic for transition matrix; zeroed diags on matrix

  ckoven

  committed
  ac4b61d

  Copy full SHA for ac4b61d

• moving storage of transition matrix to site variable to simplify history output

  ckoven

  committed
  4671798

  Copy full SHA for 4671798

Commits on Nov 1, 2023

• added use_fates_potentialveg flag and logic based on it

  ckoven

  committed
  3af2936

  Copy full SHA for 3af2936

• buggfix and added a print statement

  ckoven

  committed
  0269b22

  Copy full SHA for 0269b22

Commits on Nov 2, 2023

• moar bugs

  ckoven

  committed
  c9414d2

  Copy full SHA for c9414d2

• fix true/false check for the potential veg

  glemieux

  committed
  39ecc27

  Copy full SHA for 39ecc27

• identify patch with matching land use to copy from for the buffer patch

  Show description for 1b42aeb
  glemieux

  committed
  1b42aeb

  Copy full SHA for 1b42aeb

• Merge branch 'luh2_nocomp_merge' into luh2_nocomp_merge-switchfix-bufferfix

  ckoven

  authored
  382782e

  Copy full SHA for 382782e

• Merge pull request #17 from glemieux/luh2_nocomp_merge-switchfix-bufferfix

  Show description for ea06ba0
  ckoven

  authored
  ea06ba0

  Copy full SHA for ea06ba0

• some cleanup but still not working

  ckoven

  committed
  321616b

  Copy full SHA for 321616b

• possible fix to raction_to_keep logic

  ckoven

  committed
  8493d5b

  Copy full SHA for 8493d5b

• fix for fusing a patch that isn't part of the linked list structure into one that is

  ckoven

  committed
  b01960d

  Copy full SHA for b01960d

• another fix in the patch nocomp-pft reweighting after land use change section

  ckoven

  committed
  fe43f5c

  Copy full SHA for fe43f5c

• fixed another thing that was wrong

  ckoven

  committed
  a7b8d88

  Copy full SHA for a7b8d88

Commits on Nov 6, 2023

• more bugfixes, attempted bugfixes, and diagnostics

  ckoven

  committed
  998aa48

  Copy full SHA for 998aa48

Commits on Nov 7, 2023

• i think maybe it works now?

  ckoven

  committed
  cce0963

  Copy full SHA for cce0963

Commits on Nov 8, 2023

• made the minimum land use fraction a named variable that depends on site-elvel baer ground fraction

  ckoven

  committed
  6e608d4

  Copy full SHA for 6e608d4

Commits on Nov 9, 2023

• added new parameter fates_max_nocomp_pfts_by_landuse and using instead of just fates_maxpatches_by_landuse

  ckoven

  committed
  9574a1c

  Copy full SHA for 9574a1c

• bugfix

  ckoven

  committed
  5a6c0bd

  Copy full SHA for 5a6c0bd

• adding min_allowed_landuse_fraction to restart files, and other error diagnostics

  ckoven

  committed
  d7d989e

  Copy full SHA for d7d989e

• one bugfix and one temporary change to turn off all disturbance to secodnary lands

  ckoven

  committed
  7d79def

  Copy full SHA for 7d79def

• better bugfix

  ckoven

  committed
  8afbe48

  Copy full SHA for 8afbe48

• added restart for site%bareground

  ckoven

  committed
  f8fe5ff

  Copy full SHA for f8fe5ff

Commits on Nov 10, 2023

• fix bug related to bareground area in the application of the transition matrix

  ckoven

  committed
  c07fc03

  Copy full SHA for c07fc03

• adding some documentation

  ckoven

  committed
  eb0671b

  Copy full SHA for eb0671b

• bugfixes: init logging rates, and handling when pft compositn doesnt change.

  ckoven

  committed
  32ee1bf

  Copy full SHA for 32ee1bf

• changing shape of albedo arrays to avoid crash on restart reads

  ckoven

  committed
  401bdd8

  Copy full SHA for 401bdd8

Commits on Nov 22, 2023

• added logic to handle case where LU type was below min area and then exceeds it

  ckoven

  committed
  3f09166

  Copy full SHA for 3f09166

Commits on Nov 27, 2023

• bugfix to handle case of abandonment to secondary when secondary area is small

  ckoven

  committed
  00241bf

  Copy full SHA for 00241bf

Commits on Nov 29, 2023

• another bugfix to handle another edge condition

  ckoven

  committed
  689e7b2

  Copy full SHA for 689e7b2

Commits on Dec 6, 2023

• actually solve the edge case of initial harvest once 2ndry area exceeds min

  ckoven

  committed
  3be4586

  Copy full SHA for 3be4586

Commits on Dec 19, 2023

• merged main and resolved conflicts

  ckoven

  committed
  afd5c19

  Copy full SHA for afd5c19

Commits on Feb 22, 2024

• bugfix to prevent crashes when inserting patch at end of linked list

  ckoven

  committed
  d3c13f0

  Copy full SHA for d3c13f0

Commits on Mar 4, 2024

• various fixes to edge cases encountered

  ckoven

  committed
  d37d973

  Copy full SHA for d37d973

Commits on Apr 2, 2024

• move get_current_landuse_statevector into ed_site_type

  glemieux

  committed
  2ade2b1

  Copy full SHA for 2ade2b1

• covert get_current_landuse_statevector to a function

  glemieux

  committed
  833e397

  Copy full SHA for 833e397

Commits on Apr 4, 2024

• condense common code into a new subroutine

  glemieux

  committed
  157df2b

  Copy full SHA for 157df2b

• move CopyPatchMeansTimers around to find more common patterns

  glemieux

  committed
  44fc070

  Copy full SHA for 44fc070

• remove subroutine stub

  glemieux

  committed
  63045a9

  Copy full SHA for 63045a9

• remove duplicate tveg_longterm update that has been condensed

  glemieux

  committed
  c19d973

  Copy full SHA for c19d973

Commits on Apr 11, 2024

• fixing typos and minor formatting

  glemieux

  committed
  2a5b19f

  Copy full SHA for 2a5b19f

• refactor pft area normalization to avoid checking sumarea in pft loop

  glemieux

  committed
  f90412b

  Copy full SHA for f90412b

• convert loop to single line call

  Show description for e77dda4
  glemieux

  committed
  e77dda4

  Copy full SHA for e77dda4

• simplify indexing across all pfts for given landuse type now that we

  Show description for b835a84
  glemieux

  committed
  b835a84

  Copy full SHA for b835a84

• more minor typo fixes

  glemieux

  committed
  1508b7b

  Copy full SHA for 1508b7b

Commits on Apr 18, 2024

• Convert an array index from real to int, satisfing nag compiler.

  samsrabin

  committed
  73cd037

  Copy full SHA for 73cd037

• Change crop_lu_pft_vector from real to int.

  samsrabin

  committed
  c03a4ba

  Copy full SHA for c03a4ba

• Merge pull request #21 from samsrabin/luh2_nocomp_merge-ssr

  Show description for c1a7453
  ckoven

  authored
  c1a7453

  Copy full SHA for c1a7453

Commits on Apr 23, 2024

• syntax style updates

  rgknox

  committed
  c611b0d

  Copy full SHA for c611b0d

• PascalCase

  ckoven

  committed
  b105d56

  Copy full SHA for b105d56

Commits on Apr 24, 2024

• shortening line lengths

  ckoven

  committed
  34dcc5f

  Copy full SHA for 34dcc5f

Commits on Apr 30, 2024

• vasrious changes in response to review comments

  ckoven

  committed
  5a5dea1

  Copy full SHA for 5a5dea1

• Update biogeochem/FatesLandUseChangeMod.F90

  Show description for 530c99d
  

  ckoven

  and

  glemieux

  authored
  530c99d

  Copy full SHA for 530c99d

• Merge pull request #20 from glemieux/landuse_v2-edinit-refac_norm

  Show description for d74a625
  ckoven

  authored
  d74a625

  Copy full SHA for d74a625

Commits on May 1, 2024

• Update main/FatesInterfaceMod.F90

  Show description for d5b0640
  

  ckoven

  and

  glemieux

  authored
  d5b0640

  Copy full SHA for d5b0640

Commits on May 2, 2024

• aded error check if trying to go back into potential veg mode

  ckoven

  committed
  c348a7d

  Copy full SHA for c348a7d

• Merge branch 'luh2_nocomp_merge_merge' into luh2_nocomp_merge

  ckoven

  committed
  a35f3ea

  Copy full SHA for a35f3ea

Commits on May 7, 2024

• minor typo and renaming corrections

  glemieux

  committed
  0b415cf

  Copy full SHA for 0b415cf

• add landuse mode checks for setting site_secondarylands...

  glemieux

  committed
  153b0bd

  Copy full SHA for 153b0bd

Commits on May 8, 2024

• Merge branch 'luh2_nocomp_merge' into edpatchdyn-refactor-condense-common

  glemieux

  committed
  063eb10

  Copy full SHA for 063eb10

• fix missing end subroutine

  glemieux

  committed
  e36df66

  Copy full SHA for e36df66

• remove target and fix missing indexing definition

  glemieux

  committed
  19e0b16

  Copy full SHA for 19e0b16

• fix patch name typo

  glemieux

  committed
  69558bc

  Copy full SHA for 69558bc

• fix incorrect argument order for new subroutine

  glemieux

  committed
  c090218

  Copy full SHA for c090218

• Merge pull request #18 from glemieux/edpatchdyn-refactor-condense-common

  Show description for ff16157
  glemieux

  authored
  ff16157

  Copy full SHA for ff16157

• Merge pull request #19 from glemieux/landusev2-sitefunc

  Show description for 7fe31f9
  glemieux

  authored
  7fe31f9

  Copy full SHA for 7fe31f9

• fix procedure declaration

  glemieux

  committed
  3594045

  Copy full SHA for 3594045

Commits on May 10, 2024

• fixing error in harvest rate calculations

  ckoven

  committed
  6080ab6

  Copy full SHA for 6080ab6

Commits on May 13, 2024

• conflict resolutions between v2 lu and api 35

  rgknox

  committed
  94fddfd

  Copy full SHA for 94fddfd

Commits on May 14, 2024

• minor build fixes

  glemieux

  committed
  827ab3f

  Copy full SHA for 827ab3f

Commits on May 15, 2024

• conflict resolution in v2

  rgknox

  committed
  48c7894

  Copy full SHA for 48c7894

Commits on May 17, 2024

• bug fixes from luhv2 merge

  rgknox

  committed
  f7318a0

  Copy full SHA for f7318a0

• added parameter file patch for api 36

  rgknox

  committed
  d00ece6

  Copy full SHA for d00ece6

Commits on May 20, 2024

• updated parameter api update xml

  rgknox

  committed
  7084c0d

  Copy full SHA for 7084c0d

• fixed logic on when to initialize patches when not in nocomp-fixedbio

  rgknox

  committed
  37f0245

  Copy full SHA for 37f0245

Commits on May 22, 2024

• updated parameter check to ignore SP

  rgknox

  committed
  a997af5

  Copy full SHA for a997af5

• conflict resolution

  rgknox

  committed
  8712862

  Copy full SHA for 8712862

Commits on May 29, 2024

• remove merge conflict artifacts

  glemieux

  committed
  d38bc59

  Copy full SHA for d38bc59

Commits on May 30, 2024

• shortened some restart var names

  rgknox

  committed
  9d8628e

  Copy full SHA for 9d8628e

Commits on Jun 4, 2024

• change nocomp_pft_area_vector check to first diff then sum for better precision

  glemieux

  committed
  9c2444f

  Copy full SHA for 9c2444f

Commits on Jun 6, 2024

• change check for buffer split to use fraction to keep

  glemieux

  committed
  737e81d

  Copy full SHA for 737e81d

• add check to avoid bareground patches

  Show description for 4b018ea
  glemieux

  committed
  4b018ea

  Copy full SHA for 4b018ea

Commits on Jun 17, 2024

• Merge tag 'sci.1.76.4_api.35.1.0' into luh2_nocomp_merge

  Show description for 3c05ecf
  

  loaner

  committed
  3c05ecf

  Copy full SHA for 3c05ecf

Commits on Jun 24, 2024

• update split_patches to take optional area input

  glemieux

  committed
  b43cb3a

  Copy full SHA for b43cb3a

Commits on Jun 25, 2024

• fix split patch optional argument name error

  glemieux

  committed
  29621bc

  Copy full SHA for 29621bc

• correct bad merge

  glemieux

  committed
  9b724ea

  Copy full SHA for 9b724ea

• refactor checks to determine what is sent to buffer patch

  glemieux

  committed
  3c02ded

  Copy full SHA for 3c02ded

• make sure to skip the buffer patch split loop if the buffer patch is already in the linked list

  glemieux

  committed
  7add4a1

  Copy full SHA for 7add4a1

• refactor newp_area calculation to avoid potential precision error

  glemieux

  committed
  fe795df

  Copy full SHA for fe795df

• move the fraction to keep calculation earlier

  glemieux

  committed
  28511d1

  Copy full SHA for 28511d1

• check absolute value of buffer area to keep

  glemieux

  committed
  e823830

  Copy full SHA for e823830

• remove this check as we are now checking the new and remaining areas are non-negative

  glemieux

  committed
  2ec67f9

  Copy full SHA for 2ec67f9

• correct whitespace

  glemieux

  committed
  69e8f6a

  Copy full SHA for 69e8f6a

Commits on Jun 26, 2024

• Add logic to check for cases in which buffer should be inserted straight into the list

  Show description for 88ce982
  glemieux

  committed
  88ce982

  Copy full SHA for 88ce982

Commits on Jun 27, 2024

• add sp mode check to litter initialization for bareground patches

  glemieux

  committed
  c9e7271

  Copy full SHA for c9e7271

Commits on Jun 28, 2024

• initialize current tag for event code logging

  glemieux

  committed
  bb3d58e

  Copy full SHA for bb3d58e

Commits on Jul 8, 2024

• Revert "initialize current tag for event code logging"

  Show description for 4ae398b
  glemieux

  committed
  4ae398b

  Copy full SHA for 4ae398b