changes

COSIMA · Apr 3, 2024 · 0f9c715 · 0f9c715
1 parent a548e6c
commit 0f9c715
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 9 deletions.
diff --git a/CICE/CICE b/CICE/CICE
diff --git a/CICE/CMakeLists.txt b/CICE/CMakeLists.txt
@@ -127,7 +127,7 @@ target_sources(OM3_cice PRIVATE
   CICE/cicecore/drivers/nuopc/cmeps/CICE_RunMod.F90
   CICE/cicecore/drivers/nuopc/cmeps/cice_wrapper_mod.F90
   CICE/cicecore/drivers/nuopc/cmeps/ice_comp_nuopc.F90
-  CICE/cicecore/drivers/nuopc/cmeps/ice_import_export.F90
+  CICE/cicecore/drivers/access/cmeps/ice_import_export.F90
   CICE/cicecore/drivers/nuopc/cmeps/ice_prescribed_mod.F90
   CICE/cicecore/drivers/nuopc/cmeps/ice_scam.F90
   CICE/cicecore/drivers/nuopc/cmeps/ice_shr_methods.F90

diff --git a/CMEPS/CMEPS b/CMEPS/CMEPS
diff --git a/CMEPS/CMakeLists.txt b/CMEPS/CMakeLists.txt
@@ -26,6 +26,7 @@ target_sources(OM3_cmeps PRIVATE
   CMEPS/mediator/med_constants_mod.F90
   CMEPS/mediator/med_kind_mod.F90
   CMEPS/mediator/esmFldsExchange_nems_mod.F90
+  CMEPS/mediator/esmFldsExchange_access_mod.F90
   CMEPS/mediator/med_phases_prep_lnd_mod.F90
   CMEPS/mediator/med_phases_prep_atm_mod.F90
   CMEPS/mediator/med_phases_prep_ocn_mod.F90

diff --git 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}")
@@ -35,8 +35,8 @@ message(STATUS "  - CICE6-WW3         ${OM3_ENABLE_CICE6-WW3}")
 message(STATUS "  - MOM6-CICE6-WW3    ${OM3_ENABLE_MOM6-CICE6-WW3}")
 
 # Build options
-option(OM3_BIN_INSTALL   "Instal ACCESS-OM3 executables" ${PROJECT_IS_TOP_LEVEL})
-option(OM3_LIB_INSTALL   "Instal ACCESS-OM3 libraries" OFF)
+option(OM3_BIN_INSTALL   "Instal ACCESS-OM3 executables" OFF)
+option(OM3_LIB_INSTALL   "Instal ACCESS-OM3 libraries" ON)
 option(OM3_OPENMP        "Enable OpenMP threading" OFF)
 option(OM3_MOM_SYMMETRIC "Use symmetric memory" OFF)
 set(OM3_CICE_IO   "PIO" CACHE STRING "CICE OPTIONS: Choose IO options.")

diff --git a/MOM6/CMakeLists.txt b/MOM6/CMakeLists.txt
@@ -340,4 +340,5 @@ if(OM3_LIB_INSTALL)
   # way of handling them in CMake
   get_target_property(mom_moddir OM3_mom6 Fortran_MODULE_DIRECTORY)
   install(FILES ${mom_moddir}/ocn_comp_nuopc.mod DESTINATION ${CMAKE_INSTALL_MODULEDIR}/access-mom6)
+  install(FILES ${mom_moddir}/mom_cap_mod.mod DESTINATION ${CMAKE_INSTALL_MODULEDIR}/access-mom6)
 endif()
diff --git a/build.sh b/build.sh
@@ -10,7 +10,7 @@ set -e
 
 SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"  # dir of this script
 
-BUILD_TYPES=('Debug' 'Release')
+BUILD_TYPES=('Release')
 COMPILER_VERSION=2021.6.0
 OPENMPI_VERSION=4.1.4
 
@@ -35,7 +35,7 @@ for BUILD_TYPE in "${BUILD_TYPES[@]}"; do
   rm -r build || true
 
   cmake -S . -B build --preset=gadi -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_VERBOSE_MAKEFILE=ON
-  cmake --build build -j 4
+  cmake --build build -j 8
   cmake --install build --prefix=${INSTALL_DIR}
 
   for exec in ${INSTALL_DIR}/bin/*; do