Update the use of ilamb for land BGC

zppy/templates/default.ini

@@ -334,7 +334,7 @@ ts_years = string_list(default=list(""))
 # `years = "1-100",` would plot years 1 to 100 on the graphs.
 
 [ilamb]
-cfg = string(default="ilamb/cmip.cfg")
+cfg = string(default="ilamb/ilamb.cfg")
 # observational data path, default uses mache's "diagnostics_base_path"
 ilamb_obs = string(default="")
 # for land_only run

zppy/templates/ilamb/cmip.cfg

@@ -104,7 +104,7 @@ table_unit    = "Pg yr-1"
 plot_unit     = "g m-2 d-1"
 space_mean    = False
 skip_iav      = True
-relationships = "Evapotranspiration/GLEAMv3.3a","Precipitation/GPCPv2.3","SurfaceDownwardSWRadiation/CERESed4.1","SurfaceNetSWRadiation/CERESed4.1","SurfaceAirTemperature/CRU4.02"
+relationships = "Evapotranspiration/GLEAMv3.3a","Precipitation/GPCPv2.3","SurfaceDownwardSWRadiation/CERESed4.2","SurfaceNetSWRadiation/CERESed4.2","SurfaceAirTemperature/CRU4.02"
 
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -191,15 +191,15 @@ weight         = 5
 mass_weighting = True
 
 [HWSD]
-source     = "DATA/soilc/HWSD/soilc_0.5x0.5.nc"
+source     = "DATA/cSoil/HWSD/soilc_0.5x0.5.nc"
 weight     = 15
 table_unit = "Pg"
 plot_unit  = "kg m-2"
 space_mean = False
 skip_rmse  = True
 
 [NCSCDV22]
-source     = "DATA/soilc/NCSCDV22/soilc_0.5x0.5.nc"
+source     = "DATA/cSoil/NCSCDV22/soilc_0.5x0.5.nc"
 weight     = 12
 table_unit = "Pg"
 plot_unit  = "kg m-2"
@@ -208,14 +208,14 @@ skip_rmse  = True
 
 [Koven]
 ctype        = "ConfSoilCarbon"
-source       = "DATA/soilc/NCSCDV22/soilc_0.5x0.5.nc"
+source       = "DATA/cSoil/NCSCDV22/soilc_0.5x0.5.nc"
 weight       = 15
-soilc_source = "DATA/soilc/NCSCDV22/soilc_0.5x0.5.nc, DATA/soilc/HWSD/soilc_0.5x0.5.nc"
+soilc_source = "DATA/cSoil/NCSCDV22/soilc_0.5x0.5.nc, DATA/cSoil/HWSD/soilc_0.5x0.5.nc"
 tas_source   = "DATA/tas/CRU4.02/tas.nc"
 pr_source    = "DATA/pr/GPCCv2018/pr.nc"
-npp_source   = "DATA/soilc/Koven/npp_0.5x0.5.nc"
-pet_source   = "DATA/soilc/Koven/pet_0.5x0.5.nc"
-fracpeat_source = "DATA/soilc/Koven/fracpeat_0.5x0.5.nc"
+npp_source   = "DATA/cSoil/Koven/npp_0.5x0.5.nc"
+pet_source   = "DATA/cSoil/Koven/pet_0.5x0.5.nc"
+fracpeat_source = "DATA/cSoil/Koven/fracpeat_0.5x0.5.nc"
 
 ###########################################################################
 
@@ -230,21 +230,21 @@ weight         = 5
 mass_weighting = True
 
 [GLEAMv3.3a]
-source        = "DATA/et/GLEAMv3.3a/et.nc"
+source        = "DATA/evspsbl/GLEAMv3.3a/et.nc"
 weight        = 15
 table_unit    = "mm d-1"
 plot_unit     = "mm d-1"
 relationships = "Precipitation/GPCPv2.3","SurfaceAirTemperature/CRU4.02"
 
 [MODIS]
