Merge pull request #92 from olyson/PR1

Updates for CLM-specific issues
rubisco-sfa · Jun 24, 2024 · 016257e · 016257e
2 parents 818957f + 34301f4
commit 016257e
Show file tree

Hide file tree

Showing 8 changed files with 1,451 additions and 5 deletions.
diff --git a/bin/ilamb-fetch b/bin/ilamb-fetch
diff --git a/bin/ilamb-mean b/bin/ilamb-mean
diff --git a/bin/ilamb-run b/bin/ilamb-run
diff --git a/bin/ilamb-setup b/bin/ilamb-setup
diff --git a/src/ILAMB/ConfPermafrost.py b/src/ILAMB/ConfPermafrost.py
@@ -191,7 +191,7 @@ def stageData(self, m):
         dmax = float(self.keywords.get("dmax", 3.5))
         Teps = float(self.keywords.get("Teps", 273.15))
         tsl = m.extractTimeSeries(
-            "tsl", initial_time=(y0 - 1850) * 365, final_time=(yf - 1850) * 365
+            "tsl", alt_vars = ["TSOI"], initial_time=(y0 - 1850) * 365, final_time=(yf - 1850) * 365
         )
         tsl = tsl.trim(lat=[max(obs.lat.min(), tsl.lat.min()), 90])
 

diff --git a/src/ILAMB/ConfSoilCarbon.py b/src/ILAMB/ConfSoilCarbon.py
@@ -114,7 +114,7 @@ def confront(self, m):
         mod_soilc = (
             m.extractTimeSeries(
                 "cSoilAbove1m",
-                alt_vars=["soilc", "cSoil"],
+                alt_vars=["soilc", "cSoil", "TOTSOMC_1m"],
                 initial_time=t0,
                 final_time=tf,
             )
@@ -123,18 +123,18 @@ def confront(self, m):
         )
         mod_npp = (
             m.extractTimeSeries(
-                "npp", initial_time=t0, final_time=tf, expression="gpp-ra"
+                "npp", alt_vars=["NPP"], initial_time=t0, final_time=tf, expression="gpp-ra"
             )
             .integrateInTime(mean=True)
             .convert("kg m-2 yr-1")
         )
         mod_tas = (
-            m.extractTimeSeries("tas", initial_time=t0, final_time=tf)
+            m.extractTimeSeries("tas", alt_vars=["TSA"], initial_time=t0, final_time=tf)
             .integrateInTime(mean=True)
             .convert("degC")
         )
         mod_pr = (
-            m.extractTimeSeries("pr", initial_time=t0, final_time=tf)
+            m.extractTimeSeries("pr", initial_time=t0, final_time=tf, expression   = "RAIN+SNOW")
             .integrateInTime(mean=True)
             .convert("mm yr-1")
         )