Update regrid.pl for Ocean Model Questions

.circleci/config.yml

@@ -32,7 +32,7 @@ workflows:
           matrix:
             parameters:
               compiler: [gfortran, ifort]
-          context: 
+          context:
             - docker-hub-creds
 
 commands:
@@ -42,54 +42,65 @@ commands:
       compiler:
         type: string
     steps:
-      - run: mpirun --version && << parameters.compiler >> --version && echo $BASEDIR && pwd && ls && echo "$(nproc)"
+      - run:
+          name: "Versions, etc."
+          command: |
+            mpirun --version && << parameters.compiler >> --version && echo $BASEDIR && pwd && ls && echo "$(nproc)"
 
   checkout_fixture:
     description: "Checkout fixture"
     parameters:
       repo:
         type: string
     steps:
-      - run: |
-          cd ${CIRCLE_WORKING_DIRECTORY}
-          git clone https://github.com/GEOS-ESM/<< parameters.repo >>.git
+      - run:
+          name: "Checkout fixture"
+          command: |
+            cd ${CIRCLE_WORKING_DIRECTORY}
+            git clone https://github.com/GEOS-ESM/<< parameters.repo >>.git
 
   mepoclone:
     description: "Mepo clone external repos"
     parameters:
       repo:
         type: string
     steps:
-      - run: |
-          cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>
-          mepo clone
-          mepo status
+      - run:
+          name: "Mepo clone external repos"
+          command: |
+            cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>
+            mepo clone
+            mepo status
 
   mepodevelop:
     description: "Mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared"
     parameters:
       repo:
         type: string
     steps:
-      - run: |
-          cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>
-          mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared
-          mepo status
+      - run:
+          name: "Mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared"
+          command: |
+            cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>
+            mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared
+            mepo status
 
   checkout_feature_branch:
     description: "Mepo checkout-if-exists feature branch"
     parameters:
       repo:
         type: string
     steps:
-      - run: |
-          cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>
-          echo "${CIRCLE_BRANCH}"
-          if [ "${CIRCLE_BRANCH}" != "develop" ] && [ "${CIRCLE_BRANCH}" != "main" ]
-          then
-              mepo checkout-if-exists ${CIRCLE_BRANCH}
-          fi
-          mepo status
+      - run:
+          name: "Mepo checkout-if-exists feature branch"
+          command: |
+            cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>
+            echo "${CIRCLE_BRANCH}"
+            if [ "${CIRCLE_BRANCH}" != "develop" ] && [ "${CIRCLE_BRANCH}" != "main" ]
+            then
+                mepo checkout-if-exists ${CIRCLE_BRANCH}
+            fi
+            mepo status
 
   cmake:
     description: "Run CMake"
@@ -99,23 +110,27 @@ commands:
       compiler:
         type: string
     steps:
-      - run: |
-          mkdir -p /logfiles
-          cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>
-          mkdir -p ${CIRCLE_WORKING_DIRECTORY}/workspace/build-<< parameters.repo >>
-          cd ${CIRCLE_WORKING_DIRECTORY}/workspace/build-<< parameters.repo >>
-          cmake ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >> -DBASEDIR=$BASEDIR/Linux -DCMAKE_Fortran_COMPILER=<< parameters.compiler >> -DCMAKE_BUILD_TYPE=Debug -DUSE_F2PY=OFF -DMPIEXEC_PREFLAGS=${MPIEXEC_PREFLAGS} -DCMAKE_INSTALL_PREFIX=${CIRCLE_WORKING_DIRECTORY}/workspace/install-<< parameters.repo >> |& tee /logfiles/cmake.log
+      - run:
+          name: "Run CMake"
+          command: |
+            mkdir -p /logfiles
+            cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>
+            mkdir -p ${CIRCLE_WORKING_DIRECTORY}/workspace/build-<< parameters.repo >>
+            cd ${CIRCLE_WORKING_DIRECTORY}/workspace/build-<< parameters.repo >>
+            cmake ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >> -DBASEDIR=$BASEDIR/Linux -DCMAKE_Fortran_COMPILER=<< parameters.compiler >> -DCMAKE_BUILD_TYPE=Debug -DUSE_F2PY=OFF -DMPIEXEC_PREFLAGS=${MPIEXEC_PREFLAGS} -DCMAKE_INSTALL_PREFIX=${CIRCLE_WORKING_DIRECTORY}/workspace/install-<< parameters.repo >> |& tee /logfiles/cmake.log
 
   buildinstall:
     description: "Build and install"
     parameters:
       repo:
         type: string
     steps:
-      - run: |
-          cd ${CIRCLE_WORKING_DIRECTORY}/workspace/build-<< parameters.repo >>
-          make -j"$(nproc)" install |& tee /logfiles/make.log
-          #MEDIUM# make -j4 install |& tee /logfiles/make.log
+      - run:
+          name: "Build and install"
+          command: |
+            cd ${CIRCLE_WORKING_DIRECTORY}/workspace/build-<< parameters.repo >>
+            make -j"$(nproc)" install |& tee /logfiles/make.log
+            #MEDIUM# make -j4 install |& tee /logfiles/make.log
 
 jobs:
   build-GEOSgcm:

CHANGELOG.md

@@ -15,6 +15,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Update `regrid.pl`
+  - Add options for MOM5 and MOM6 tile files
+  - Add ability to use git tags for "tagin" and "tagout"
+
 ### Removed
 
 ## [1.4.11] - 2021-11-03

GEOS_Util/post/CMakeLists.txt

@@ -38,7 +38,12 @@ set_target_properties(stats.x PROPERTIES Fortran_MODULE_DIRECTORY ${include_${th
 
 ecbuild_add_executable (TARGET convert_aerosols.x SOURCES convert_aerosols.F)
 
-file(GLOB perlscripts CONFIGURE_DEPENDS *.pl)
+set (perlscripts
+  ecmwf2geos.pl
+  g5fcst_stats.pl
+  ncep2geos.pl
+  regrid.pl
+  )
 install(
    PROGRAMS ${perlscripts} ec2grd.csh
    DESTINATION bin)