remove damage and parameter changes, merge in main #1

rgknox · 2024-08-14T00:18:13Z

No description provided.

… nocomp

…hange

…mter file

…outine)

…o land-use

…nough patches for a given land use type to acomodate all PFTs prescribed

… logging and land use change

…broutines

…ry and secondary PFT maps differ

… precision

This avoids an out-of-bounds indexing error when in landuse mode

Updates and fixes to history zeroing and flushing

Updates and fixes to history zeroing and flushing Includes fixes to how some multi-dimensional history variables are initialized. This also introduces a new flush all history subroutine, to be implimented as an API call in later HLM pull requests.

…already in the linked list

…are non-negative

…ght into the list This handles cases in which only one pft needs to receive patch area from the buffer, but due to precision errors, following the splitting routine would result in a very small patch, technically above the reasonable math precision limit, being held in the buffer

This reverts commit bb3d58e.

V2 Land Use Change

Make sure to define `state_vector` if not in land use mode

initialize the transitions matrix to zero

…ed crown damage code from grass sapwood allometry

…to a later PR

ckoven and others added 30 commits July 14, 2023 13:37

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

0c35e38

… nocomp

starting to put in logic to handle nocomp PFT transitions during LU c…

2d9dd68

…hange

fixing some bugs I see while reading through code

9a08430

added new generalized split_patch function

a93efe4

refactored and reused logic to put new patches into linked list

255e709

some compile-time bugfixes

b4159dc

more compile-time bugfixes

148eaf4

adding logic to clean up temporary patches

c594f80

adding logic to handle crop PFTs on crop land use types

e842bdd

adding logic for crops at recruitmetn step

74fefd3

pasted code from grazing branch for adding land use dimension to para…

66a5b2d

…mter file

passing crop landuse/PFT info through parameter interface

6c43b61

merged main and resolved conflicts

5380c7f

merged luh2 and resolved conflicts (both had new patch insertion subr…

3e9925a

…outine)

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

6b462cc

…o land-use

merged luh2 and resolved conflicts

b56044b

added edparamsmod changed to merge

a441e93

fixed merged conflict

b94fefa

Merge branch 'luh1' into luh2_nocomp_merge

7d05c7a

merged luh2 and resolved conflicts

50494e7

added logic to handle case where nocomp and land use are on but not e…

71deea8

…nough patches for a given land use type to acomodate all PFTs prescribed

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

01212d1

startign to add logic to handle PFT_level harvest parameters for both…

110ef78

… logging and land use change

adding parameter values and passing to land use change and logging su…

94ed776

…broutines

do nocomp PFT shuffle for newly secondary lands as well in case prima…

c823fb6

…ry and secondary PFT maps differ

Merge branch 'luh2' into luh2_nocomp_merge

4985e94

various compile-time bugfixes

75df884

more compile-time bugfixes

b2e427d

various runtime-failure fixes and attempted fixes

a967b7f

more runtime bugfixes

e1813e8

glemieux and others added 29 commits June 4, 2024 11:12

change nocomp_pft_area_vector check to first diff then sum for better…

9c2444f

… precision

change check for buffer split to use fraction to keep

737e81d

add check to avoid bareground patches

4b018ea

This avoids an out-of-bounds indexing error when in landuse mode

Updated some text

e407b81

removed redundant zero flush in history

8d028eb

Merge pull request NGEET#1208 from rgknox/history-zerofixes

b8e4eee

Updates and fixes to history zeroing and flushing

update split_patches to take optional area input

b43cb3a

fix split patch optional argument name error

29621bc

correct bad merge

9b724ea

refactor checks to determine what is sent to buffer patch

3c02ded

make sure to skip the buffer patch split loop if the buffer patch is …

7add4a1

…already in the linked list

refactor newp_area calculation to avoid potential precision error

fe795df

move the fraction to keep calculation earlier

28511d1

check absolute value of buffer area to keep

e823830

remove this check as we are now checking the new and remaining areas …

2ec67f9

…are non-negative

correct whitespace

69e8f6a

add sp mode check to litter initialization for bareground patches

c9e7271

initialize current tag for event code logging

bb3d58e

Revert "initialize current tag for event code logging"

4ae398b

This reverts commit bb3d58e.

Merge pull request NGEET#1116 from ckoven/luh2_nocomp_merge

fd7f343

V2 Land Use Change

make sure to define state_vector if not in land use mode

a2b71d0

Merge pull request NGEET#1223 from glemieux/landuse-v2-nanfix

1982b00

Make sure to define `state_vector` if not in land use mode

initialize the transitions matrix to zero

dfe771c

Merge pull request NGEET#1231 from glemieux/init-trans_matrix

e372f0b

initialize the transitions matrix to zero

Merge branch 'main' into xlg-grass-allometry-rgk

639b3c2

Added parameter checking for sapwood allometry 2 and woody pft, remov…

953eb7c

…ed crown damage code from grass sapwood allometry

Reverting changes to the parameter file. Those changes will be added …

f73999b

…to a later PR

XiulinGao merged commit 8fe0407 into XiulinGao:xlg-grass-allometry Aug 14, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

remove damage and parameter changes, merge in main #1

remove damage and parameter changes, merge in main #1

rgknox commented Aug 14, 2024

remove damage and parameter changes, merge in main #1

remove damage and parameter changes, merge in main #1

Conversation

rgknox commented Aug 14, 2024