Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
546cdc0
Update WW3 for fix for MPI reproducibility (#911)
JessicaMeixner-NOAA Nov 17, 2021
805421d
Decrease the memory usage by MERRA2 for 6 times (#903)
AnningCheng-NOAA Nov 18, 2021
9c78af1
Update CICE cap for optional features; use UPP as submodule (was #904…
DeniseWorthen Nov 22, 2021
919ca0a
Semi Lagrangian sedimentation of graupel and update of corresponding …
RuiyuSun Nov 23, 2021
57288b9
CCPP framework (metadata parser) update, and update several units in …
climbfuji Nov 24, 2021
b884a61
Regional restart regression test fixed (#918)
RatkoVasic-NOAA Dec 1, 2021
5a461c1
Noah MP updates for Prototype 8 (GFSv17) (#927)
HelinWei-NOAA Dec 2, 2021
b52f83c
Clean up the input data directory, move diag_table to ufs-weather-mod…
junwang-noaa Dec 6, 2021
f20ac76
Add GP ORTs (#946)
dustinswales Dec 9, 2021
ad95b73
New Thompson cloud fraction (updated subroutine cal_cldfra3) (#929)
climbfuji Dec 10, 2021
56f3483
Merge NOAA-GSL gsl/develop into develop, update all GSL regression te…
climbfuji Dec 13, 2021
64fe240
CCPP CMake cleanup, update submodule pointer for stochastic_physics t…
climbfuji Dec 14, 2021
194f044
Update CICE, use -init=snan,arrays for Intel debug (#935)
DeniseWorthen Dec 15, 2021
ac0ec29
Update .gitmodules and submodule pointer for fv3atm for code review a…
climbfuji Dec 15, 2021
907a84d
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji Dec 15, 2021
f108cee
Fix merge conflicts
climbfuji Dec 15, 2021
9be19a3
Revert change to .gitmodules and update submodule pointer for fv3atm
climbfuji Dec 15, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CDEPS-interface/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
set(CMAKE_Fortran_FLAGS "-g -traceback")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -O -assume realloc_lhs")
set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -fp-model precise")
set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -check -check noarg_temp_created -check nopointer -fpe0 -ftrapuv")
set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -check -check noarg_temp_created -check nopointer -fpe0 -ftrapuv -init=snan,arrays")
else()
message(WARNING "Fortran compiler with ID ${CMAKE_Fortran_COMPILER_ID} will be used with CMake default options")
endif()
Expand Down
2 changes: 1 addition & 1 deletion CICE-interface/CICE
Submodule CICE updated 55 files
+2 −3 .gitmodules
+2 −2 README.md
+68 −12 cice.setup
+40 −18 cicecore/cicedynB/analysis/ice_history.F90
+29 −29 cicecore/cicedynB/analysis/ice_history_bgc.F90
+3 −0 cicecore/cicedynB/analysis/ice_history_drag.F90
+49 −60 cicecore/cicedynB/dynamics/ice_dyn_eap.F90
+59 −45 cicecore/cicedynB/dynamics/ice_dyn_evp.F90
+95 −12 cicecore/cicedynB/dynamics/ice_dyn_shared.F90
+137 −110 cicecore/cicedynB/dynamics/ice_dyn_vp.F90
+11 −4 cicecore/cicedynB/general/ice_forcing.F90
+40 −22 cicecore/cicedynB/general/ice_init.F90
+40 −9 cicecore/drivers/nuopc/cmeps/CICE_InitMod.F90
+73 −7 cicecore/drivers/nuopc/cmeps/CICE_RunMod.F90
+0 −4 cicecore/drivers/nuopc/cmeps/ice_comp_nuopc.F90
+44 −11 cicecore/drivers/nuopc/dmi/CICE_InitMod.F90
+88 −9 cicecore/drivers/nuopc/dmi/CICE_RunMod.F90
+3 −4 configuration/scripts/Makefile
+3 −2 configuration/scripts/ice_in
+3 −2 configuration/scripts/machines/Macros.daley_intel
+7 −0 configuration/scripts/machines/env.cheyenne_gnu
+7 −0 configuration/scripts/machines/env.cheyenne_intel
+7 −0 configuration/scripts/machines/env.cheyenne_pgi
+0 −1 configuration/scripts/options/set_env.box2001
+1 −1 configuration/scripts/options/set_nml.alt03
+1 −0 configuration/scripts/options/set_nml.atmbndyconstant
+1 −0 configuration/scripts/options/set_nml.atmbndymixed
+0 −10 configuration/scripts/options/set_nml.gx1coreii
+0 −8 configuration/scripts/options/set_nml.qc_nonbfb
+16 −0 configuration/scripts/options/set_nml.qcnonbfb
+0 −0 configuration/scripts/options/set_nml.snwitdrdg
+8 −10 configuration/scripts/parse_namelist.sh
+2 −1 configuration/scripts/parse_namelist_from_env.sh
+21 −13 configuration/scripts/parse_settings.sh
+8 −2 configuration/scripts/tests/QC/cice.t-test.py
+2 −2 configuration/scripts/tests/QC/gen_qc_cases.csh
+4 −3 configuration/scripts/tests/base_suite.ts
+48 −0 configuration/scripts/tests/baseline.script
+24 −0 configuration/scripts/tests/create_fails.csh
+0 −2 configuration/scripts/tests/decomp_suite.ts
+1 −0 configuration/scripts/tests/first_suite.ts
+2 −2 configuration/scripts/tests/nothread_suite.ts
+5 −3 configuration/scripts/tests/prod_suite.ts
+0 −1 configuration/scripts/tests/reprosum_suite.ts
+36 −0 configuration/scripts/tests/test_qcchk.script
+36 −0 configuration/scripts/tests/test_qcchkf.script
+7 −3 doc/source/cice_index.rst
+0 −15 doc/source/developer_guide/dg_forcing.rst
+6 −5 doc/source/developer_guide/dg_scripts.rst
+12 −1 doc/source/master_list.bib
+109 −105 doc/source/science_guide/sg_dynamics.rst
+4 −3 doc/source/user_guide/ug_case_settings.rst
+13 −3 doc/source/user_guide/ug_testing.rst
+2 −2 doc/source/user_guide/ug_troubleshooting.rst
+1 −1 icepack
2 changes: 1 addition & 1 deletion CICE-interface/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
set(CMAKE_Fortran_FLAGS "-g -traceback")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -FR -convert big_endian -assume byterecl -ftz -align array64byte -xHOST")
set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -fp-model precise")
set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created")
set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created -init=snan,arrays")
set(CMAKE_Fortran_LINK_FLAGS "")
else()
message(WARNING "Fortran compiler with ID ${CMAKE_Fortran_COMPILER_ID} will be used with CMake default options")
Expand Down
2 changes: 1 addition & 1 deletion CMEPS-interface/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
set(CMAKE_Fortran_FLAGS "-g -traceback")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -O -assume realloc_lhs")
set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -fp-model precise")
set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -check -check noarg_temp_created -check nopointer -fpe0 -ftrapuv")
set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -check -check noarg_temp_created -check nopointer -fpe0 -ftrapuv -init=snan,arrays")
set(CMAKE_Fortran_LINK_FLAGS "")
else()
message(WARNING "Fortran compiler with ID ${CMAKE_Fortran_COMPILER_ID} will be used with CMake default options")
Expand Down
5 changes: 1 addition & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,9 @@ endif()
find_package(bacio REQUIRED)
find_package(sp REQUIRED)
find_package(w3nco REQUIRED)
if(INLINE_POST)
find_package(upp REQUIRED)
endif()

# Configure Python
find_package(Python 3 REQUIRED COMPONENTS Interpreter)
find_package(Python 3.6 REQUIRED COMPONENTS Interpreter)
message("Found Python: ${Python_EXECUTABLE}")

###############################################################################
Expand Down
2 changes: 1 addition & 1 deletion HYCOM-interface/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
set(CMAKE_Fortran_FLAGS "-g -traceback -xSSE4.2 -mcmodel=small -r8")
set(CMAKE_Fortran_FLAGS_RELEASE "-O3 -fp-model source -warn nogeneral")
set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -check -check noarg_temp_created -check nopointer -fpe0 -ftrapuv -link_mpi=dbg")
set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -check -check noarg_temp_created -check nopointer -fpe0 -ftrapuv -link_mpi=dbg -init=snan,arrays")
set(CMAKE_Fortran_LINK_FLAGS "-V ${CMAKE_Fortran_FLAGS} -static-intel")
else()
message(WARNING "Fortran compiler with ID ${CMAKE_Fortran_COMPILER_ID} will be used with CMake default options")
Expand Down
2 changes: 1 addition & 1 deletion MOM6-interface/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -i4 -r8")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fno-alias -auto -safe-cray-ptr -ftz -assume byterecl -sox")
set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -debug minimal -fp-model source")
set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -check -check noarg_temp_created -check nopointer -fpe0 -ftrapuv")
set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -check -check noarg_temp_created -check nopointer -fpe0 -ftrapuv -init=snan,arrays")
set(CMAKE_Fortran_LINK_FLAGS "")
else()
message(WARNING "Fortran compiler with ID ${CMAKE_Fortran_COMPILER_ID} will be used with CMake default options")
Expand Down
4 changes: 3 additions & 1 deletion cmake/GNU.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ else()
endif()

# For ccpp
set(CMAKE_Fortran_FLAGS_DEFAULT_PREC "-fdefault-real-8 -fdefault-double-8")
set(CMAKE_C_FLAGS_RELEASE "-O2 -fPIC" CACHE STRING "" FORCE)
set(CMAKE_CXX_FLAGS_RELEASE "-O2 -fPIC" CACHE STRING "" FORCE)
set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -fPIC" CACHE STRING "" FORCE)
set(CMAKE_C_FLAGS_BITFORBIT "-O2 -fPIC" CACHE STRING "" FORCE)
set(CMAKE_CXX_FLAGS_BITFORBIT "-O2 -fPIC" CACHE STRING "" FORCE)
set(CMAKE_Fortran_FLAGS_BITFORBIT "-O2 -fPIC" CACHE STRING "" FORCE)
7 changes: 1 addition & 6 deletions cmake/Intel.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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")
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 -init=snan,arrays")
if(DEBUG_LINKMPI)
if(OPENMP)
set(CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG} -link_mpi=dbg_mt")
Expand All @@ -31,24 +31,19 @@ else()
if(AVX2)
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -march=core-avx2")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=core-avx2")
set(CMAKE_Fortran_FLAGS_OPT "-no-prec-div -no-prec-sqrt -xCORE-AVX2")
elseif(SIMDMULTIARCH)
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -axSSE4.2,CORE-AVX2")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -axSSE4.2,CORE-AVX2")
set(CMAKE_Fortran_FLAGS_OPT "-no-prec-div -no-prec-sqrt -axSSE4.2,CORE-AVX2")
elseif(AVX)
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -march=core-avx-i")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=core-avx-i")
set(CMAKE_Fortran_FLAGS_OPT "-no-prec-div -no-prec-sqrt -xCORE-AVX-I")
endif()
endif()

# For ccpp
set(CMAKE_Fortran_FLAGS_DEFAULT_PREC "-real-size 64")
set(CMAKE_C_FLAGS_RELEASE "-O2 -fPIC" CACHE STRING "" FORCE)
set(CMAKE_CXX_FLAGS_RELEASE "-O2 -fPIC" CACHE STRING "" FORCE)
set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -fPIC" CACHE STRING "" FORCE)

set(CMAKE_C_FLAGS_BITFORBIT "-O2 -fPIC" CACHE STRING "" FORCE)
set(CMAKE_CXX_FLAGS_BITFORBIT "-O2 -fPIC" CACHE STRING "" FORCE)
set(CMAKE_Fortran_FLAGS_BITFORBIT "-O2 -fPIC" CACHE STRING "" FORCE)
Expand Down
3 changes: 2 additions & 1 deletion cmake/configure_macosx.gnu.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
set(INLINE_POST ON CACHE BOOL "Enable inline post" FORCE)
set(INLINE_POST ON CACHE BOOL "Enable inline post" FORCE)
set(PARALLEL_NETCDF ON CACHE BOOL "Enable parallel NetCDF" FORCE)

# OpenMP broken for clang compiler
if(${CMAKE_C_COMPILER_ID} MATCHES "^(Clang|AppleClang)$")
Expand Down
3 changes: 3 additions & 0 deletions cmake/configure_macosx.intel.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
set(INLINE_POST ON CACHE BOOL "Enable inline post" FORCE)
set(PARALLEL_NETCDF ON CACHE BOOL "Enable parallel NetCDF" FORCE)
set(DEBUG_LINKMPI OFF CACHE BOOL "Enable linkmpi option when DEBUG mode is on" FORCE)
46 changes: 40 additions & 6 deletions doc/UsersGuide/source/InputsOutputs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -497,68 +497,102 @@ The WW3 version number in mod_def.<grd> files must be consistent with version of
.. _WW3_FixFiles:

.. list-table:: *Input files containing grid information and conservative remapping for global configurations (GFSv16 Wave)*
:widths: 35 35 25
:widths: 35 35 25 10 10
:header-rows: 1

* - Filename
- Description
- Resolution
- Spatial Resolution
- nFreq
- nDir
* - mod_def.aoc_9km
- Antarctic Ocean PolarStereo [50N 90N]
- 9km
- 50
- 36
* - mod_def.gnh_10m
- Global mid core [15S 52N]
- 10 min
- 50
- 36
* - mod_def.gsh_15m
- southern ocean [79.5S 10.5S]
- 15 min
- 50
- 36
* - mod_def.glo_15mxt
- Global 1/4 extended grid [90S 90S]
- 15 min
- 36
- 24
* - mod_def.points
- GFSv16-wave spectral grid point output
- na
* - mod_def.points
- GFSv16-wave spectral grid point output
- na
- na
* - rmp_src_to_dst_conserv_002_001.nc
- Conservative remapping gsh_15m to gnh_10m
- na
- na
- na
* - rmp_src_to_dst_conserv_003_001.nc
- Conservative remapping aoc_9km to gnh_10m
- na
- na
- na


.. _WW3_FixFilesp:

.. list-table:: *Input grid information for single global/regional configurations*
:widths: 30 50 20
:widths: 30 50 20 10 10
:header-rows: 1

* - Filename
- Description
- Resolution
- Spatial Resolution
- nFreq
- nDir
* - mod_def.ant_9km
- Regional polar stereo antarctic grid [90S 50S]
- 9km
- 36
- 24
* - mod_def.glo_10m
- Global grid [80S 80N]
- 10 min
- 36
- 24
* - mod_def.glo_30m
- Global grid [80S 80N]
- 30 min
- 36
- 36
* - mod_def.glo_1deg
- Global grid [85S 85N]
- 1 degree
- 25
- 24
* - mod_def.glo_2deg
- Global grid [85S 85N]
- 2 degree
- 20
- 18
* - mod_def.glo_5deg
- Global grid [85S 85N]
- 5 degree
- 18
- 12
* - mod_def.glo_gwes_30m
- Global NAWES 30 min wave grid [80S 80N]
- 30 min
- 36
- 36
* - mod_def.natl_6m
- Regional North Atlantic Basin [1.5N 45.5N; 98W 8W]
- 6 min
- 50
- 36

Coupled regional configurations require forcing files to fill regions that cannot be interpolated from the atmospheric component. For a list of forcing files used to fill unmapped data points see :numref:`Table %s <WW3_ForcingFiles>`.

Expand Down
1 change: 1 addition & 0 deletions modulefiles/ufs_cheyenne.gnu
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ proc ModulesHelp {} {
module-whatis "loads UFS Model prerequisites for Cheyenne/GNU"

module load cmake/3.18.2
module load python/3.7.9

# load programming environment
module load ncarenv/1.3
Expand Down
1 change: 1 addition & 0 deletions modulefiles/ufs_cheyenne.gnu_debug
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ proc ModulesHelp {} {
module-whatis "loads UFS Model prerequisites for Cheyenne/GNU"

module load cmake/3.18.2
module load python/3.7.9

# load programming environment
module load ncarenv/1.3
Expand Down
1 change: 1 addition & 0 deletions modulefiles/ufs_cheyenne.intel
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ proc ModulesHelp {} {
module-whatis "loads UFS Model prerequisites for Cheyenne/Intel"

module load cmake/3.18.2
module load python/3.7.9

# load programming environment
module load ncarenv/1.3
Expand Down
1 change: 1 addition & 0 deletions modulefiles/ufs_cheyenne.intel_debug
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ proc ModulesHelp {} {
module-whatis "loads UFS Model prerequisites for Cheyenne/Intel"

module load cmake/3.18.2
module load python/3.7.9

# load programming environment
module load ncarenv/1.3
Expand Down
1 change: 0 additions & 1 deletion modulefiles/ufs_common
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ module load g2tmpl/1.10.0
module load ip/3.3.3
module load sp/2.3.3
module load w3nco/2.4.1
module load upp/10.0.10

module load gftl-shared/v1.3.3
module load yafyaml/v0.5.1
Expand Down
1 change: 0 additions & 1 deletion modulefiles/ufs_common_debug
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ module load g2tmpl/1.10.0
module load ip/3.3.3
module load sp/2.3.3
module load w3nco/2.4.1
module load upp/10.0.10

module load gftl-shared/v1.3.3
module load yafyaml/v0.5.1
Expand Down
17 changes: 0 additions & 17 deletions modulefiles/ufs_macosx.gnu
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,3 @@ export MPIF90=${MPIF90:-mpif90}
## load cmake
##
export CMAKE_Platform=macosx.gnu

##
## use SIONlib library if installed and environment variable is set
##
SIONLIB=${SIONLIB:-}
if [ ! "x$SIONLIB" == "x" ]; then
echo "Use SIONlib installation in ${SIONLIB}"
export SIONLIB_INC="-I${SIONLIB}/include -I${SIONLIB}/include/mod_64"
export SIONLIB_LIB="-L${SIONLIB}/lib -lsionmpi_f90_64 -lsionser_f90_64 -lsionmpi_64 -lsiongen_64 -lsionser_64 -lsioncom_64 -lsioncom_64_lock_none"
fi

##
## Intel MKL library
##
#export MKL_DIR=${MKL_DIR:-/opt/intel/compilers_and_libraries_2019.4.233/mac/mkl}
#export MKL_INC="-m64 -I${MKL_DIR}/include"
#export MKL_LIB="-L${MKL_DIR}/lib -Wl,-rpath,${MKL_DIR}/lib -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl"
17 changes: 0 additions & 17 deletions modulefiles/ufs_macosx.gnu_debug
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,3 @@ export MPIF90=${MPIF90:-mpif90}
## load cmake
##
export CMAKE_Platform=macosx.gnu

##
## use SIONlib library if installed and environment variable is set
##
SIONLIB=${SIONLIB:-}
if [ ! "x$SIONLIB" == "x" ]; then
echo "Use SIONlib installation in ${SIONLIB}"
export SIONLIB_INC="-I${SIONLIB}/include -I${SIONLIB}/include/mod_64"
export SIONLIB_LIB="-L${SIONLIB}/lib -lsionmpi_f90_64 -lsionser_f90_64 -lsionmpi_64 -lsiongen_64 -lsionser_64 -lsioncom_64 -lsioncom_64_lock_none"
fi

##
## Intel MKL library
##
#export MKL_DIR=${MKL_DIR:-/opt/intel/compilers_and_libraries_2019.4.233/mac/mkl}
#export MKL_INC="-m64 -I${MKL_DIR}/include"
#export MKL_LIB="-L${MKL_DIR}/lib -Wl,-rpath,${MKL_DIR}/lib -lmkl_intel_lp64 -lmkl_sequential -lmkl_core -lpthread -lm -ldl"
24 changes: 24 additions & 0 deletions modulefiles/ufs_macosx.intel
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/bin/bash

#%Module######################################################################
##
## UFS prerequisites: MACOSX with clang/gfortran compilers

echo "Setting environment variables for NEMSfv3gfs on MACOSX with icc/ifort"

##
## load programming environment: compiler, flags, paths
##
export CC=${MPICC:-mpicc}
export CXX=${MPICXX:-mpicxx}
export F77=${MPIF77:-mpif77}
export F90=${MPIF90:-mpif90}
export FC=${MPIFORT:-mpifort}
export CPP=${CPP:-"${F90} -E -x f95-cpp-input"}
export MPICC=${MPICC:-mpicc}
export MPIF90=${MPIF90:-mpif90}

##
## load cmake
##
export CMAKE_Platform=macosx.intel
24 changes: 24 additions & 0 deletions modulefiles/ufs_macosx.intel_debug
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/bin/bash

#%Module######################################################################
##
## UFS prerequisites: MACOSX with clang/gfortran compilers

echo "Setting environment variables for NEMSfv3gfs on MACOSX with icc/ifort"

##
## load programming environment: compiler, flags, paths
##
export CC=${MPICC:-mpicc}
export CXX=${MPICXX:-mpicxx}
export F77=${MPIF77:-mpif77}
export F90=${MPIF90:-mpif90}
export FC=${MPIFORT:-mpifort}
export CPP=${CPP:-"${F90} -E -x f95-cpp-input"}
export MPICC=${MPICC:-mpicc}
export MPIF90=${MPIF90:-mpif90}

##
## load cmake
##
export CMAKE_Platform=macosx.intel
6 changes: 0 additions & 6 deletions modulefiles/ufs_wcoss_cray
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,6 @@ module load sp/2.3.3
module load w3emc/2.7.3
module load w3nco/2.4.1

module load gfsio/1.4.1
module load sfcio/1.4.1
module load sigio/2.3.2

module load upp/10.0.10

## WCOSS Cray execution prereqs:
module load rca
module load alps
Expand Down
6 changes: 0 additions & 6 deletions modulefiles/ufs_wcoss_cray_debug
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,6 @@ module load sp/2.3.3
module load w3emc/2.7.3
module load w3nco/2.4.1

module load gfsio/1.4.1
module load sfcio/1.4.1
module load sigio/2.3.2

module load upp/10.0.10

## WCOSS Cray execution prereqs:
module load rca
module load alps
Expand Down
Loading