Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/default co2 rf method #49

Merged
merged 5 commits into from
Nov 25, 2024
Merged

Feature/default co2 rf method #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1fec83e
Update read_config: default config
stefan-voelk Nov 20, 2024
ec8223d
Update read_config: default config
stefan-voelk Nov 20, 2024
d2371b0
Merge branch 'feature/default-co2-rf-method' of https://github.com/dl…
stefan-voelk Nov 21, 2024
a6b2564
Update read_config_test
stefan-voelk Nov 21, 2024
470878c
Updates after review for merge request (issue#49)
stefan-voelk Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions docs/source/openairclim.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
---------------------------

Expand Down
3 changes: 2 additions & 1 deletion environment_dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,5 @@ dependencies:
- isort
- scipy
- ipympl
- openpyxl
- openpyxl
- deepmerge
1 change: 1 addition & 0 deletions environment_minimal.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,5 @@ dependencies:
- xarray
- netcdf4
- scipy
- deepmerge

6 changes: 2 additions & 4 deletions example/example.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading
Loading