-source        = "DATA/et/MODIS/et_0.5x0.5.nc"
+source        = "DATA/evspsbl/MODIS/et_0.5x0.5.nc"
 weight        = 15
 table_unit    = "mm d-1"
 plot_unit     = "mm d-1"
 relationships = "Precipitation/GPCPv2.3","SurfaceAirTemperature/CRU4.02"
 
 [MOD16A2]
-source        = "DATA/et/MOD16A2/et.nc"
+source        = "DATA/evspsbl/MOD16A2/et.nc"
 weight        = 15
 table_unit    = "mm d-1"
 plot_unit     = "mm d-1"
@@ -259,8 +259,14 @@ mass_weighting = True
 ctype          = "ConfEvapFraction"
 
 [FLUXCOM]
-hfss_source = "DATA/sh/FLUXCOM/sh.nc"
-hfls_source = "DATA/le/FLUXCOM/le.nc"
+hfss_source = "DATA/hfss/FLUXCOM/sh.nc"
+hfls_source = "DATA/hfls/FLUXCOM/le.nc"
+weight      = 9
+skip_rmse   = True
+
+[CLASS]
+hfss_source = "DATA/hfss/CLASS/hfss.nc"
+hfls_source = "DATA/hfls/CLASS/hfls.nc"
 weight      = 9
 skip_rmse   = True
 
@@ -274,20 +280,24 @@ weight         = 5
 mass_weighting = True
 
 [FLUXNET2015]
-source   = "DATA/le/FLUXNET2015/hfls.nc"
+source   = "DATA/hfls/FLUXNET2015/hfls.nc"
 weight   = 3
 
 [FLUXCOM]
-source   = "DATA/le/FLUXCOM/le.nc"
+source   = "DATA/hfls/FLUXCOM/le.nc"
 land     = True
 weight   = 9
 skip_iav = True
 
 [DOLCE]
-source   = "DATA/et/DOLCE/DOLCE.nc"
+source   = "DATA/evspsbl/DOLCE/DOLCE.nc"
 weight   = 15
 land     = True
 
+[CLASS]
+source         = "DATA/hfls/CLASS/hfls.nc"
+weight         = 15
+
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 [h2: Runoff]
@@ -298,11 +308,17 @@ mass_weighting = True
 
 [Dai]
 ctype          = "ConfRunoff"
-source         = "DATA/runoff/Dai/runoff.nc"
+source         = "DATA/mrro/Dai/runoff.nc"
 weight         = 15
 
 [LORA]
-source         = "DATA/runoff/LORA/LORA.nc"
+source         = "DATA/mrro/LORA/LORA.nc"
+table_unit     = "mm d-1"
+plot_unit      = "mm d-1"
+weight         = 15
+
+[CLASS]
+source         = "DATA/mrro/CLASS/mrro.nc"
 table_unit     = "mm d-1"
 plot_unit      = "mm d-1"
 weight         = 15
@@ -316,14 +332,18 @@ weight         = 2
 mass_weighting = True
 
 [FLUXNET2015]
-source   = "DATA/sh/FLUXNET2015/hfss.nc"
+source   = "DATA/hfss/FLUXNET2015/hfss.nc"
 weight   = 9
 
 [FLUXCOM]
-source   = "DATA/sh/FLUXCOM/sh.nc"
+source   = "DATA/hfss/FLUXCOM/sh.nc"
 weight   = 15
 skip_iav = True
 
+[CLASS]
+source         = "DATA/hfss/CLASS/hfss.nc"
+weight         = 15
+
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 [h2: Terrestrial Water Storage Anomaly]
@@ -343,11 +363,21 @@ weight     = 25
 [h2: Permafrost]
 variable = "tsl"
 
-[NSIDC]
+[Brown2002]
 ctype    = "ConfPermafrost"
-source   = "DATA/permafrost/NSIDC/NSIDC_0.5x0.5.nc"
-y0       = 1970.
-yf       = 2000.
+source   = "DATA/permafrost/Brown2002/Brown2002.nc"
+y0       = 1985.
+yf       = 2005.
+Teps     = 273.15
+dmax     = 3.5
+
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+[Obu2018]
+ctype    = "ConfPermafrost"
+source   = "DATA/permafrost/Obu2018/Obu2018.nc"
+y0       = 2000.
+yf       = 2016.
 Teps     = 273.15
 dmax     = 3.5
 
