[release/public-v2.2.0] Update MacOS configuration and compatibility

devbuild.sh

@@ -417,6 +417,19 @@ else
 fi
 module list
 
+# Apply patch for sorc/CMakeLists.txt for MacOS arm64/aarch64
+if [[ "${PLATFORM}" == "macos" ]]; then
+  ARCH=$(uname -m)
+  if [[ "${ARCH}" == arm64 ]] || [[ "${ARCH}" == aarch64 ]]; then
+    patch1="sorc/patch_macos_arm64_sorc_cmakelists.txt"
+    if patch -p1 -R --dry-run --silent -d ./sorc -N < ${patch1} 1> /dev/null; then
+      echo "Patch ${patch1} was already applied";
+    else
+      patch -p1 -d ./sorc -N < ${patch1}
+    fi
+  fi
+fi
+
 mkdir -p ${BUILD_DIR}
 cd ${BUILD_DIR}
 

etc/lmod-setup.csh

@@ -18,22 +18,23 @@ if ( "$L_MACHINE" != wcoss2 ) then
 endif
 
 if ( "$L_MACHINE" == macos ) then
-   arch=$(uname -m)
-   [[ "$arch" = arm64 ]] && export ENV="/opt/homebrew/opt/lmod/init/csh"
-   [[ "$arch" = x86_64 ]] && export ENV="/usr/local/opt/lmod/init/csh"
-   source $ENV
+   if ( -d /opt/homebrew/opt/lmod ) then
+       source /opt/homebrew/opt/lmod/init/csh
+   else if ( -d /usr/local/opt/lmod ) then
+       source /usr/local/opt/lmod/init/csh
+   else
+       echo "Path for Lmod is unknown, verify whether Lmod is installed"
+   endif
 
    module purge
 
 else if ( "$L_MACHINE" == linux ) then
-   setenv ENV "/usr/share/lmod/lmod/init/csh"
-   source $ENV
+   source /usr/share/lmod/lmod/init/csh
 
    module purge
 
 else if ( "$L_MACHINE" == singularity ) then
-   set ENV="/usr/share/lmod/lmod/init/csh"
-   source $ENV
+   source /usr/share/lmod/lmod/init/csh
 
    module purge
 

