Merge branch 'develop' into feature/acollow/aerosolhistory

GEOS-ESM · Jun 10, 2024 · 4de0c66 · 4de0c66
2 parents e7c2c91 + c002eeb
commit 4de0c66
Show file tree

Hide file tree

Showing 14 changed files with 103 additions and 61 deletions.
diff --git a/gcm_archive.j b/gcm_archive.j
@@ -33,7 +33,10 @@ setenv SITE             @SITE
 setenv GEOSBIN          @GEOSBIN
 
 source $GEOSBIN/g5_modules
-setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH}:${BASEDIR}/${ARCH}/lib
+setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH}
+if ( $?BASEDIR ) then
+    setenv @LD_LIBRARY_PATH_CMD ${@LD_LIBRARY_PATH_CMD}:${BASEDIR}/${ARCH}/lib
+endif
 
 #######################################################################
 #                         Archive Commands

diff --git a/gcm_forecast.tmpl b/gcm_forecast.tmpl
@@ -31,8 +31,11 @@ setenv GEOSBIN          @GEOSBIN
 setenv GEOSETC          @GEOSETC
 setenv GEOSUTIL         @GEOSSRC
 
-@NATIVE_BUILD source $GEOSBIN/g5_modules
-@NATIVE_BUILD setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH}:${BASEDIR}/${ARCH}/lib:${GEOSDIR}/lib
+source $GEOSBIN/g5_modules
+setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH}:${GEOSDIR}/lib
+if ( $?BASEDIR ) then
+   setenv @LD_LIBRARY_PATH_CMD ${@LD_LIBRARY_PATH_CMD}:${BASEDIR}/${ARCH}/lib
+endif
 
 setenv RUN_CMD "@RUN_CMD"
 

diff --git a/gcm_moveplot.j b/gcm_moveplot.j
@@ -34,7 +34,10 @@ setenv GEOSBIN          @GEOSBIN
 setenv GEOSUTIL         @GEOSSRC
 
 source $GEOSBIN/g5_modules
-setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH}:${BASEDIR}/${ARCH}/lib
+setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH}
+if ( $?BASEDIR ) then
+    setenv @LD_LIBRARY_PATH_CMD ${@LD_LIBRARY_PATH_CMD}:${BASEDIR}/${ARCH}/lib
+endif
 
 #######################################################################
 #             Experiment Specific Environment Variables

diff --git a/gcm_plot.tmpl b/gcm_plot.tmpl
@@ -34,7 +34,10 @@ setenv GEOSBIN          @GEOSBIN
 setenv GEOSUTIL         @GEOSSRC
 
 source $GEOSBIN/g5_modules
-setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH}:${BASEDIR}/${ARCH}/lib
+setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH}
+if ( $?BASEDIR ) then
+    setenv @LD_LIBRARY_PATH_CMD ${@LD_LIBRARY_PATH_CMD}:${BASEDIR}/${ARCH}/lib
+endif
 
 #######################################################################
 #             Experiment Specific Environment Variables

diff --git a/gcm_post.j b/gcm_post.j
@@ -36,7 +36,10 @@ setenv GEOSUTIL         @GEOSSRC
 setenv BATCHNAME       "@POST_N"
 
 source $GEOSBIN/g5_modules
-setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH}:${BASEDIR}/${ARCH}/lib
+setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH}
+if ( $?BASEDIR ) then
+    setenv @LD_LIBRARY_PATH_CMD ${@LD_LIBRARY_PATH_CMD}:${BASEDIR}/${ARCH}/lib
+endif
 
 if( $?SLURM_NTASKS ) then
       setenv RUN_CMD "@RUN_CMD"

diff --git a/gcm_quickstat.j b/gcm_quickstat.j
@@ -29,7 +29,10 @@ setenv GEOSBIN          @GEOSBIN
 setenv GEOSUTIL         @GEOSSRC
 
 source $GEOSBIN/g5_modules
-setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH}:${BASEDIR}/${ARCH}/lib
+setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH}
+if ( $?BASEDIR ) then
+    setenv @LD_LIBRARY_PATH_CMD ${@LD_LIBRARY_PATH_CMD}:${BASEDIR}/${ARCH}/lib
+endif
 
 #######################################################################
 #                         Quickstat Commands

diff --git a/gcm_regress.j b/gcm_regress.j
@@ -90,7 +90,11 @@ setenv GEOSDIR @GEOSDIR
 setenv GEOSBIN @GEOSBIN
 
 source $GEOSBIN/g5_modules
-setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH}:${BASEDIR}/${ARCH}/lib:${GEOSDIR}/lib
+setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH}:${GEOSDIR}/lib
+# We only add BASEDIR to the @LD_LIBRARY_PATH_CMD if BASEDIR is defined (i.e., not running with Spack)
+if ( $?BASEDIR ) then
+    setenv @LD_LIBRARY_PATH_CMD ${@LD_LIBRARY_PATH_CMD}:${BASEDIR}/${ARCH}/lib
+endif
 
 setenv RUN_CMD "@RUN_CMD"
 

diff --git a/gcm_run.j b/gcm_run.j
@@ -33,7 +33,11 @@ setenv GEOSETC          @GEOSETC
 setenv GEOSUTIL         @GEOSSRC
 
 source $GEOSBIN/g5_modules
-setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH}:${BASEDIR}/${ARCH}/lib:${GEOSDIR}/lib
+setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH}:${GEOSDIR}/lib
+# We only add BASEDIR to the @LD_LIBRARY_PATH_CMD if BASEDIR is defined (i.e., not running with Spack)
+if ( $?BASEDIR ) then
+    setenv @LD_LIBRARY_PATH_CMD ${@LD_LIBRARY_PATH_CMD}:${BASEDIR}/${ARCH}/lib
+endif
 
 setenv RUN_CMD "@RUN_CMD"
 

diff --git a/gcm_run_benchmark.j b/gcm_run_benchmark.j
@@ -33,7 +33,11 @@ setenv GEOSETC          @GEOSETC
 setenv GEOSUTIL         @GEOSSRC
 
 source $GEOSBIN/g5_modules
-setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH}:${BASEDIR}/${ARCH}/lib:${GEOSDIR}/lib
+setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH}:${GEOSDIR}/lib
+# We only add BASEDIR to the @LD_LIBRARY_PATH_CMD if BASEDIR is defined (i.e., not running with Spack)
+if ( $?BASEDIR ) then
+    setenv @LD_LIBRARY_PATH_CMD ${@LD_LIBRARY_PATH_CMD}:${BASEDIR}/${ARCH}/lib
+endif
 
 setenv RUN_CMD "@RUN_CMD"
 

diff --git a/gcm_setup b/gcm_setup
@@ -471,6 +471,7 @@ else if ( $SITE == 'NAS' ) then
    echo "   ${C2}sky (Skylake)${CN} (default)"
    echo "   ${C2}cas (Cascade Lake)${CN}"
    echo "   ${C2}rom (AMD Rome)${CN}"
+   echo "   ${C2}mil (AMD Milan)${CN}"
    echo " "
    echo " NOTE Due to how FV3 is compiled by default, Sandy Bridge"
    echo "      and Ivy Bridge are not supported by current GEOS"
@@ -485,7 +486,8 @@ else if ( $SITE == 'NAS' ) then
        $MODEL != 'bro' & \
        $MODEL != 'sky' & \
        $MODEL != 'cas' & \
-       $MODEL != 'rom' ) goto ASKPROC
+       $MODEL != 'rom' & \
+       $MODEL != 'mil' ) goto ASKPROC
 
    # Some processors have weird names at NAS
    # ---------------------------------------
