Merge pull request #542 from GEOS-ESM/develop

Sync develop into main
GEOS-ESM · Feb 14, 2022 · 194bd0a · 194bd0a
2 parents 8ca407b + 699513e
commit 194bd0a
Show file tree

Hide file tree

Showing 78 changed files with 4,583 additions and 19,492 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -46,6 +46,14 @@ commands:
           name: "Versions, etc."
           command: mpirun --version && << parameters.compiler >> --version && echo $BASEDIR && pwd && ls && echo "$(nproc)"
 
+  compress_artifacts:
+    description: "Compress artifacts"
+    steps:
+      - run:
+          name: "Compress artifacts"
+          command: |
+            gzip -9 /logfiles/*
+
   checkout_fixture:
     description: "Checkout fixture"
     parameters:
@@ -157,5 +165,6 @@ jobs:
           compiler: << parameters.compiler >>
       - buildinstall:
           repo: GEOSgcm
+      - compress_artifacts
       - store_artifacts:
           path: /logfiles
diff --git a/...agcm_GridComp/GEOSphysics_GridComp/GEOSradiation_GridComp/GEOS_RadiationShared/.gitignore b/...agcm_GridComp/GEOSphysics_GridComp/GEOSradiation_GridComp/GEOS_RadiationShared/.gitignore
@@ -0,0 +1,3 @@
+/@RRTMGP
+/RRTMGP
+/RRTMGP@
diff --git a/..._GridComp/GEOSphysics_GridComp/GEOSradiation_GridComp/GEOS_RadiationShared/CMakeLists.txt b/..._GridComp/GEOSphysics_GridComp/GEOSradiation_GridComp/GEOS_RadiationShared/CMakeLists.txt
@@ -7,7 +7,10 @@ set (srcs
   cloud_subcol_gen.F90
   )
 
+esma_add_subdirectories(
+  RRTMGP_cmake
+  )
+
 esma_add_library (${this}
   SRCS ${srcs}
-  SUBDIRS RRTMGP
-  DEPENDENCIES GEOS_Shared MAPL)
+  DEPENDENCIES GEOS_Shared MAPL RRTMGP)
diff --git a/...mp/GEOSphysics_GridComp/GEOSradiation_GridComp/GEOS_RadiationShared/RRTMGP/CMakeLists.txt b/...mp/GEOSphysics_GridComp/GEOSradiation_GridComp/GEOS_RadiationShared/RRTMGP/CMakeLists.txt
diff --git a/..._GridComp/GEOSphysics_GridComp/GEOSradiation_GridComp/GEOS_RadiationShared/RRTMGP/LICENSE b/..._GridComp/GEOSphysics_GridComp/GEOSradiation_GridComp/GEOS_RadiationShared/RRTMGP/LICENSE
diff --git a/...OSphysics_GridComp/GEOSradiation_GridComp/GEOS_RadiationShared/RRTMGP/README.md b/...OSphysics_GridComp/GEOSradiation_GridComp/GEOS_RadiationShared/RRTMGP/README.md
diff --git a/...EOSradiation_GridComp/GEOS_RadiationShared/RRTMGP/examples/mo_load_cloud_coefficients.F90 b/...EOSradiation_GridComp/GEOS_RadiationShared/RRTMGP/examples/mo_load_cloud_coefficients.F90