Merge pull request #1239 from glemieux/tool-landuse-submodule

Add external land use data tool as a submodule to fates
NGEET · Oct 29, 2024 · 468ebca · 468ebca
2 parents 230fd17 + 464a7ec
commit 468ebca
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 523 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,13 @@
+# This is a git submodule file to include additional submodules when FATES is checkout out.
+#
+# It includes optional additional support for
+# git-fleximod (https://github.com/ESMCI/git-fleximod)
+# that will be used when git-fleximod is used to check it out (i.e. for CESM)
+#
+[submodule "tools/landusedata"]
+	path = tools/landusedata
+	url = https://github.com/NGEET/tools-fates-landusedata
+	fxtag = v0.1.1
+	fxrequired = AlwaysRequired
+	# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
+	fxDONOTUSEurl = https://github.com/NGEET/tools-fates-landusedata
diff --git a/tools/landusedata b/tools/landusedata
diff --git a/tools/luh2/README.md b/tools/luh2/README.md
diff --git a/tools/luh2/conda-luh2.yml b/tools/luh2/conda-luh2.yml
diff --git a/tools/luh2/luh2.py b/tools/luh2/luh2.py
diff --git a/tools/luh2/luh2.sh b/tools/luh2/luh2.sh