@@ -496,13 +498,11 @@ else if ( $SITE == 'NAS' ) then
       set MODEL = 'cas_ait'
    else if ($MODEL == rom) then
       set MODEL = 'rom_ait'
+   else if ($MODEL == mil) then
+      set MODEL = 'mil_ait'
    endif
 
-   if (     $MODEL == 'san') then
-      set NCPUS_PER_NODE = 16
-   else if ($MODEL == 'ivy') then
-      set NCPUS_PER_NODE = 20
-   else if ($MODEL == 'has') then
+   if ($MODEL == 'has') then
       set NCPUS_PER_NODE = 24
    else if ($MODEL == 'bro') then
       set NCPUS_PER_NODE = 28
@@ -512,6 +512,8 @@ else if ( $SITE == 'NAS' ) then
       set NCPUS_PER_NODE = 40
    else if ($MODEL == 'rom_ait') then
       set NCPUS_PER_NODE = 128
+   else if ($MODEL == 'mil_ait') then
+      set NCPUS_PER_NODE = 128
    endif
 
 else if( $SITE == 'AWS' | $SITE == 'Azure' ) then
@@ -1222,7 +1224,7 @@ if( $AGCM_IM == "c270" ) then
      set NUM_READERS = 6
      set JOB_SGMT = 00000001
      set NUM_SGMT = 1
-     set ATMOS_RES = CF0270x6C
+     set ATMOS_RES = CF0270x6C-SG001
      set POST_NDS = 32
      set USE_SHMEM = 1
      set CONUS = ''
@@ -1244,7 +1246,7 @@ if( $AGCM_IM == "c540" ) then
      set NUM_READERS = 6
      set JOB_SGMT = 00000001
      set NUM_SGMT = 1
-     set ATMOS_RES = CF0540x6C
+     set ATMOS_RES = CF0540x6C-SG001
      set POST_NDS = 32
      set USE_SHMEM = 1
      set CONUS = ''
@@ -1266,7 +1268,7 @@ if( $AGCM_IM == "c1080" ) then
      set NUM_READERS = 6
      set JOB_SGMT = 00000001
      set NUM_SGMT = 1
-     set ATMOS_RES = CF1080x6C
+     set ATMOS_RES = CF1080x6C-SG001
      set POST_NDS = 32
      set USE_SHMEM = 1
      set CONUS = ''
@@ -1288,7 +1290,7 @@ if( $AGCM_IM == "c1536" ) then
      set NUM_READERS = 6
      set JOB_SGMT = 00000005
      set NUM_SGMT = 1
-     set ATMOS_RES = CF1536x6C
+     set ATMOS_RES = CF1536x6C-SG002
      set POST_NDS = 16
      set USE_SHMEM = 1
      set CONUS = ''
@@ -1310,7 +1312,7 @@ if( $AGCM_IM == "c2160" ) then
      set NUM_READERS = 6
      set JOB_SGMT = 00000001
      set NUM_SGMT = 1
-     set ATMOS_RES = CF2160x6C
+     set ATMOS_RES = CF2160x6C-SG001
      set POST_NDS = 32
      set USE_SHMEM = 1
      set CONUS = ''

diff --git a/geoschemchem_setup b/geoschemchem_setup
@@ -471,6 +471,7 @@ else if ( $SITE == 'NAS' ) then
    echo "   ${C2}sky (Skylake)${CN} (default)"
    echo "   ${C2}cas (Cascade Lake)${CN}"
    echo "   ${C2}rom (AMD Rome)${CN}"
+   echo "   ${C2}mil (AMD Milan)${CN}"
    echo " "
    echo " NOTE Due to how FV3 is compiled by default, Sandy Bridge"
    echo "      and Ivy Bridge are not supported by current GEOS"
@@ -485,7 +486,8 @@ else if ( $SITE == 'NAS' ) then
        $MODEL != 'bro' & \
        $MODEL != 'sky' & \
        $MODEL != 'cas' & \
