Skip to content

Choler gcc models #40

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

Open
sdtaylor wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Choler gcc models #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ae9e07
add Gcc capable Choler models
sdtaylor Jul 14, 2020
e03c3bb
default Vmax to 0.99
sdtaylor Jul 14, 2020
e043c06
Merge branch 'master' of github.com:sdtaylor/GrasslandModels into cho…
sdtaylor Feb 5, 2021
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
11 changes: 8 additions & 3 deletions GrasslandModels/models/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from .phenograss import PhenoGrass, PhenoGrassNDVI
from .choler2011 import CholerPR1, CholerPR2, CholerPR3
from .choler2011_modified import CholerMPR2, CholerMPR3
from .choler2011 import CholerPR1, CholerPR2, CholerPR3, CholerPR1Gcc, CholerPR2Gcc, CholerPR3Gcc
from .choler2011_modified import CholerMPR2, CholerMPR3, CholerMPR2Gcc, CholerMPR3Gcc
from .choler2010 import CholerM1A, CholerM1B, CholerM2A, CholerM2B
from .naive import Naive, Naive2, NaiveMAPCorrected, Naive2MAPCorrected

Expand All @@ -18,5 +18,10 @@
'Naive',
'Naive2',
'NaiveMAPCorrected',
'Naive2MAPCorrected'
'Naive2MAPCorrected',
'CholerPR1Gcc',
'CholerPR2Gcc',
'CholerPR3Gcc',
'CholerMPR2Gcc',
'CholerMPR3Gcc',
]
4 changes: 2 additions & 2 deletions GrasslandModels/models/choler2010.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def _apply_model_numpy(self,

# Contraints on vegetation.
Vmin = 0.001, # Needs to be small non-zero value
Vmax = 1., # 100% cause GCC is scaled 0-1
Vmax = 0.99, # 100% cause GCC is scaled 0-1
# Note in the original Choler 2010 paper, Vmax is a site
# specific value set to the maximum value observed at a site.
# This is not feasable for extrapolation though.
Expand Down Expand Up @@ -177,7 +177,7 @@ def _apply_model_numpy(self,

# Contraints on vegetation.
Vmin = 0.001, # Needs to be small non-zero value
Vmax = 1., # 100% cause GCC is scaled 0-1
Vmax = 0.99, # 100% cause GCC is scaled 0-1
# Note in the original Choler 2010 paper, Vmax is a site
# specific value set to the maximum value observed at a site.
# This is not feasable for extrapolation though.
Expand Down
Loading