Merge pull request #49 from dlr-pa/feature/default-co2-rf-method

Feature/default co2 rf method
dlr-pa · Nov 25, 2024 · fd5e8b0 · fd5e8b0
2 parents 804b31c + 470878c
commit fd5e8b0
Show file tree

Hide file tree

Showing 7 changed files with 324 additions and 91 deletions.
diff --git a/docs/source/openairclim.rst b/docs/source/openairclim.rst
@@ -20,6 +20,14 @@ openairclim.calc\_co2 module
    :undoc-members:
    :show-inheritance:
 
+openairclim.calc\_cont module
+----------------------------
+
+.. automodule:: openairclim.calc_cont
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 openairclim.calc\_dt module
 ---------------------------
 

diff --git a/environment_dev.yaml b/environment_dev.yaml
@@ -35,4 +35,5 @@ dependencies:
   - isort
   - scipy
   - ipympl
-  - openpyxl
+  - openpyxl
+  - deepmerge
diff --git a/environment_minimal.yaml b/environment_minimal.yaml
@@ -12,4 +12,5 @@ dependencies:
   - xarray
   - netcdf4
   - scipy
+  - deepmerge
 
diff --git a/example/example.toml b/example/example.toml
@@ -77,10 +77,8 @@ N2O.scenario = "SSP2-4.5"
 dir = "../repository/"
 CO2.response_grid = "0D"
 CO2.conc.method = "Sausen&Schumann"
-#CO2.rf.method = "IPCC_2001_1"       # IPCC 2001, Table 6.2 first row
-#CO2.rf.method = "IPCC_2001_2"      # IPCC 2001, Table 6.2 second row
-#CO2.rf.method = "IPCC_2001_3"      # IPCC 2001, Table 6.2 third row
-CO2.rf.method = "Etminan_2016"      # Etminan et al. 2016
+# RF method based on Etminan et al. 2016 is used by default.
+#CO2.rf.method = "Etminan_2016"
 
 H2O.response_grid = "2D"
 H2O.rf.file = "resp_RF.nc"