-       $MODEL != 'rom' ) goto ASKPROC
+       $MODEL != 'rom' & \
+       $MODEL != 'mil' ) goto ASKPROC
 
    # Some processors have weird names at NAS
    # ---------------------------------------
@@ -496,13 +498,11 @@ else if ( $SITE == 'NAS' ) then
       set MODEL = 'cas_ait'
    else if ($MODEL == rom) then
       set MODEL = 'rom_ait'
+   else if ($MODEL == mil) then
+      set MODEL = 'mil_ait'
    endif
 
-   if (     $MODEL == 'san') then
-      set NCPUS_PER_NODE = 16
-   else if ($MODEL == 'ivy') then
-      set NCPUS_PER_NODE = 20
-   else if ($MODEL == 'has') then
+   if ($MODEL == 'has') then
       set NCPUS_PER_NODE = 24
    else if ($MODEL == 'bro') then
       set NCPUS_PER_NODE = 28
@@ -512,6 +512,8 @@ else if ( $SITE == 'NAS' ) then
       set NCPUS_PER_NODE = 40
    else if ($MODEL == 'rom_ait') then
       set NCPUS_PER_NODE = 128
+   else if ($MODEL == 'mil_ait') then
+      set NCPUS_PER_NODE = 128
    endif
 
 else if( $SITE == 'AWS' | $SITE == 'Azure' ) then
@@ -652,9 +654,9 @@ if( $OGCM == TRUE ) then
     if( "$OCNMODEL" == "MIT" ) then
         if ( $AGCM_IM != "c90" ) then
             echo "You MUST select c90 atmospheric resolution for MIT ocean!"
-	          exit 1
+            exit 1
         endif
-	      set OGRIDTYP = "MITLLC"
+        set OGRIDTYP = "MITLLC"
         set OGCM_JM = 15
         set OGCM_IM = `expr $OGCM_JM \* 360`
 
@@ -1233,7 +1235,7 @@ if( $AGCM_IM == "c270" ) then
      set NUM_READERS = 6
      set JOB_SGMT = 00000001
      set NUM_SGMT = 1
-     set ATMOS_RES = CF0270x6C
+     set ATMOS_RES = CF0270x6C-SG001
      set POST_NDS = 32
      set USE_SHMEM = 1
      set CONUS = ''
@@ -1256,7 +1258,7 @@ if( $AGCM_IM == "c540" ) then
      set NUM_READERS = 6
      set JOB_SGMT = 00000001
      set NUM_SGMT = 1
-     set ATMOS_RES = CF0540x6C
+     set ATMOS_RES = CF0540x6C-SG001
      set POST_NDS = 32
      set USE_SHMEM = 1
      set CONUS = ''
@@ -1279,7 +1281,7 @@ if( $AGCM_IM == "c1080" ) then
      set NUM_READERS = 6
      set JOB_SGMT = 00000001
      set NUM_SGMT = 1
-     set ATMOS_RES = CF1080x6C
+     set ATMOS_RES = CF1080x6C-SG001
      set POST_NDS = 32
      set USE_SHMEM = 1
      set CONUS = ''
@@ -1302,7 +1304,7 @@ if( $AGCM_IM == "c1536" ) then
      set NUM_READERS = 6
      set JOB_SGMT = 00000005
      set NUM_SGMT = 1
-     set ATMOS_RES = CF1536x6C
+     set ATMOS_RES = CF1536x6C-SG002
      set POST_NDS = 16
      set USE_SHMEM = 1
      set CONUS = ''
@@ -1325,7 +1327,7 @@ if( $AGCM_IM == "c2160" ) then
      set NUM_READERS = 6
      set JOB_SGMT = 00000001
      set NUM_SGMT = 1
-     set ATMOS_RES = CF2160x6C
+     set ATMOS_RES = CF2160x6C-SG001
      set POST_NDS = 32
      set USE_SHMEM = 1
      set CONUS = ''