From 331aaf8796e8121db185659bc04f2737689ffb31 Mon Sep 17 00:00:00 2001 From: anton-seaice Date: Wed, 14 Aug 2024 16:27:05 +1000 Subject: [PATCH] Remove .h from CICE history output filenames --- CICE/CMakeLists.txt | 2 +- CICE/patches/ice_init.F90.patch | 13 +++++++++++++ CMakeLists.txt | 4 ++-- 3 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 CICE/patches/ice_init.F90.patch diff --git a/CICE/CMakeLists.txt b/CICE/CMakeLists.txt index 637d520..1c5e7c4 100644 --- a/CICE/CMakeLists.txt +++ b/CICE/CMakeLists.txt @@ -61,7 +61,6 @@ target_sources(OM3_cice PRIVATE CICE/cicecore/cicedyn/general/ice_flux_bgc.F90 CICE/cicecore/cicedyn/general/ice_forcing.F90 CICE/cicecore/cicedyn/general/ice_forcing_bgc.F90 - CICE/cicecore/cicedyn/general/ice_init.F90 CICE/cicecore/cicedyn/general/ice_state.F90 CICE/cicecore/cicedyn/general/ice_step_mod.F90 @@ -155,6 +154,7 @@ endif() add_patched_source(OM3_cice CICE/cicecore/cicedyn/infrastructure/ice_domain.F90) add_patched_source(OM3_cice CICE/cicecore/shared/ice_distribution.F90) +add_patched_source(OM3_cice CICE/cicecore/cicedyn/general/ice_init.F90) ### Install and Export diff --git a/CICE/patches/ice_init.F90.patch b/CICE/patches/ice_init.F90.patch new file mode 100644 index 0000000..3f89ccb --- /dev/null +++ b/CICE/patches/ice_init.F90.patch @@ -0,0 +1,13 @@ +diff --git a/cicecore/cicedyn/general/ice_init.F90 b/cicecore/cicedyn/general/ice_init.F90 +index 24ac40db..4ad296aa 100644 +--- a/cicecore/cicedyn/general/ice_init.F90 ++++ b/cicecore/cicedyn/general/ice_init.F90 +@@ -872,7 +872,7 @@ subroutine input_data + ! runid and runtype are obtained from the driver, not from the namelist + + if (my_task == master_task) then +- history_file = trim(runid) // ".cice" // trim(inst_suffix) //".h" ++ history_file = trim(runid) // ".cice" // trim(inst_suffix) + restart_file = trim(runid) // ".cice" // trim(inst_suffix) //".r" + incond_file = trim(runid) // ".cice" // trim(inst_suffix) //".i" + ! Note by tcraig - this if test is needed because the nuopc cap sets diff --git a/CMakeLists.txt b/CMakeLists.txt index 2a1cf87..b236fdc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,8 +22,8 @@ option(OM3_ENABLE_CICE6 "Build CICE6 configuration" OFF) option(OM3_ENABLE_WW3 "Build WW3 configuration" OFF) option(OM3_ENABLE_MOM6-WW3 "Build MOM6-WW3 configuration" OFF) option(OM3_ENABLE_MOM6-CICE6 "Build MOM6-CICE6 configuration" ON) -option(OM3_ENABLE_CICE6-WW3 "Build CICE6-WW3 configuration" ON) -option(OM3_ENABLE_MOM6-CICE6-WW3 "Build MOM6-CICE6-WW3 configuration" ON) +option(OM3_ENABLE_CICE6-WW3 "Build CICE6-WW3 configuration" OFF) +option(OM3_ENABLE_MOM6-CICE6-WW3 "Build MOM6-CICE6-WW3 configuration" OFF) message(STATUS "Configurations") message(STATUS " - MOM6 ${OM3_ENABLE_MOM6}")