Merge pull request #195 from jedwards4b/update_default_ww3grid

Changes for compsets, grids and compilers on derecho

machines/Depends.intel-oneapi

@@ -6,9 +6,15 @@ derivative_mod.o \
 bndry_mod.o \
 prim_advance_mod.o
 
-# CLM's SatellitePhenologyMod is compiled incorrectly with intel 15.0.0 at -O2
+# FMS netcdf_io fails with optimization
 REDUCED_OPT_OBJS=\
-SatellitePhenologyMod.o 
+netcdf_io.o \
+fms_netcdf_domain_io.o \
+fms_netcdf_unstructured_domain_io.o
+
+REDUCED_DEBUG_OBJS=\
+unicon.o
+
 
 # shr_wv_sat_mod does not need to have better than ~0.1% precision, and benefits
 # enormously from a lower precision in the vector functions.
@@ -38,7 +44,7 @@ ifeq ($(DEBUG),FALSE)
   $(PERFOBJS): %.o: %.F90
 	  $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS)  -O3  -no-prec-div $<
   $(REDUCED_OPT_OBJS): %.o: %.F90
-	  $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS)  -O1 $<
+	  $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS)  -O0 $<
   $(REDUCED_PRECISION_OBJS): %.o: %.F90
 	  $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -fimf-precision=low -fp-model fast $<
   $(SHR_RANDNUM_FORT_OBJS): %.o: %.F90
@@ -47,5 +53,8 @@ ifeq ($(DEBUG),FALSE)
 	  $(CC) -c $(INCLDIR) $(INCS) $(CFLAGS) -O3 -fp-model fast $<
   $(PUMAS_MG_OBJS): %.o: %.F90
 	  $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -O3 -no-fma -ftz -no-prec-sqrt -qoverride-limits -no-inline-max-total-size -inline-factor=200 -qopt-report=5 $<
+else
+  $(REDUCED_DEBUG_OBJS): %.o: %.F90
+	  $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -O0 -check nobounds -check nopointers $<
 
 endif

machines/Depends.nvhpc

@@ -13,6 +13,18 @@ REDUCED_OPT_OBJS=\
 SatellitePhenologyMod.o \
 esm.o
 
+REDUCED_ERRORCHKS_IN_DEBUG=\
+mpp.o \
+horiz_interp_conserve.o \
+data_override.o \
+MOM_io_infra.o \
+dynColumnStateUpdaterMod.o \
+prim_advection_mod.o \
+MARBL_forcing_mod.o \
+MOM_internal_tide_input.o \
+MOM_ice_shelf.o \
+mom_surface_forcing_nuopc.o
+
 REDUCED_PRECISION_OBJS=\
 shr_wv_sat_mod.o
 
@@ -159,4 +171,7 @@ ifeq ($(DEBUG),FALSE)
 	  $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) $(OPENACC_GPU_FLAGS) $<
   $(CLUBB_OBJS): %.o: %.F90
 	  $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) $(OPENACC_GPU_FLAGS) $<
+else
+  $(REDUCED_ERRORCHKS_IN_DEBUG): %.o: %.F90
+	  $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -Mnobounds -Ktrap=none -Knoieee $<
 endif

machines/cmake_macros/intel-oneapi.cmake

@@ -0,0 +1,63 @@
+string(APPEND CFLAGS " -qno-opt-dynamic-align -fp-model precise -std=gnu99")
+if (compile_threaded)
+  string(APPEND CFLAGS " -qopenmp")
+endif()
+if (NOT DEBUG)
+  string(APPEND CFLAGS " -O2 -debug minimal")
+endif()
+if (DEBUG)
+  string(APPEND CFLAGS " -O0 -g")
+endif()
+string(APPEND CFLAGS " -no-fma")
+string(APPEND CPPDEFS " -DFORTRANUNDERSCORE -DCPRINTEL")
+string(APPEND CXX_LDFLAGS " -cxxlib")
+set(CXX_LINKER "FORTRAN")
+set(FC_AUTO_R8 "-r8")
+string(APPEND FFLAGS " -qno-opt-dynamic-align  -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -fp-model source")
+if (compile_threaded)
+  string(APPEND FFLAGS " -qopenmp")
+endif()
+if (DEBUG)
+  string(APPEND FFLAGS " -O0 -g -check bounds -check pointers -fpe0 -check noarg_temp_created")
+endif()
+if (NOT DEBUG)
+  string(APPEND FFLAGS " -O2 -debug minimal")
+endif()
+string(APPEND FFLAGS " -no-fma")
+set(FFLAGS_NOOPT "-O0")
+set(FIXEDFLAGS "-fixed")
+set(FREEFLAGS "-free")
+if (compile_threaded)
+  string(APPEND LDFLAGS " -qopenmp")
+endif()
+set(MPICC "mpicc")
+set(MPICXX "mpicxx")
+set(MPIFC "mpif90")
+set(SCC "icc")
+set(SCXX "icpc")
+set(SFC "ifort")
+if (MPILIB STREQUAL mpich)
+  string(APPEND SLIBS " -mkl=cluster")
+endif()
+if (MPILIB STREQUAL mpich2)
+  string(APPEND SLIBS " -mkl=cluster")
+endif()
+if (MPILIB STREQUAL mvapich)
+  string(APPEND SLIBS " -mkl=cluster")
+endif()
+if (MPILIB STREQUAL mvapich2)
+  string(APPEND SLIBS " -mkl=cluster")
+endif()
+if (MPILIB STREQUAL mpt)
+  string(APPEND SLIBS " -mkl=cluster")
+endif()
+if (MPILIB STREQUAL openmpi)
+  string(APPEND SLIBS " -mkl=cluster")
+endif()
+if (MPILIB STREQUAL impi)
+  string(APPEND SLIBS " -mkl=cluster")
+endif()
+if (MPILIB STREQUAL mpi-serial)
+  string(APPEND SLIBS " -mkl")
+endif()
+set(SUPPORTS_CXX "TRUE")