Sync EE2 updates from AQM v7 implementation

modulefiles/wcoss2.lua

@@ -28,7 +28,7 @@ g2tmpl_ver=os.getenv("g2tmpl_ver") or "1.10.2"
 bacio_ver=os.getenv("bacio_ver") or "2.4.1"
 ip_ver=os.getenv("ip_ver") or "3.3.3"
 sp_ver=os.getenv("sp_ver") or "2.3.3"
-crtm_ver=os.getenv("crtm_ver") or "2.4.0"
+crtm_ver=os.getenv("crtm_ver") or "2.4.0.1"
 w3emc_ver=os.getenv("w3emc_ver") or "2.9.2"
 load(pathJoin("g2", g2_ver))
 load(pathJoin("g2tmpl", g2tmpl_ver))

modulefiles/wcoss2_a.lua

@@ -1,73 +1,22 @@
 help([[
-Load environment to build post on WCOSS2 Acorn
+Load environment to build UPP on WCOSS2 Acorn
 ]])
 
-PrgEnv_intel_ver=os.getenv("PrgEnv_intel_ver") or "8.1.0"
-load(pathJoin("PrgEnv-intel", PrgEnv_intel_ver))
+prepend_path("MODULEPATH", "/lfs/h1/emc/nceplibs/noscrub/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
 
-intel_ver=os.getenv("intel_ver") or "19.1.3.304"
-load(pathJoin("intel", intel_ver))
+stack_intel_ver=os.getenv("stack_intel_ver") or "2022.0.2.262"
+load(pathJoin("stack-intel", stack_intel_ver))
 
-craype_ver=os.getenv("craype_ver") or "2.7.13"
-load(pathJoin("craype", craype_ver))
+stack_cray_ver=os.getenv("stack_cray_ver") or "8.1.9"
+load(pathJoin("stack-cray-mpich", stack_cray_ver))
 
-cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.7"
-load(pathJoin("cray-mpich", cray_mpich_ver))
-
-cmake_ver=os.getenv("cmake_ver") or "3.20.2"
+cmake_ver=os.getenv("cmake_ver") or "3.23.1"
 load(pathJoin("cmake", cmake_ver))
 
-prepend_path("MODULEPATH", "/lfs/h1/emc/nceplibs/noscrub/hpc-stack/libs/hpc-stack/modulefiles/stack")
-
-hpc_ver=os.getenv("hpc_ver") or "1.2.0"
-hpc_intel_ver=os.getenv("hpc_intel_ver") or "19.1.3.304"
-hpc_cray_mpich_ver=os.getenv("hpc_cray_mpich_ver") or "8.1.7"
-load(pathJoin("hpc", hpc_ver))
-load(pathJoin("hpc-intel", hpc_intel_ver))
-load(pathJoin("hpc-cray-mpich", hpc_cray_mpich_ver))
-
-hdf5_ver=os.getenv("hdf5_ver") or "1.10.6"
-netcdf_ver=os.getenv("netcdf_ver") or "4.7.4"
-load(pathJoin("hdf5", hdf5_ver))
-load(pathJoin("netcdf", netcdf_ver))
-
-jasper_ver=os.getenv("jasper_ver") or "2.0.25"
-libpng_ver=os.getenv("libpng_ver") or "1.6.37"
-zlib_ver=os.getenv("zlib_ver") or "1.2.11"
-load(pathJoin("jasper", jasper_ver))
-load(pathJoin("libpng", libpng_ver))
-load(pathJoin("zlib", zlib_ver))
-
-g2_ver=os.getenv("g2_ver") or "3.4.5"
-g2tmpl_ver=os.getenv("g2tmpl_ver") or "1.10.2"
-bacio_ver=os.getenv("bacio_ver") or "2.4.1"
-ip_ver=os.getenv("ip_ver") or "3.3.3"
-sp_ver=os.getenv("sp_ver") or "2.3.3"
-crtm_ver=os.getenv("crtm_ver") or "2.4.0"
-w3emc_ver=os.getenv("w3emc_ver") or "2.9.2"
-load(pathJoin("g2", g2_ver))
-load(pathJoin("g2tmpl", g2tmpl_ver))
-load(pathJoin("bacio", bacio_ver))
-load(pathJoin("ip", ip_ver))
-load(pathJoin("sp", sp_ver))
-load(pathJoin("crtm", crtm_ver))
-load(pathJoin("w3emc", w3emc_ver))
-
-nemsio_ver=os.getenv("nemsio_ver") or "2.5.2"
-sigio_ver=os.getenv("sigio_ver") or "2.3.2"
-sfcio_ver=os.getenv("sfcio_ver") or "1.4.1"
-wrf_io_ver=os.getenv("wrf_io_ver") or "1.2.0"
-load(pathJoin("nemsio", nemsio_ver))
-load(pathJoin("sigio", sigio_ver))
-load(pathJoin("sfcio", sfcio_ver))
-load(pathJoin("wrf_io", wrf_io_ver))
+load("upp_common")
 
 setenv("CC","cc")
 setenv("CXX","CC")
 setenv("FC","ftn")
 
-
-prepend_path("MODULEPATH", "/lfs/h1/oar/esrl/noscrub/samuel.trahan/ifi/modulefiles")
-load("ifi/20230511-intel-19.1.3.304")
-
-whatis("Description: post build environment")
+whatis("Description: UPP build environment")

sorc/ncep_post.fd/CMakeLists.txt

@@ -175,7 +175,8 @@ if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$")
   set(CMAKE_Fortran_FLAGS
       "-g -traceback -fp-model source -free -convert big_endian")
   set(CMAKE_Fortran_FLAGS_RELEASE "-O3")
-  set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -check bounds -check pointers -check shape -check stack -check uninit")
+  set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -ftrapuv -check all")
+  set_source_files_properties(INITPOST_GFS_NEMS_MPIIO.f INITPOST_NETCDF.f INITPOST_NEMS.f PROPERTIES COMPILE_FLAGS -qoverride-limits)
 elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU|Clang|AppleClang)$")
   set(CMAKE_Fortran_FLAGS
       "-g -fbacktrace -ffree-form -ffree-line-length-none -fconvert=big-endian")