etc/lmod-setup.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 if [ $# = 0 ]; then
    L_MACHINE=${MACHINE}
@@ -26,10 +26,12 @@ fi
 
 if [ "$L_MACHINE" = macos ]; then
    arch=$(uname -m)
-   [[ "$arch" = arm64 ]] && export BASH_ENV="/opt/homebrew/opt/lmod/init/bash"
-   [[ "$arch" = x86_64 ]] && export BASH_ENV="/usr/local/opt/lmod/init/bash"
+   if [ "$arch" = arm64 ] || [ "$arch" = aarch64 ]; then
+      export BASH_ENV="/opt/homebrew/opt/lmod/init/bash"
+   else
+      export BASH_ENV="/usr/local/opt/lmod/init/bash"
+   fi
    source $BASH_ENV
-
    module purge
 
 elif [ "$L_MACHINE" = linux ]; then

jobs/JREGIONAL_AQM_ICS

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #
 #-----------------------------------------------------------------------

jobs/JREGIONAL_AQM_LBCS

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #
 #-----------------------------------------------------------------------

jobs/JREGIONAL_BIAS_CORRECTION_O3

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #
 #-----------------------------------------------------------------------

jobs/JREGIONAL_BIAS_CORRECTION_PM25

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #
 #-----------------------------------------------------------------------

jobs/JREGIONAL_CHECK_POST_OUTPUT

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #
 #-----------------------------------------------------------------------

jobs/JREGIONAL_FIRE_EMISSION

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #
 #-----------------------------------------------------------------------

jobs/JREGIONAL_GET_EXTRN_MDL_FILES

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #
 #-----------------------------------------------------------------------

jobs/JREGIONAL_MAKE_GRID

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #
 #-----------------------------------------------------------------------

jobs/JREGIONAL_MAKE_ICS

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #
 #-----------------------------------------------------------------------

jobs/JREGIONAL_MAKE_LBCS

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #
 #-----------------------------------------------------------------------

jobs/JREGIONAL_MAKE_OROG

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #
 #-----------------------------------------------------------------------

jobs/JREGIONAL_MAKE_SFC_CLIMO

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #
 #-----------------------------------------------------------------------

jobs/JREGIONAL_NEXUS_EMISSION

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #
 #-----------------------------------------------------------------------

jobs/JREGIONAL_NEXUS_GFS_SFC

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #
 #-----------------------------------------------------------------------

jobs/JREGIONAL_NEXUS_POST_SPLIT

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #
 #-----------------------------------------------------------------------

jobs/JREGIONAL_PLOT_ALLVARS

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #
 #-----------------------------------------------------------------------

jobs/JREGIONAL_POINT_SOURCE

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #
 #-----------------------------------------------------------------------

jobs/JREGIONAL_POST_STAT_O3

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #
 #-----------------------------------------------------------------------

jobs/JREGIONAL_POST_STAT_PM25

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #
 #-----------------------------------------------------------------------

jobs/JREGIONAL_PRE_POST_STAT

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #
 #-----------------------------------------------------------------------

jobs/JREGIONAL_RUN_FCST

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #
 #-----------------------------------------------------------------------

jobs/JREGIONAL_RUN_MET_GENENSPROD_OR_ENSEMBLESTAT

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #
 #-----------------------------------------------------------------------

jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #
 #-----------------------------------------------------------------------

jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX_ENSMEAN

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #
 #-----------------------------------------------------------------------

jobs/JREGIONAL_RUN_MET_GRIDSTAT_OR_POINTSTAT_VX_ENSPROB

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #
 #-----------------------------------------------------------------------

jobs/JREGIONAL_RUN_MET_PB2NC_OBS

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #
 #-----------------------------------------------------------------------

jobs/JREGIONAL_RUN_MET_PCPCOMBINE

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #
 #-----------------------------------------------------------------------

jobs/JREGIONAL_RUN_POST

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #
 #-----------------------------------------------------------------------

jobs/JREGIONAL_RUN_PRDGEN

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #
 #-----------------------------------------------------------------------

modulefiles/build_macos_gnu.lua

@@ -9,7 +9,7 @@ if mode() == "load" then
    execute{cmd="ulimit -S -s unlimited", modeA={"load"}}
 end
 
--- This path should point to your HPCstack installation directory
+-- This path points to your HPCstack installation's base directory
 local HPCstack="/Users/username/hpc-stack/install"
 
 -- Load HPC stack 
@@ -21,11 +21,19 @@ load("hpc-gnu")
 load("hpc-openmpi")
 
 load("srw_common")
+load("nccmp")
+load("nco")
 
--- MacOS with arm64 architecture: `uname -m` expands to arm64
--- MacOS with Intel architecture: `uname -m` expands to x86_64
-local arch = 'eval $(uname -m)'
-if (arch == "arm64") then
+function file_exists(name)
+   local f=io.open(name,"r")
+   if f~=nil then io.close(f) return true else return false end
+end
+-- Check location of Gnu compilers installed by homebrew
+-- M1/M2 arm64/aarch64:    /opt/homebrew/bin 
+-- Intel x86_64:           /usr/local/bin
+local arm64=file_exists("/opt/homebrew/bin/gcc")
+
+if arm64 then
   setenv("CC", "/opt/homebrew/bin/gcc")
   setenv("FC", "/opt/homebrew/bin/gfortran")
   setenv("CXX", "/opt/homebrew/bin/g++")
@@ -34,34 +42,33 @@ else
   setenv("FC", "/usr/local/bin/gfortran")
   setenv("CXX", "/usr/local/bin/g++")
 end
-
+ 
 -- Set MPI compilers depending on the MPI libraries built:
 local MPI_CC="mpicc"
 local MPI_CXX="mpicxx"
 local MPI_FC="mpif90"
 
-
 -- Set compilers and platform names for CMake:
-setenv("CMAKE_C_COMPILER", MPI_CC)
-setenv("CMAKE_CXX_COMPILER", MPI_CXX)
-setenv("CMAKE_Fortran_COMPILER", MPI_FC)
+setenv("CMAKE_C_COMPILER", "gcc")
+setenv("CMAKE_CXX_COMPILER", "g++")
+setenv("CMAKE_Fortran_COMPILER", "gfortran")
 
-setenv("CMAKE_Platform", "macos.gnu")
---setenv("CMAKE_Platform", "macos.intel")
+setenv("CMAKE_MPI_Fortran_COMPILER", MPI_FC)
+setenv("CMAKE_MPI_C_COMPILER", MPI_CC)
+setenv("CMAKE_MPI_CXX_COMPILER", MPI_CXX)
 
-setenv("CMAKE_Fortran_COMPILER_ID", "GNU")
---setenv("CMAKE_Fortran_COMPILER_ID", "Intel")
+-- Set compiler and linker flags if needed:
+setenv("FFLAGS", " -fallow-argument-mismatch -fallow-invalid-boz -march=native ")
+setenv("CFLAGS", " -march=native")
 
--- Set compiler and linker flags if needed: 
-setenv("FFLAGS", " -DNO_QUAD_PRECISION -fallow-argument-mismatch ")
+setenv("CMAKE_Platform", "macos.gnu")
 
 -- export the env. variable LDFLAGS after loading the current module
--- export LDFLAGS="-L$MPI_ROOT/lib"
+-- export LDFLAGS+=" -L$MPI_ROOT/lib "
 if mode() == "load" then
   LmodMsgRaw([===[
    Please export env. variable LDFLAGS after the module is successfully loaded:
        > export LDFLAGS+=" -L$MPI_ROOT/lib " 
   ]===])
 end
 
-

modulefiles/srw_common.lua

@@ -1,5 +1,5 @@
-load_any("jasper/2.0.25","jasper/2.0.32")
-load_any("zlib/1.2.11","zlib/1.2.13")
+load_any("jasper")
+load_any("zlib")
 load_any("png/1.6.37","libpng/1.6.37")
 
 load_any("netcdf/4.9.2","netcdf-c/4.9.2")
@@ -20,10 +20,10 @@ load_any("gftl-shared/v1.5.0","gftl-shared/1.5.0")
 load_any("yafyaml/v0.5.1","yafyaml/0.5.1")
 load("mapl/2.35.2-esmf-8.4.2")
 
-load_any("nemsio/2.5.2","nemsio/2.5.4")
+load_any("nemsio")
 load("sfcio/1.4.1")
 load("sigio/2.3.2")
 load("w3nco/2.4.1")
 load_any("wrf_io/1.2.0","wrf-io/1.2.0")
 
-load_any("wgrib2/2.0.8","wgrib2/3.1.1")
+load_any("wgrib2")

modulefiles/tasks/macos/plot_allvars.local.lua

@@ -0,0 +1,4 @@
+prepend_path("MODULEPATH","/Users/username/miniconda3/modulefiles")
+load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "23.9.0"))
+
+setenv("SRW_ENV", "regional_workflow")

