Merge pull request #25 from GEOS-ESM/develop

Merge develop into main

.circleci/config.yml

@@ -18,15 +18,15 @@ workflows:
   version: 2.1
   build-and-test:
     jobs:
-      - build-GOCART:
+      - build-GOCART2G:
           context:
             - docker-hub-creds
       - build-GEOSgcm:
           context:
             - docker-hub-creds
 
 jobs:
-  build-GOCART:
+  build-GOCART2G:
     executor: gcc-build-env
     working_directory: /root/project
     steps:
@@ -49,11 +49,11 @@ jobs:
             cd build
             cmake .. -DBASEDIR=$BASEDIR/Linux -DCMAKE_Fortran_COMPILER=gfortran -DCMAKE_BUILD_TYPE=Debug -DUSE_F2PY=OFF -DMPIEXEC_PREFLAGS='--oversubscribe'
       - run:
-          name: "Build and install"
+          name: "Build GOCART2G_GridComp"
           command: |
             cd ${CIRCLE_WORKING_DIRECTORY}/GOCART/build
             #XLARGE# make -j"$(nproc)" install
-            make -j4 install
+            make -j4 GOCART2G_GridComp
 
   build-GEOSgcm:
     executor: gcc-build-env

.github/CODEOWNERS

@@ -0,0 +1,23 @@
+# This is a comment.
+# Each line is a file pattern followed by one or more owners.
+# Order is important; the last matching pattern takes the most
+# precedence.
+
+# Everything in GEOSgcm should be owned by the GCM Gatekeepers
+* @GEOS-ESM/aerosol-team
+
+# The CMake Team should know/approve these
+/.github/    @GEOS-ESM/cmake-team
+/.circleci/  @GEOS-ESM/cmake-team
+/.codebuild/ @GEOS-ESM/cmake-team
+
+# NOAA Extras are Tom and William for now
+/CCPP/                  @tclune @WilliamJamieson
+/ESMF/Aerosol_GridComp/ @tclune @WilliamJamieson
+/ESMF/NUOPC/            @tclune @WilliamJamieson
+
+# The GEOS CMake Team should be notified about and approve config changes
+/config/       @GEOS-ESM/cmake-team
+
+# The GEOS CMake Team is the CODEOWNER for the CMakeLists.txt files in this repository
+CMakeLists.txt @GEOS-ESM/cmake-team

.gitignore

@@ -1,13 +1,6 @@
 /cmake@/
-/ESMF/Shared/MAPL@/
-/cmake-build-debug/
-/build/
 /.mepo/
-/.idea/
+/ESMF/Shared/MAPL@/
 /ESMF/Shared/GMAO_Shared@/
 /ESMF/Shared/NCEP_Shared@/
 /ESMF/HEMCO_GridComp@/
-/install/
-tags
-
-.DS_STORE

CHANGELOG.md

@@ -8,7 +8,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ### Changed
+
+- Switched StrTemplate from using the one provided by `GMAO_MPEU` to one provided by `MAPL`
+
 ### Fixed
+
 - Bug with how some optional `rc` arguments where handled in the Process Library.
+
 ### Removed
 ### Added
+
+- CircleCI configuration added

CMakeLists.txt

@@ -4,7 +4,7 @@ cmake_policy (SET CMP0054 NEW)
 
 project (
         GOCART
-        VERSION 0.9.1
+        VERSION 1.0.0
         LANGUAGES Fortran CXX C)  # Note - CXX is required for ESMF
 
 if ("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}")
@@ -48,3 +48,15 @@ add_subdirectory (ESMF)
 add_subdirectory (Process_Library)
 
 ecbuild_install_project (NAME GOCART)
+
+# https://www.scivision.dev/cmake-auto-gitignore-build-dir/
+# --- auto-ignore build directory
+if(NOT EXISTS ${PROJECT_BINARY_DIR}/.gitignore)
+  file(WRITE ${PROJECT_BINARY_DIR}/.gitignore "*")
+endif()
+
+# Piggyback that file into install
+install(
+   FILES ${PROJECT_BINARY_DIR}/.gitignore
+   DESTINATION ${CMAKE_INSTALL_PREFIX}
+   )

ESMF/Aerosol_GridComp/AeroCinderella_GridComp/Cinderella/NOAA_GOCARTtracers.F90

@@ -17,8 +17,9 @@ module NOAA_GOCARTtracers_mod
    character(*), parameter :: rc_label     = 'GOCART_tracer_config:'
    character(*), parameter :: bundle_label = 'inst_mass_tracers'
 
-   type, extends(StringVector) :: GOCARTtracers
-      type(TracerMap) :: tracer_map
+   type :: GOCARTtracers
+      type(StringVector) :: GOCART_tracers
+      type(TracerMap)    :: tracer_map
    contains
       procedure, nopass :: read_filename_from_config
       procedure :: parse_yaml
@@ -70,7 +71,7 @@ subroutine parse_yaml(this, filename)
             sub_iter = sub_config%begin()
             do while(sub_iter /= sub_config%end())
                field_name = sub_iter%get()
-               call this%push_back(field_name)
+               call this%GOCART_tracers%push_back(field_name)
 
                call sub_iter%next()
             end do
@@ -104,11 +105,11 @@ subroutine create_tracer_bundle(this, field, bundle, rc)
       type(StringVectorIterator)    :: iter
       integer                       :: status, i
 
-      allocate(tracers(this%size()))
+      allocate(tracers(this%GOCART_tracers%size()))
 
       i    = 1
-      iter = this%begin()
-      do while(iter /= this%end())
+      iter = this%GOCART_tracers%begin()
+      do while(iter /= this%GOCART_tracers%end())
          call this%tracer_map%create_tracer(field, iter%get(), tracers(i), __RC__)
 
          i = i + 1
@@ -119,4 +120,4 @@ subroutine create_tracer_bundle(this, field, bundle, rc)
 
       _RETURN(_SUCCESS)
    end subroutine create_tracer_bundle
-end module NOAA_GOCARTtracers_mod
+end module NOAA_GOCARTtracers_mod