Skip to content

Commit

Permalink
Update CICE, use -init=snan,arrays for Intel debug (ufs-community#935)
Browse files Browse the repository at this point in the history 
Updates CICE for the latest Consortium main. See CICE Issue ufs-community#44 for a list of updates included. In particular, this PR will update the icepack submodule to include a fix which allows -init=snan,arrays to be used in debug mode.
  • Loading branch information
@DeniseWorthen
DeniseWorthen authored Dec 15, 2021
1 parent 64fe240 commit 194f044
Show file tree
Hide file tree
Showing 19 changed files with 2,746 additions and 2,777 deletions.
2 changes: 1 addition & 1 deletion CDEPS-interface/CMakeLists.txt
View file
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 53 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
+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
View file
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
View file
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
2 changes: 1 addition & 1 deletion HYCOM-interface/CMakeLists.txt
View file
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
View file
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
2 changes: 1 addition & 1 deletion cmake/Intel.cmake
View file
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 Down
232 changes: 116 additions & 116 deletions tests/RegressionTests_cheyenne.gnu.log
View file

Large diffs are not rendered by default.

819 changes: 399 additions & 420 deletions tests/RegressionTests_cheyenne.intel.log
View file

Large diffs are not rendered by default.

708 changes: 355 additions & 353 deletions tests/RegressionTests_gaea.intel.log
View file

Large diffs are not rendered by default.

234 changes: 116 additions & 118 deletions tests/RegressionTests_hera.gnu.log
View file

Large diffs are not rendered by default.

722 changes: 361 additions & 361 deletions tests/RegressionTests_hera.intel.log
View file

Large diffs are not rendered by default.

662 changes: 331 additions & 331 deletions tests/RegressionTests_jet.intel.log
View file

Large diffs are not rendered by default.

704 changes: 352 additions & 352 deletions tests/RegressionTests_orion.intel.log
View file

Large diffs are not rendered by default.

456 changes: 228 additions & 228 deletions tests/RegressionTests_wcoss_cray.log
View file

Large diffs are not rendered by default.

963 changes: 476 additions & 487 deletions tests/RegressionTests_wcoss_dell_p3.log
View file

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion tests/parm/ice_in_template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@
mu_rdg = 3
Cf = 17.
Ktens = 0.
e_ratio = 2.
e_yieldcurve = 2.
e_plasticpot = 2.
coriolis = 'latitude'
kridge = 1
ktransport = 1
Expand Down
4 changes: 2 additions & 2 deletions tests/rt.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN | cpld_mpi_p7
RUN | cpld_bmark_p7 | - wcoss_cray | fv3 |
RUN | cpld_bmark_mpi_p7 | - wcoss_cray | |

# Waves off for restart and debug tests
# Waves off for restart and debug tests
RUN | cpld_control_c96_p7 | - wcoss_cray | fv3 |
RUN | cpld_restart_c96_p7 | - wcoss_cray | | cpld_control_c96_p7

Expand Down Expand Up @@ -140,7 +140,7 @@ RUN | rrfs_v1beta_debug

COMPILE | -DAPP=ATM -DCCPP_SUITES=FV3_HAFS_v0_hwrf_thompson -DDEBUG=ON | | fv3 |
RUN | fv3_HAFS_v0_hwrf_thompson_debug | | fv3 |
RUN | fv3_esg_HAFS_v0_hwrf_thompson_debug | | fv3 |
RUN | fv3_esg_HAFS_v0_hwrf_thompson_debug | -cheyenne.intel | fv3 |

###################################################################################################################################################################################
# HAFS tests #
Expand Down
2 changes: 1 addition & 1 deletion tests/rt.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
TEST_35D=true
fi

BL_DATE=20211213
BL_DATE=20211214
if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]] || [[ $MACHINE_ID = s4.* ]]; then
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
else
Expand Down

0 comments on commit 194f044

Please sign in to comment.