Skip to content

rt.sh: ecflow compile jobs, update stampede config, remove cheyenne.pgi, check for GNU compiler version #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DusanJovic-NOAA merged 21 commits into from
Jun 2, 2020
Merged

rt.sh: ecflow compile jobs, update stampede config, remove cheyenne.pgi, check for GNU compiler version #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
55f7cd1
Run compile jobs on compute nodes with ecFlow
DusanJovic-NOAA Mar 19, 2020
791c08d
Merge remote-tracking branch 'origin/develop' into rt_compile_jobs
DusanJovic-NOAA Mar 19, 2020
711e822
Fix ccpp build on compute nodes using ecFlow
DusanJovic-NOAA Mar 21, 2020
ff10341
update modulefiles/hera.intel/fv3
DusanJovic-NOAA Mar 21, 2020
7699ddc
cleanup.
DusanJovic-NOAA Mar 24, 2020
21a6faa
Merge branch 'develop' into rt_compile_jobs
DusanJovic-NOAA Apr 11, 2020
b6799fd
Merge branch 'develop' into rt_compile_jobs
DusanJovic-NOAA Apr 17, 2020
c8b256b
Merge branch 'develop' into rt_compile_jobs
DusanJovic-NOAA Apr 24, 2020
c3363a6
Run compile jobs on compute nodes on Orion
DusanJovic-NOAA Apr 24, 2020
74b976d
Merge branch 'develop' into rt_compile_jobs
DusanJovic-NOAA May 8, 2020
8686a7c
Merge branch 'develop' into rt_compile_jobs
DusanJovic-NOAA May 13, 2020
1e07a04
Update of rt_compile_jobs branch from Dom (cleanup, updates, ...) (#7)
climbfuji May 14, 2020
3599495
checking version of gfortran compiler
edwardhartnett May 27, 2020
3c77171
Merge branch 'rt_compile_jobs' of https://github.com/dusanjovic-noaa/…
climbfuji Jun 1, 2020
aa4ec30
Update submodule pointer for fv3atm
climbfuji Jun 1, 2020
148d78d
Merge branch 'ejh_check_fortran_2' of https://github.com/edwardhartne…
climbfuji Jun 1, 2020
28256be
Regression test logs for hera.intel and orion.intel
climbfuji Jun 1, 2020
47fc93a
tests/rt.sh: write new baseline on cheyenne to WORK instead of SCRATC…
climbfuji Jun 1, 2020
62f3983
Regression test logs for wcoss_cray andd wcoss_dell_p3; increase wall…
climbfuji Jun 1, 2020
84a0af3
New regression test config tests/rt_stampede_cheyenne.conf
climbfuji Jun 1, 2020
a7911a7
Revert change to .gitmodules and update submodule pointers for NEMS a…
climbfuji Jun 1, 2020
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
4 changes: 4 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ add_definitions(-DUSE_COND)
add_definitions(-DNEW_TAUCTMAX)
add_definitions(-DINTERNAL_FILE_NML)

if (CMAKE_Fortran_COMPILER_ID MATCHES "GNU" AND CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 9.0.0)
message(FATAL_ERROR "GNU Compiler >= 9 is required")
endif()

if(CCPP)

find_package(Python 3 QUIET COMPONENTS Interpreter)
Expand Down
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated from 986855 to 37eaf5
2 changes: 1 addition & 1 deletion NEMS
Open in desktop
Submodule NEMS updated 6 files
+6 −0 src/conf/module-setup.csh.inc
+6 −0 src/conf/module-setup.sh.inc
+61 −0 src/incmake/component_CICE6.mk
+1 −0 src/incmake/component_CMEPS.mk
+0 −7 src/incmake/env/cisl/cheyenne.pgi.mk
+16 −0 src/module_EARTH_GRID_COMP.F90
35 changes: 35 additions & 0 deletions cmake/configure_stampede.intel.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
message("")
message("Setting configuration for $ENV{CMAKE_Platform}")
message("")

get_filename_component (C_COMPILER_NAME ${CMAKE_C_COMPILER} NAME)
get_filename_component (CXX_COMPILER_NAME ${CMAKE_CXX_COMPILER} NAME)
get_filename_component (Fortran_COMPILER_NAME ${CMAKE_Fortran_COMPILER} NAME)
message("C compiler: ${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION} (${C_COMPILER_NAME})")
message("CXX compiler: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION} (${CXX_COMPILER_NAME})")
message("Fortran compiler: ${CMAKE_Fortran_COMPILER_ID} ${CMAKE_Fortran_COMPILER_VERSION} (${Fortran_COMPILER_NAME})")
message("")

option(DEBUG "Enable DEBUG mode" OFF)
option(REPRO "Enable REPRO mode" OFF)
option(VERBOSE "Enable VERBOSE mode" OFF)
option(32BIT "Enable 32BIT (single precision arithmetic in dycore)" OFF)
option(OPENMP "Enable OpenMP threading" ON)
option(AVX2 "Enable AVX2 instruction set" ON)

option(INLINE_POST "Enable inline post" OFF)

include( cmake/${CMAKE_Fortran_COMPILER_ID}.cmake )

set(NEMSIO_INC $ENV{NEMSIO_INC})
set(POST_INC $ENV{POST_INC})
set(NCEP_LIBS $ENV{POST_LIB} $ENV{NEMSIO_LIB} $ENV{G2_LIB4} $ENV{G2TMPL_LIB} $ENV{BACIO_LIB4} $ENV{SP_LIBd} $ENV{W3EMC_LIBd} $ENV{W3NCO_LIBd} $ENV{CRTM_LIB} $ENV{PNG_LIB} $ENV{JASPER_LIB} $ENV{Z_LIB})

set(ESMF_MOD ${ESMF_F90COMPILEPATHS})
set(ESMF_LIBS "${ESMF_F90ESMFLINKRPATHS} ${ESMF_F90ESMFLINKPATHS} ${ESMF_F90ESMFLINKLIBS}")

set(NETCDF_INC_DIR $ENV{NETCDF}/include)
set(NETCDF_LIBDIR $ENV{NETCDF}/lib)
set(NETCDF_LIBS -L$ENV{NETCDF}/lib -lnetcdff -lnetcdf)

message("")
8 changes: 0 additions & 8 deletions conf/before_components.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,6 @@ CHOSEN_MODULE=$(BUILD_TARGET)/fv3

CONFIGURE_NEMS_FILE=configure.fv3.$(BUILD_TARGET)

# ----------------------------------------------------------------------
# Exit for systems that are currently not supported
ifeq ($(BUILD_TARGET),theia.pgi)
$(error NEMSfv3gfs currently not supported on $(BUILD_TARGET))
else ifeq ($(BUILD_TARGET),cheyenne.pgi)
$(error NEMSfv3gfs currently not supported on $(BUILD_TARGET))
endif

# ----------------------------------------------------------------------
# Copy the executable and modules.nems files into the tests/ directory
# if a TEST_BUILD_NAME is specified.
Expand Down
193 changes: 0 additions & 193 deletions conf/configure.fv3.cheyenne.pgi
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions conf/configure.fv3.stampede.intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ NETCDF_ROOT = $(NETCDF)
INCLUDE = -I$(NETCDF_ROOT)/include
NETCDF_INC = -I$(NETCDF_ROOT)/include
ifneq ($(findstring netcdf/4,$(LOADEDMODULES)),)
NETCDF_LIB += -L$(NETCDF_ROOT)/lib -lnetcdff -lnetcdf
NETCDF_LIB += -L$(NETCDF)/lib -lnetcdff -lnetcdf
else
NETCDF_LIB += -L$(NETCDF_ROOT)/lib -lnetcdff -lnetcdf
NETCDF_LIB += -L$(NETCDF)/lib -lnetcdff -lnetcdf
endif

FPPFLAGS := -fpp -Wp,-w $(INCLUDE)
Expand Down
Loading