Merge branch 'main' into feature/update_docn

ESCOMP · May 14, 2024 · 0f7e6c6 · 0f7e6c6
2 parents a8baf66 + 7476950
commit 0f7e6c6
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -31,9 +31,5 @@
 *.out
 *.app
 
-# Externals
-fox
-share/genf90
-
 # ignore pycache
 __pycache__
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,16 @@
+# This is a git-fleximod adapted .gitmodules file. Any field with a name starting in fx is a git-fleximod
+# specific field. See https://github.com/ESMCI/git-fleximod for details.
+
+[submodule "fox"]
+path = fox
+url = https://github.com/ESMCI/fox.git
+fxtag = 4.1.2.1
+fxrequired = AlwaysRequired
+fxDONOTUSEurl = https://github.com/ESMCI/fox.git
+
+[submodule "genf90"]
+path = share/genf90
+url = https://github.com/PARALLELIO/genf90
+fxtag = 4816965
+fxrequired = AlwaysRequired
+fxDONOTUSEurl = https://github.com/PARALLELIO/genf90
diff --git a/fox b/fox
diff --git a/share/genf90 b/share/genf90