@@ -363,8 +393,8 @@ variable = "albedo"
 weight   = 1
 ctype    = "ConfAlbedo"
 
-[CERESed4.1]
-source   = "DATA/albedo/CERESed4.1/albedo.nc"
+[CERESed4.2]
+source   = "DATA/albedo/CERESed4.2/albedo.nc"
 weight   = 20
 
 [GEWEX.SRB]
@@ -377,8 +407,8 @@ weight   = 20
 variable = "rsus"
 weight   = 1
 
-[CERESed4.1]
-source   = "DATA/rsus/CERESed4.1/rsus.nc"
+[CERESed4.2]
+source   = "DATA/rsus/CERESed4.2/rsus.nc"
 weight   = 15
 
 [FLUXNET2015]
@@ -400,8 +430,8 @@ variable = "rsns"
 derived  = "rsds-rsus"
 weight   = 1
 
-[CERESed4.1]
-source   = "DATA/rsns/CERESed4.1/rsns.nc"
+[CERESed4.2]
+source   = "DATA/rsns/CERESed4.2/rsns.nc"
 weight   = 15
 
 [FLUXNET2015]
@@ -422,8 +452,8 @@ weight   = 12
 variable = "rlus"
 weight   = 1
 
-[CERESed4.1]
-source   = "DATA/rlus/CERESed4.1/rlus.nc"
+[CERESed4.2]
+source   = "DATA/rlus/CERESed4.2/rlus.nc"
 weight   = 15
 
 [FLUXNET2015]
@@ -445,8 +475,8 @@ variable = "rlns"
 derived  = "rlds-rlus"
 weight   = 1
 
-[CERESed4.1]
-source   = "DATA/rlns/CERESed4.1/rlns.nc"
+[CERESed4.2]
+source   = "DATA/rlns/CERESed4.2/rlns.nc"
 weight   = 15
 
 [FLUXNET2015]
@@ -468,8 +498,8 @@ variable = "rns"
 derived  = "rlds-rlus+rsds-rsus"
 weight = 2
 
-[CERESed4.1]
-source   = "DATA/rns/CERESed4.1/rns.nc"
+[CERESed4.2]
+source   = "DATA/rns/CERESed4.2/rns.nc"
 weight   = 15
 
 [FLUXNET2015]
@@ -484,6 +514,10 @@ weight   = 15
 source   = "DATA/rns/WRMC.BSRN/rns.nc"
 weight   = 12
 
+[CLASS]
+source   = "DATA/rns/CLASS/rns.nc"
+weight   = 15
+
 ###########################################################################
 
 [h1: Forcings]
@@ -573,6 +607,14 @@ table_unit = "mm d-1"
 plot_unit  = "mm d-1"
 space_mean = True
 
+[CLASS]
+source         = "DATA/pr/CLASS/pr.nc"
+land           = True
+weight         = 15
+table_unit     = "mm d-1"
+plot_unit      = "mm d-1"
+space_mean     = True
+
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 [h2: Surface Relative Humidity]
@@ -596,8 +638,8 @@ weight     = 10
 variable = "rsds"
 weight   = 2
 
-[CERESed4.1]
-source   = "DATA/rsds/CERESed4.1/rsds.nc"
+[CERESed4.2]
+source   = "DATA/rsds/CERESed4.2/rsds.nc"
 weight   = 15
 
 [FLUXNET2015]
@@ -618,8 +660,8 @@ weight   = 12
 variable = "rlds"
 weight   = 1
 
-[CERESed4.1]
-source   = "DATA/rlds/CERESed4.1/rlds.nc"
+[CERESed4.2]
+source   = "DATA/rlds/CERESed4.2/rlds.nc"
 weight   = 15
 
 [FLUXNET2015]