modulefiles/tasks/macos/python_srw.lua

@@ -0,0 +1,4 @@
+prepend_path("MODULEPATH","/Users/username/miniconda3/modulefiles")
+load(pathJoin("miniconda3", os.getenv("miniconda3_ver") or "23.9.0"))
+
+setenv("SRW_ENV", "workflow_tools")

modulefiles/tasks/macos/run_vx.local.lua

@@ -0,0 +1,25 @@
+--[[
+Compiler-specific modules are used for met and metplus libraries
+--]]
+local met_ver = (os.getenv("met_ver") or "10.1.2")
+local metplus_ver = (os.getenv("metplus_ver") or "4.1.3")
+if (mode() == "load") then
+  load(pathJoin("met", met_ver))
+  load(pathJoin("metplus",metplus_ver))
+end
+local base_met = os.getenv("met_ROOT") or os.getenv("MET_ROOT")
+local base_metplus = os.getenv("metplus_ROOT") or os.getenv("METPLUS_ROOT")
+
+setenv("MET_INSTALL_DIR", base_met)
+setenv("MET_BIN_EXEC",    pathJoin(base_met,"bin"))
+setenv("MET_BASE",        pathJoin(base_met,"share/met"))
+setenv("MET_VERSION",     met_ver)
+setenv("METPLUS_VERSION", metplus_ver)
+setenv("METPLUS_ROOT",    base_metplus)
+setenv("METPLUS_PATH",    base_metplus)
+
+if (mode() == "unload") then
+  unload(pathJoin("met", met_ver))
+  unload(pathJoin("metplus",metplus_ver))
+end
+load("python_srw")