Merge branch 'develop' into feature/mchattop/prepbykx_update

GEOS-ESM · Sep 24, 2024 · 15a76a6 · 15a76a6
2 parents 29e5cfa + b3b697d
commit 15a76a6
Show file tree

Hide file tree

Showing 72 changed files with 4 additions and 24,428 deletions.
diff --git a/GEOSaana_GridComp/GSI_GridComp/.gitignore b/GEOSaana_GridComp/GSI_GridComp/.gitignore
@@ -0,0 +1,3 @@
+/@mksi/
+/mksi/
+/mksi@/
diff --git a/GEOSaana_GridComp/GSI_GridComp/CMakeLists.txt b/GEOSaana_GridComp/GSI_GridComp/CMakeLists.txt
@@ -1,6 +1,6 @@
 #esma_set_this ()
 
-add_subdirectory(mksi)
+esma_add_subdirectory(mksi)
 add_subdirectory(etc)
 
 set (GSIGC_SRCS

diff --git a/GEOSaana_GridComp/GSI_GridComp/mksi/About../Makefile b/GEOSaana_GridComp/GSI_GridComp/mksi/About../Makefile
diff --git a/GEOSaana_GridComp/GSI_GridComp/mksi/About../README b/GEOSaana_GridComp/GSI_GridComp/mksi/About../README
-Original file line number
+Diff line change
@@ -0,0 +1,3 @@
+    /@mksi/
+    /mksi/
+    /mksi@/