Update gsl/develop from develop 2021/05/31

.github/workflows/build_test.yml

@@ -111,17 +111,10 @@ jobs:
         sudo docker rmi $(sudo docker image ls | grep -E -m1 '<none>' | awk '{ print $3 }')
         sudo docker rmi $(sudo docker image ls | awk '/ubuntu-hpc/ { print $3 }')
 
-    - name: Prepare artifacts
-      run: |
-        cd tests/ci
-        sudo docker save ${{ needs.setup.outputs.img }} \
-          | gzip >${{ needs.setup.outputs.img }}.tar.gz
-        tar cvjf artifact.tar.bz2 ${{ needs.setup.outputs.img }}.tar.gz ci.sh ci.test
-
     - uses: actions/upload-artifact@v2
       with:
-        name: ${{ matrix.bld_set }}.artifact.tar.bz2
-        path: tests/ci/artifact.tar.bz2
+        name: ${{ matrix.bld_set }}.artifact
+        path: ~/fv3.tar.gz
 
 
   wait:
@@ -162,24 +155,24 @@ jobs:
     steps:
     - name: Clean up in case of left-over files
       run: |
-        rm -f artifact.tar.bz2 ${{ needs.setup.outputs.img }}.tar.gz
+        rm -rf ${{ github.workspace }} && mkdir -p ${{ github.workspace }}
         docker ps -a --filter "name=my-container" | grep my-container >/dev/null 2>&1 \
           && docker rm my-container >/dev/null 2>&1 && d=$? || d=$?
-        docker image ls | grep ${{ needs.setup.outputs.img }} >/dev/null 2>&1 \
-          && docker rmi ${{ needs.setup.outputs.img }} >/dev/null 2>&1 && d=$? || d=$?
 
-    - uses: actions/download-artifact@v2
+    - uses: actions/checkout@v2
       with:
-        name: ${{ matrix.artifact }}.artifact.tar.bz2
+        submodules: recursive
 
-    - name: Prepare artifacts
-      run: |
-        tar xvjf artifact.tar.bz2 && rm -f artifact.tar.bz2
-        docker load --input ${{ needs.setup.outputs.img }}.tar.gz \
-          && rm -f ${{ needs.setup.outputs.img }}.tar.gz
+    - uses: actions/download-artifact@v2
+      with:
+        name: ${{ matrix.artifact }}.artifact
+        path: ${{ github.workspace}}/tests
 
     - name: Run utest
-      run: ./ci.sh -n ${{ matrix.name }} -r ${{ matrix.case }}
+      run: |
+        cd ${{ github.workspace }}/tests && tar -xvzf fv3.tar.gz && rm -f fv3.tar.gz
+        cd ${{ github.workspace }}/tests/ci
+        ./ci.sh -n ${{ matrix.name }} -r ${{ matrix.case }}
 
     - uses: actions/upload-artifact@v2
       if: ${{ always() }}
@@ -190,8 +183,5 @@ jobs:
     - name: Clean up
       if: ${{ always() }}
       run: |
-        rm -f ci.sh ci.test
-        docker stop my-container && docker rm  my-container \
-          && docker rmi ${{ needs.setup.outputs.img }}:latest
+        docker stop my-container && docker rm my-container
         docker volume rm DataVolume
-        rm -f memory_stat

.gitmodules

@@ -37,4 +37,4 @@
 [submodule "CDEPS"]
   path = CDEPS-interface/CDEPS
   url = https://github.com/NOAA-EMC/CDEPS
-  branch = emc/develop
+  branch = develop

CMakeLists.txt

@@ -16,7 +16,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeModules/Modules)
 ###############################################################################
 
 # Valid applications and choices
-list(APPEND VALID_APPS ATM ATMW S2S S2SW DATM DATM_NEMS)
+list(APPEND VALID_APPS ATM ATMW S2S S2SW NG-GODAS NG-GODAS-NEMSDATM)
 set(APP NONE CACHE BOOL "Application Name")
 if(NOT (APP IN_LIST VALID_APPS))
   message(FATAL_ERROR "${APP} is not a valid application.\nValid Applications are: ${VALID_APPS}")

cmake/Intel.cmake

@@ -7,7 +7,7 @@ endif()
 
 if(DEBUG)
     add_definitions(-DDEBUG)
-    set(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} -O0 -check -check noarg_temp_created -check nopointer -warn -warn noerrors -fp-stack-check -fstack-protector-all -fpe0 -debug -ftrapuv -no-prec-div -no-prec-sqrt")
+    set(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} -O0 -check -check noarg_temp_created -check nopointer -warn -warn noerrors -fp-stack-check -fstack-protector-all -fpe0 -debug -ftrapuv")
     if(DEBUG_LINKMPI)
       if(OPENMP)
         set(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} -link_mpi=dbg_mt")
@@ -21,7 +21,11 @@ elseif(REPRO)
     set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -O2 -debug minimal -fp-model consistent -qoverride-limits")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -debug minimal")
 else()
-    set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -O2 -debug minimal -fp-model source -qoverride-limits -qopt-prefetch=3 -no-prec-div -no-prec-sqrt")
+    if(32BIT)
+      set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -O2 -debug minimal -fp-model source -qoverride-limits -qopt-prefetch=3")
+    else()
+      set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -O2 -debug minimal -fp-model source -qoverride-limits -qopt-prefetch=3 -no-prec-div -no-prec-sqrt")
+    endif()
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -debug minimal")
     set(FAST "-fast-transcendentals")
     if(AVX2)

cmake/configure_apps.cmake

@@ -25,15 +25,15 @@ if(APP MATCHES "^(ATM|ATMW)$")
   endif()
 endif()
 
-if(APP MATCHES "^(DATM|DATM_NEMS)$")
+if(APP MATCHES "^(NG-GODAS|NG-GODAS-NEMSDATM)$")
   set(CMEPS      ON  CACHE BOOL "Enable CMEPS"               FORCE)
   set(FMS        ON  CACHE BOOL "Enable FMS"                 FORCE)
   set(MOM6       ON  CACHE BOOL "Enable MOM6"                FORCE)
   set(CICE6      ON  CACHE BOOL "Enable CICE6"               FORCE)
-  if(APP MATCHES "DATM_NEMS")
+  if(APP MATCHES "NG-GODAS-NEMSDATM")
     set(NEMSdatm ON  CACHE BOOL "Enable NEMS DataAtm"        FORCE)
     message("Configuring UFS app in (NEMS) Data Atmosphere mode")
-  elseif(APP MATCHES "DATM")
+  elseif(APP MATCHES "NG-GODAS")
     set(CDEPS    ON  CACHE BOOL "Enable CDEPS"               FORCE)
     message("Configuring UFS app in (CDEPS) Data Atmosphere mode")
   endif()