Merge #50

50: update changes before refactor the code r=Yujie-W a=Yujie-W Co-authored-by: Yujie Wang <[email protected]> Co-authored-by: Yujie <[email protected]>
CliMA · Nov 15, 2021 · 00b1e98 · 00b1e98
2 parents b0f3a39 + c27d7cd
commit 00b1e98
Show file tree

Hide file tree

Showing 87 changed files with 3,005 additions and 1,217 deletions.
diff --git a/.github/workflows/CompatHelper.yml b/.github/workflows/CompatHelper.yml
@@ -1,15 +1,21 @@
 name: CompatHelper
 on:
   schedule:
-    - cron: 0 0 * * *
+    - cron: 0 15 * * 1
   workflow_dispatch:
 
 jobs:
   CompatHelper:
     runs-on: ubuntu-latest
     steps:
-      - name: Add CompatHelper
-        run: julia -e 'using Pkg; Pkg.add("CompatHelper");'
+      - name: Set up Actions
+        uses: actions/checkout@v1
+      - name: Set up Julia
+        uses: julia-actions/setup-julia@v1
+        with:
+          version: "1"
+      - name: Install Dependencies
+        run: julia --project=docs/ -e 'ENV["PYTHON"]=""; using Pkg; Pkg.instantiate(); Pkg.add("CompatHelper");'
       - name: Run CompatHelper
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/Julia-1.5.yml b/.github/workflows/Julia-1.5.yml
diff --git a/Artifacts.toml b/Artifacts.toml
@@ -11,13 +11,13 @@ lazy = true
     sha256 = "5073edf5b7a3713f65ba0a2ee6801323570250ce6e46faa7cd45bb84fda487c5"
     url = "https://github.com/Yujie-W/ResearchArtifacts/raw/wyujie/2020_leaf_invest/2020_leaf_invest_weather.tar.gz"
 
-[land_model_spectrum]
-git-tree-sha1 = "ad248def1185cce69f626613dd1f70333a8290a6"
+[land_model_spectrum_V1]
+git-tree-sha1 = "ea4a9eb822a62542d0cedd7a0921d620dde47af7"
 lazy = true
 
-    [[land_model_spectrum.download]]
-    sha256 = "cd260824a471900a88004818bb9ea0b77e6255213ef2a6648668659268ed494d"
-    url = "ftp://fluo.gps.caltech.edu/XYZT_CLIMA_LUT/LandModel/land_model_spectrum.tar.gz"
-    [[land_model_spectrum.download]]
-    sha256 = "cd260824a471900a88004818bb9ea0b77e6255213ef2a6648668659268ed494d"
-    url = "https://github.com/Yujie-W/ResearchArtifacts/raw/wyujie/CliMA_LUT/land_model_spectrum.tar.gz"
+    [[land_model_spectrum_V1.download]]
+    sha256 = "ee0ee97c013317d5535868db08a0929e4f5dbaef2d2003ed61485003e5302386"
+    url = "ftp://fluo.gps.caltech.edu/XYZT_CLIMA_LUT/LandModel/land_model_spectrum_V1.tar.gz"
+    [[land_model_spectrum_V1.download]]
+    sha256 = "ee0ee97c013317d5535868db08a0929e4f5dbaef2d2003ed61485003e5302386"
+    url = "https://github.com/Yujie-W/ResearchArtifacts/raw/wyujie/LandModel/land_model_spectrum_V1.tar.gz"
diff --git a/Project.toml b/Project.toml
@@ -10,6 +10,7 @@ ConstrainedRootSolvers = "7e2492bd-0955-4089-8696-9df2af57a479"
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
 DiffEqOperators = "9fdde737-9c7f-55bf-ade8-46b3f136cc48"
 DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
+HypergeometricFunctions = "34004b35-14d8-5ef3-9330-4cdb6864b03a"
 LazyArtifacts = "4af54fe1-eca0-43a8-85a7-787d91b784e3"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 MAT = "23992714-dd62-5051-b70f-ba57cb901cac"
@@ -19,22 +20,27 @@ Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 PkgUtility = "0d262f2c-28e9-492c-8e19-d7a5c4f11611"
 Polynomials = "f27b6e38-b328-58d1-80ce-0feddd5e7a45"
 QuadGK = "1fd47b50-473d-5c70-9696-f719f8f3bcdc"
+SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+UnPack = "3a884ed6-31ef-47d7-9d2a-63182c4928ed"
 WaterPhysics = "20dd5ee6-61da-454b-ac5d-c09c2977e03a"
 
 [compat]
-CLIMAParameters = "0.1"
-CSV = "0.8"
-ConstrainedRootSolvers = "0.1"
-DataFrames = "0.22"
-DiffEqOperators = "4.14"
-DocStringExtensions = "0.8"
-MAT = "0.10"
-OrdinaryDiffEq = "5.43"
-Parameters = "0.12"
-PkgUtility = "0.1.5"
-Polynomials = "1.1, 2.0"
-QuadGK = "2.4"
-WaterPhysics = "0.1"
-julia = "1.5"
+CLIMAParameters = "0.1.13"
+CSV = "0.8.5"
+ConstrainedRootSolvers = "0.1.3"
+DataFrames = "0.22.7"
+DiffEqOperators = "4.34.0"
+DocStringExtensions = "0.8.6"
+HypergeometricFunctions = "0.3.6"
+MAT = "0.10.1"
+OrdinaryDiffEq = "5.67.0"
+Parameters = "0.12.3"
+PkgUtility = "0.1.13"
+Polynomials = "2.0.18"
+QuadGK = "2.4.2"
+SpecialFunctions = "1.8.1"
+UnPack = "1.0.2"
+WaterPhysics = "0.1.3"
+julia = "1.6"
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 # CLIMA-Land
 
