Code

Dynamics Refactor#176

Code

Merged

bandre-ucar merged 13 commits intoNGEET:masterNGEET/fates:masterfrom rgknox:rgknox-dynamics-refactorCopy head branch name to clipboardFeb 2, 2017

+652-512

Commits

Commits on Jan 7, 2017

• Initial changes to timing boundary conditions, mostly directed towards the calculation of model-day for phenology.

  rgknox

  committed
  1a943a0

Commits on Jan 9, 2017

• Converted 24 vegetation temperatures used in phenology to bc_in

  rgknox

  committed
  f5fb712

Commits on Jan 11, 2017

• Purging waterstate_inst, soilstate_inst from calls to dynamics and replacing it with bc_in. Temperature_inst for all calls but fire are also purged. Compiles and runs, not regression tested.

  rgknox

  committed
  96e680e

• Clean up of globals in EDPhysiology

  rgknox

  committed
  76662a1

• Removal of CLM boundary conditions to fire model and some CLM globals. ldomain%area(g) is still called in fire model, as well as masterproc and use_spitfire.

  rgknox

  committed
  78ae15a

Commits on Jan 12, 2017

• Added masterproc (used in firemod for log messaging) to the control parameters passed during initialization. Tracked down other instances of use, and also fixed calls to clm version of r8 or iulog …

  Show description for ff8cf21
  rgknox

  committed
  ff8cf21

• Trivial merge conflict with master. Both branches slightly modified the globals at the top of FatesInterfaceMod. master had a slightly different variable name, while the head had added cp_masterproc.

  rgknox

  committed
  179b27e

• Missed a fix on the merge with master: in FatesInterfaceMod, allocation of boundary conditions was using numPatchesPerCohort while master changed that to maxPatchesPerCohort.

  rgknox

  committed
  390aeb6

• Partial re-working of time-control from host to FATES.

  rgknox

  committed
  d04ba37

Commits on Jan 13, 2017

• Finished first pass of time-control refactor.

  rgknox

  committed
  69b4c24

• Removed the use of the HLMs grid area global ldomain(g)%area from SF.

  rgknox

  committed
  db109ad

• Simplified the dynamics call sequence by pulling out the litter flux wrapper. Essentially it was just a wrapper that appeared only once within another wrapper.

  rgknox

  committed
  e2262c4

• Conflict resolution on merge. EDtypes on HEAD had the new cp_masterproc variable, while master had the use_fates_plant_hydro variable, both added to same section. Both are valid in the merge.

  rgknox

  committed
  8b2ca7e