Code

conflict resolutions with PARTEH#1

Code

Merged

ckoven merged 49 commits intockoven:recruiment_into_sizeclasses_v2ckoven/fates:recruiment_into_sizeclasses_v2from rgknox:recruiment_into_sizeclasses_v2rgknox/fates:recruiment_into_sizeclasses_v2Copy head branch name to clipboardOct 25, 2018

+8,597-1,877

Commits

Commits on Sep 18, 2018

• Added parteh into FATES folder system. Functional unit tests for carbon pass. Not hooked into FATES though.

  rgknox

  committed
  857d873

Commits on Sep 19, 2018

• Partial first pass on integrating new modular allocation system

  rgknox

  committed
  229dce0

Commits on Sep 20, 2018

• Lots more conversion from old system to parteh v0

  rgknox

  committed
  9140338

• Minor syntax changes to describing main prt object

  rgknox

  committed
  3aafcae

• minor syntax updates to prt generic

  rgknox

  committed
  e7fedaa

Commits on Sep 23, 2018

• Converted biophysics routines into new allocation structure. First pass.

  rgknox

  committed
  8b58a68

• Removed old CN parameters

  rgknox

  committed
  a3b68cb

Commits on Sep 24, 2018

• Added the call to load the PRT instances

  rgknox

  committed
  39fbed2

Commits on Sep 25, 2018

• First pass at code handling loss fluxes, updates to parameters.

  rgknox

  committed
  f987da9

• Updating calls to loss-fluxes. Removed the cohort litter_flux variable (redundant).

  rgknox

  committed
  d3f760f

Commits on Sep 26, 2018

• Code fixes and tweaks to enable new turnover design into the parteh unit testing framework.

  rgknox

  committed
  f6b47fd

• Updated functional unit test build script to include external CNP module

  rgknox

  committed
  22b62f8

• Resolved merge conflicts with master.

  rgknox

  committed
  efe38c2

• Bug fixes to maintenance losses, fixes/updates to the unit test to use the CNP hypothesis (external).

  rgknox

  committed
  9a34945

Commits on Sep 27, 2018

• Added phenology events to the functional unit tests, however its messy and needs cleanup.

  rgknox

  committed
  fb39f3c

• Debugged phenology events in the unit testing framework

  rgknox

  committed
  b27fbee

Commits on Sep 28, 2018

• Lots of debugging of parteh integration. This changeset compiles.

  rgknox

  committed
  a40884f

• Debugging parteh v1, model runs, crashes after several years due to carbon inbalance.

  rgknox

  committed
  11c4855

• More debugging for parteh-fates. Added reproductive flux handler.

  rgknox

  committed
  d1497bb

Commits on Oct 1, 2018

• bug fixes relevant to parteh v0. Fixed root litter accumulation and fusion weighting

  rgknox

  committed
  ec51801

Commits on Oct 2, 2018

• Enabled object oriented filling/retrieving of PRT variables from restart. Untested

  rgknox

  committed
  33c8fa9

• Some debugging for restarts on arbitrary prt variables.

  rgknox

  committed
  dcb9219

• bug fixes in parteh v1

  rgknox

  committed
  f133b79

Commits on Oct 3, 2018

• Fixed some descriptions in the parameter file. Added the flush fraction parameter, and checks.

  rgknox

  committed
  19f634d

Commits on Oct 8, 2018

• Fixed type definition of prt objects during copy and fuse

  rgknox

  committed
  43dcde8

Commits on Oct 11, 2018

• Updated the default 14pft file to include parteh parameters. Added the organ variable to describe the organ dimension in the parameter files.

  rgknox

  committed
  707b0c9

Commits on Oct 12, 2018

• parteh: Moved the allocation of the prt structure to be a non-overridable base procedure. Also, added support variables to the global instance for number of variables, number of boundary conditions…

  Show description for 2e96e19
  rgknox

  committed
  2e96e19

• Merge resolutions with fire fixes / debug fixes with parteh

  rgknox

  committed
  a3f91ec

• Connected phenology flush fraction to the actual process

  rgknox

  committed
  e9b32b0

Commits on Oct 15, 2018

• Updated unit testing scripts to reflect updates in core parteh code.

  rgknox

  committed
  fe69005

Commits on Oct 17, 2018

• parteh syntax changes, renamed hlm_parteh_mode, added the named cases for hlm_parteh_mode, cleaned up some loop counters during restarts. Updated comments in the allometric carbon only hypothesis.

  rgknox

  committed
  d397866

• Update parteh/PRTAllometricCarbonMod.F90

  

  rosiealice

  authored and

  rgknox

  committed
  881b5fc

Commits on Oct 18, 2018

• Update parteh/PRTAllometricCarbonMod.F90

  

  rosiealice

  authored and

  rgknox

  committed
  4808362

• Many comments and cleanings for the parteh.

  rgknox

  committed
  bfbe4b6

• Merge branch 'rgknox-parteh' of github.com:rgknox/fates into rgknox-parteh

  rgknox

  committed
  26f4c70

• Update parteh/PRTGenericMod.F90

  

  ckoven

  authored and

  rgknox

  committed
  9bf1ad7

• Update parteh/PRTGenericMod.F90

  

  ckoven

  authored and

  rgknox

  committed
  ba3a24e

• Update parteh/PRTLossFluxesMod.F90

  

  ckoven

  authored and

  rgknox

  committed
  a2119ad

• Update parteh/PRTAllometricCarbonMod.F90

  

  ckoven

  authored and

  rgknox

  committed
  ee39364

• Update biogeochem/EDPatchDynamicsMod.F90

  

  jkshuman

  authored and

  rgknox

  committed
  ad301bc

• More updates to comments and variable naming conventions, like bl -> leaf_c

  rgknox

  committed
  ef87e48

Commits on Oct 19, 2018

• unified the grperc parameters, only grperc is used in the parameter file now.

  rgknox

  committed
  a2dd80d

• Updated functional unit tests to conform to newly named variables.

  rgknox

  committed
  4be98cc

Commits on Oct 22, 2018

• parteh: Changed naming convention from species (chemical) to element. Also added flexibility in leaf flushing algorithm.

  rgknox

  committed
  daacfb2

• parteh: Updated species (chem) to element in functional unit test code

  rgknox

  committed
  f20cd68

Commits on Oct 23, 2018

• parteh: placed call to net_allocation query inside an isnew conditional, fixed day-> conversion factor

  rgknox

  committed
  c8d2025

Commits on Oct 24, 2018

• Merge pull request NGEET#421 from rgknox/rgknox-parteh

  Show description for 5a9b1d6
  rgknox

  authored
  5a9b1d6

Commits on Oct 25, 2018

• conflict resolutions with parteh

  rgknox

  committed
  cdf57ee

• Added last size class to restarts

  rgknox

  committed
  536ab42