Merging of Marcos' r321 commits.

See report 81ml321rapid.pdf for details and tests. From Marcos' Line: revno: 321 committer: Marcos Longo <[email protected]> branch nick: EDBRAMS timestamp: Sat 2012-10-20 19:53:58 -0400 message: 1. Bug fix in multiple_scatter.f90. One variable was not initialised correctly. 2. Added several diagnostic variables to the output.
rgknox · Nov 4, 2013 · a167753 · a167753
2 parents 01ff085 + 5d9d23f
commit a167753
Show file tree

Hide file tree

Showing 25 changed files with 3,519 additions and 1,525 deletions.
diff --git a/.bzrignore b/.bzrignore
@@ -12160,3 +12160,11 @@ BRAMS/i12dbg/bin/therm_lib.mod
 BRAMS/i12dbg/bin/turb_coms.mod
 BRAMS/i12dbg/bin/var_tables.mod
 BRAMS/i12dbg/edbrams-opt
+BRAMS/build
+BRAMS/build/edbrams-srf
+BRAMS/i10dbg/bin/include.mk.opt
+ED/build/bin/budget_utils.mod
+ED/dbgbuild/bin/budget_utils.mod
+BRAMS/i12build
+ED/dbgbuild/bin/update_cohort_extensive_props_mod.f90
+ED/dbgbuild/bin/update_cohort_extensive_props_mod.mod
diff --git a/ED/Template/Template/ED2IN b/ED/Template/Template/ED2IN
@@ -249,8 +249,8 @@ $ED_NL
    !                         Multiple timepoints should not be used in the history files   !
    !                         if you intend to use these for HISTORY runs.                  !
    !---------------------------------------------------------------------------------------!
-   NL%OUTFAST    = 1.
-   NL%OUTSTATE   = 1.
+   NL%OUTFAST    = 0.
+   NL%OUTSTATE   = 0.
    !---------------------------------------------------------------------------------------!
 
 

diff --git a/ED/Template/Template/plot_monthly.r b/ED/Template/Template/plot_monthly.r
@@ -655,30 +655,49 @@ for (place in myplaces){
    # at any given time.                                                                    #
    #---------------------------------------------------------------------------------------#
    empty = datum$nplantpftdbh == 0
-   datum$agbpftdbh       [empty] = NA
-   datum$basareapftdbh   [empty] = NA
-   datum$laipftdbh       [empty] = NA
-   datum$waipftdbh       [empty] = NA
-   datum$taipftdbh       [empty] = NA
-   datum$gpppftdbh       [empty] = NA
-   datum$npppftdbh       [empty] = NA
-   datum$mcopftdbh       [empty] = NA
-   datum$cbapftdbh       [empty] = NA
-   datum$cbalightpftdbh  [empty] = NA
-   datum$cbamoistpftdbh  [empty] = NA
-   datum$cbarelpftdbh    [empty] = NA
-   datum$ldroppftdbh     [empty] = NA
-   datum$fsopftdbh       [empty] = NA
-   datum$demandpftdbh    [empty] = NA
-   datum$supplypftdbh    [empty] = NA
-   datum$mortpftdbh      [empty] = NA
-   datum$agemortpftdbh   [empty] = NA
-   datum$ncbmortpftdbh   [empty] = NA
-   datum$tfallmortpftdbh [empty] = NA
-   datum$coldmortpftdbh  [empty] = NA
-   datum$distmortpftdbh  [empty] = NA
-   datum$growthpftdbh    [empty] = NA
-   datum$nplantpftdbh    [empty] = NA
+   datum$agbpftdbh          [empty] = NA
+   datum$basareapftdbh      [empty] = NA
+   datum$laipftdbh          [empty] = NA
+   datum$waipftdbh          [empty] = NA
+   datum$taipftdbh          [empty] = NA
+   datum$gpppftdbh          [empty] = NA
+   datum$npppftdbh          [empty] = NA
+   datum$mcopftdbh          [empty] = NA
+   datum$cbapftdbh          [empty] = NA
+   datum$cbalightpftdbh     [empty] = NA
+   datum$cbamoistpftdbh     [empty] = NA
+   datum$cbal12lightpftdbh  [empty] = NA
+   datum$cbal12moistpftdbh  [empty] = NA
+   datum$cbarelpftdbh       [empty] = NA
+   datum$ldroppftdbh        [empty] = NA
+   datum$fsopftdbh          [empty] = NA
+   datum$demandpftdbh       [empty] = NA
+   datum$supplypftdbh       [empty] = NA
+   datum$mortpftdbh         [empty] = NA
+   datum$agemortpftdbh      [empty] = NA
+   datum$ncbmortpftdbh      [empty] = NA
+   datum$tfallmortpftdbh    [empty] = NA
+   datum$coldmortpftdbh     [empty] = NA
+   datum$distmortpftdbh     [empty] = NA
+   datum$growthpftdbh       [empty] = NA
+   datum$plresppftdbh       [empty] = NA
+   datum$bstorepftdbh       [empty] = NA
+   datum$hflxlcpftdbh       [empty] = NA
+   datum$wflxlcpftdbh       [empty] = NA
+   datum$transppftdbh       [empty] = NA
+   datum$i.gpppftdbh        [empty] = NA
+   datum$i.npppftdbh        [empty] = NA
+   datum$i.plresppftdbh     [empty] = NA
+   datum$i.mcopftdbh        [empty] = NA
+   datum$i.cbapftdbh        [empty] = NA
+   datum$i.cbalightpftdbh   [empty] = NA
+   datum$i.cbamoistpftdbh   [empty] = NA
+   datum$i.cbal12lightpftdbh[empty] = NA
+   datum$i.cbam12lightpftdbh[empty] = NA
+   datum$i.transppftdbh     [empty] = NA
+   datum$i.wflxlcpftdbh     [empty] = NA
+   datum$i.hflxlcpftdbh     [empty] = NA
+   datum$nplantpftdbh       [empty] = NA
    #---------------------------------------------------------------------------------------#
 
 

diff --git a/ED/Template/Template/plot_yearly.r b/ED/Template/Template/plot_yearly.r