+Note that CliMA Land is being refactored. During this process, no new feature will be added and only bug fix is allowed. We wish to present the refactored CliMA Land in the near future, please wait for the new version v0.2.
+
 This project is supposed to be a community effort, leveraging all the work that has been done in Land Surface Modeling from various groups around the world. The ultimate goal here is to build a Soil-Plant-Atmosphere continuum (SPAC) bio-physical model that represents the state of the art and can be coupled to the Climate-Machine, i.e. Caltech's CLIMA initiative. The model will include multi-layer soil and canopy properties and models "observables" that can be used as constraint, e.g. Solar Induced Chlorophyll Fluorescence (SIF) on the leaf-level propagated through the canopy, reflectance in various bands as measured from space, soil and vegetation moisture content. A specific focus will be on water-carbon feedbacks by testing recent developments in stomatal optimization theories as well as plant hydraulics. We will try to adhere to some [coding structure](https://github.com/gbonan/CLM-ml_v0) developed by Gordan Bonan but implement parts from other programs, such as [SCOPE](https://github.com/Christiaanvandertol/SCOPE).
 
 The entire model will be written in [Julia](https://docs.julialang.org/en/v1/) (Julia: ["Looks like Python, feels like Lisp, runs like Fortran"](https://www.youtube.com/watch?v=8h8rQyEpiZA&t=)), which should make the barrier of entry lower for incoming students, PostDocs, etc). If you want to contribute, please contact us ([email protected]).
@@ -32,3 +34,48 @@ The entire model will be written in [Julia](https://docs.julialang.org/en/v1/) (
 
 [bors-img]: https://bors.tech/images/badge_small.svg
 [bors-url]: https://app.bors.tech/repositories/24777
+
+## References
+
+Please cite the following when you use the CliMA Land (v0.1)
+
+### General model description
+Y. Wang, P. Köhler, L. He, R. K. Braghiere, R. Doughty, J. Wood, C. Frankenberg. 2021.
+Testing stomatal models at the stand level in deciduous angiosperm and evergreen gymnosperm forests using CliMA Land (v0.1).
+Geoscientific Model Development. 14(11): 6741-6763.
+[DOI](https://doi.org/10.5194/gmd-14-6741-2021)
+[PDF](https://github.com/Yujie-WANG/Published-Codes-Yujie-WANG/raw/master/publications/wang2021testing.pdf)
+[SI](https://github.com/Yujie-WANG/Published-Codes-Yujie-WANG/raw/master/publications/wang2021testing-si.pdf)
+[CODE](https://github.com/Yujie-WANG/Published-Codes-Yujie-WANG)
+
+```
+@article{wang2021testing,
+    author = {Wang, Y. and K{\"o}hler, P. and He, L. and Doughty, R. and Braghiere, R. K. and Wood, J. D. and Frankenberg, C.},
+    year = {2021},
+    title = {Testing stomatal models at the stand level in deciduous angiosperm and evergreen gymnosperm forests using CliMA Land (v0.1)},
+    journal = {Geoscientific Model Development},
+    volume = {14},
+    number = {11},
+    pages = {6741--6763}
+}
+```
+
+### Clumping index implementation
+R. K. Braghiere, Y. Wang, R. Doughty, D. Souza, T. Magney, J. Widlowski, M. Longo, A. Bloom, J. Worden, P. Gentine, and C. Frankenberg. 2021.
+Accounting for canopy structure improves hyperspectral radiative transfer and sun-induced chlorophyll fluorescence representations in a new generation Earth System model.
+Remote Sensing of Environment. 261: 112497.
+[DOI](https://doi.org/10.1016/j.rse.2021.112497)
+[PDF](https://github.com/Yujie-WANG/Published-Codes-Yujie-WANG/raw/master/publications/braghiere2021accounting.pdf)
+[SI](https://github.com/Yujie-WANG/Published-Codes-Yujie-WANG/raw/master/publications/braghiere2021accounting-si.pdf)
+[CODE](https://github.com/Yujie-WANG/Published-Codes-Yujie-WANG)
+
+```
+@article{braghiere2021accounting,
+    author = {Braghiere, Renato K and Wang, Yujie and Doughty, Russell and Sousa, Daniel and Magney, Troy and Widlowski, Jean-Luc and Longo, Marcos and Bloom, A Anthony and Worden, John and Gentine, Pierre and Frankenberg, Christian},
+    year = {2021},
+    title = {Accounting for canopy structure improves hyperspectral radiative transfer and sun-induced chlorophyll fluorescence representations in a new generation Earth System model},
+    journal = {Remote Sensing of Environment},
+    volume = {261},
+    pages = {112497}
+}
+```
diff --git a/bors.toml b/bors.toml
@@ -3,8 +3,7 @@ status = [
     "docs-build",
     "macos-latest",
     "ubuntu-latest",
-    "windows-latest",
-    "version-test"
+    "windows-latest"
 ]
 delete_merged_branches = true
 timeout_sec = 86400