Skip to content

Commit

Permalink
Merge pull request #129 from COSIMA/update_components
Browse files Browse the repository at this point in the history
Updated all components to newer versions used in the latest CESM
  • Loading branch information
micaeljtoliveira authored Apr 5, 2024
2 parents 00e4963 + 06a60ab commit 10228ad
Show file tree
Hide file tree
Showing 13 changed files with 85 additions and 158 deletions.
1 change: 1 addition & 0 deletions CDEPS/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ target_sources(OM3_cdeps_datm PRIVATE
CDEPS/datm/datm_datamode_era5_mod.F90
CDEPS/datm/datm_datamode_gefs_mod.F90
CDEPS/datm/datm_datamode_jra_mod.F90
CDEPS/datm/datm_datamode_simple_mod.F90
extra_sources/datm_datamode_jra55do_mod.F90
)
add_patched_source(OM3_cdeps_datm CDEPS/datm/atm_comp_nuopc.F90)
Expand Down
2 changes: 1 addition & 1 deletion CICE/CICE
Submodule CICE updated 220 files
104 changes: 52 additions & 52 deletions CICE/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,44 +36,45 @@ target_sources(OM3_cice PRIVATE
CICE/cicecore/shared/ice_spacecurve.F90

# Analysis
CICE/cicecore/cicedynB/analysis/ice_diagnostics.F90
CICE/cicecore/cicedynB/analysis/ice_diagnostics_bgc.F90
CICE/cicecore/cicedynB/analysis/ice_history.F90
CICE/cicecore/cicedynB/analysis/ice_history_bgc.F90
CICE/cicecore/cicedynB/analysis/ice_history_drag.F90
CICE/cicecore/cicedynB/analysis/ice_history_fsd.F90
CICE/cicecore/cicedynB/analysis/ice_history_mechred.F90
CICE/cicecore/cicedynB/analysis/ice_history_pond.F90
CICE/cicecore/cicedynB/analysis/ice_history_shared.F90
CICE/cicecore/cicedynB/analysis/ice_history_snow.F90
CICE/cicecore/cicedyn/analysis/ice_diagnostics.F90
CICE/cicecore/cicedyn/analysis/ice_diagnostics_bgc.F90
CICE/cicecore/cicedyn/analysis/ice_history.F90
CICE/cicecore/cicedyn/analysis/ice_history_bgc.F90
CICE/cicecore/cicedyn/analysis/ice_history_drag.F90
CICE/cicecore/cicedyn/analysis/ice_history_fsd.F90
CICE/cicecore/cicedyn/analysis/ice_history_mechred.F90
CICE/cicecore/cicedyn/analysis/ice_history_pond.F90
CICE/cicecore/cicedyn/analysis/ice_history_shared.F90
CICE/cicecore/cicedyn/analysis/ice_history_snow.F90

# Dynamics
CICE/cicecore/cicedynB/dynamics/ice_dyn_eap.F90
CICE/cicecore/cicedynB/dynamics/ice_dyn_evp.F90
CICE/cicecore/cicedynB/dynamics/ice_dyn_evp_1d.F90
CICE/cicecore/cicedynB/dynamics/ice_dyn_shared.F90
CICE/cicecore/cicedynB/dynamics/ice_dyn_vp.F90
CICE/cicecore/cicedynB/dynamics/ice_transport_driver.F90
CICE/cicecore/cicedynB/dynamics/ice_transport_remap.F90
CICE/cicecore/cicedyn/dynamics/ice_dyn_core1d.F90
CICE/cicecore/cicedyn/dynamics/ice_dyn_eap.F90
CICE/cicecore/cicedyn/dynamics/ice_dyn_evp.F90
CICE/cicecore/cicedyn/dynamics/ice_dyn_evp1d.F90
CICE/cicecore/cicedyn/dynamics/ice_dyn_shared.F90
CICE/cicecore/cicedyn/dynamics/ice_dyn_vp.F90
CICE/cicecore/cicedyn/dynamics/ice_transport_driver.F90
CICE/cicecore/cicedyn/dynamics/ice_transport_remap.F90

# General
CICE/cicecore/cicedynB/general/ice_flux.F90
CICE/cicecore/cicedynB/general/ice_flux_bgc.F90
CICE/cicecore/cicedynB/general/ice_forcing.F90
CICE/cicecore/cicedynB/general/ice_forcing_bgc.F90
CICE/cicecore/cicedynB/general/ice_init.F90
CICE/cicecore/cicedynB/general/ice_state.F90
CICE/cicecore/cicedynB/general/ice_step_mod.F90
CICE/cicecore/cicedyn/general/ice_flux.F90
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

# Infrastructure
CICE/cicecore/cicedynB/infrastructure/ice_blocks.F90
CICE/cicecore/cicedynB/infrastructure/ice_domain.F90
CICE/cicecore/cicedynB/infrastructure/ice_grid.F90
CICE/cicecore/cicedynB/infrastructure/ice_memusage.F90
CICE/cicecore/cicedynB/infrastructure/ice_memusage_gptl.c
CICE/cicecore/cicedynB/infrastructure/ice_read_write.F90
CICE/cicecore/cicedynB/infrastructure/ice_restart_driver.F90
CICE/cicecore/cicedynB/infrastructure/ice_restoring.F90
CICE/cicecore/cicedyn/infrastructure/ice_blocks.F90
CICE/cicecore/cicedyn/infrastructure/ice_domain.F90
CICE/cicecore/cicedyn/infrastructure/ice_grid.F90
CICE/cicecore/cicedyn/infrastructure/ice_memusage.F90
CICE/cicecore/cicedyn/infrastructure/ice_memusage_gptl.c
CICE/cicecore/cicedyn/infrastructure/ice_read_write.F90
CICE/cicecore/cicedyn/infrastructure/ice_restart_driver.F90
CICE/cicecore/cicedyn/infrastructure/ice_restoring.F90

# Icepack
CICE/icepack/columnphysics/icepack_aerosol.F90
Expand All @@ -95,6 +96,7 @@ target_sources(OM3_cice PRIVATE
CICE/icepack/columnphysics/icepack_ocean.F90
CICE/icepack/columnphysics/icepack_orbital.F90
CICE/icepack/columnphysics/icepack_parameters.F90
CICE/icepack/columnphysics/icepack_shortwave_data.F90
CICE/icepack/columnphysics/icepack_shortwave.F90
CICE/icepack/columnphysics/icepack_snow.F90
CICE/icepack/columnphysics/icepack_therm_bl99.F90
Expand All @@ -107,51 +109,49 @@ target_sources(OM3_cice PRIVATE
CICE/icepack/columnphysics/icepack_wavefracspec.F90
CICE/icepack/columnphysics/icepack_zbgc.F90
CICE/icepack/columnphysics/icepack_zbgc_shared.F90
CICE/icepack/columnphysics/icepack_zsalinity.F90

# Shared C
CICE/cicecore/cicedynB/infrastructure/ice_shr_reprosum86.c
CICE/cicecore/cicedyn/infrastructure/ice_shr_reprosum86.c

# MPI
CICE/cicecore/cicedynB/infrastructure/comm/mpi/ice_boundary.F90
CICE/cicecore/cicedynB/infrastructure/comm/mpi/ice_broadcast.F90
CICE/cicecore/cicedynB/infrastructure/comm/mpi/ice_communicate.F90
CICE/cicecore/cicedynB/infrastructure/comm/mpi/ice_exit.F90
CICE/cicecore/cicedynB/infrastructure/comm/mpi/ice_gather_scatter.F90
CICE/cicecore/cicedynB/infrastructure/comm/mpi/ice_global_reductions.F90
CICE/cicecore/cicedynB/infrastructure/comm/mpi/ice_reprosum.F90
CICE/cicecore/cicedynB/infrastructure/comm/mpi/ice_timers.F90
CICE/cicecore/cicedyn/infrastructure/comm/mpi/ice_boundary.F90
CICE/cicecore/cicedyn/infrastructure/comm/mpi/ice_broadcast.F90
CICE/cicecore/cicedyn/infrastructure/comm/mpi/ice_communicate.F90
CICE/cicecore/cicedyn/infrastructure/comm/mpi/ice_exit.F90
CICE/cicecore/cicedyn/infrastructure/comm/mpi/ice_gather_scatter.F90
CICE/cicecore/cicedyn/infrastructure/comm/mpi/ice_global_reductions.F90
CICE/cicecore/cicedyn/infrastructure/comm/mpi/ice_reprosum.F90
CICE/cicecore/cicedyn/infrastructure/comm/mpi/ice_timers.F90

# NUOPC CMEPS driver
CICE/cicecore/drivers/nuopc/cmeps/CICE_FinalMod.F90
CICE/cicecore/drivers/nuopc/cmeps/CICE_InitMod.F90
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/nuopc/cmeps/ice_mesh_mod.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
)

add_patched_source(OM3_cice CICE/cicecore/drivers/nuopc/cmeps/ice_mesh_mod.F90)
add_patched_source(OM3_cice CICE/cicecore/drivers/nuopc/cmeps/ice_comp_nuopc.F90)

# Select IO source files based on CICE_IO
if(OM3_CICE_IO MATCHES "NetCDF")
target_sources(OM3_cice PRIVATE
CICE/cicecore/cicedynB/infrastructure/io/io_netcdf/ice_history_write.F90
CICE/cicecore/cicedynB/infrastructure/io/io_netcdf/ice_restart.F90
CICE/cicecore/cicedyn/infrastructure/io/io_netcdf/ice_history_write.F90
CICE/cicecore/cicedyn/infrastructure/io/io_netcdf/ice_restart.F90
)
elseif(OM3_CICE_IO MATCHES "PIO")
target_sources(OM3_cice PRIVATE
CICE/cicecore/cicedynB/infrastructure/io/io_pio2/ice_history_write.F90
CICE/cicecore/cicedynB/infrastructure/io/io_pio2/ice_pio.F90
CICE/cicecore/cicedynB/infrastructure/io/io_pio2/ice_restart.F90
CICE/cicecore/cicedyn/infrastructure/io/io_pio2/ice_history_write.F90
CICE/cicecore/cicedyn/infrastructure/io/io_pio2/ice_pio.F90
CICE/cicecore/cicedyn/infrastructure/io/io_pio2/ice_restart.F90
)
elseif(OM3_CICE_IO MATCHES "Binary")
target_sources(OM3_cice PRIVATE
CICE/cicecore/cicedynB/infrastructure/io/io_binary/ice_history_write.F90
CICE/cicecore/cicedynB/infrastructure/io/io_binary/ice_restart.F90
CICE/cicecore/cicedyn/infrastructure/io/io_binary/ice_history_write.F90
CICE/cicecore/cicedyn/infrastructure/io/io_binary/ice_restart.F90
)
endif()

Expand Down
56 changes: 0 additions & 56 deletions CICE/patches/ice_comp_nuopc.F90.patch

This file was deleted.

21 changes: 0 additions & 21 deletions CICE/patches/ice_mesh_mod.F90.patch

This file was deleted.

2 changes: 1 addition & 1 deletion CMEPS/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ target_sources(OM3_cmeps PRIVATE
CMEPS/mediator/med_merge_mod.F90
CMEPS/mediator/med_constants_mod.F90
CMEPS/mediator/med_kind_mod.F90
CMEPS/mediator/esmFldsExchange_nems_mod.F90
CMEPS/mediator/esmFldsExchange_ufs_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
Expand Down
38 changes: 22 additions & 16 deletions MOM6/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ target_sources(OM3_mom6 PRIVATE
MOM6/src/ALE/coord_hycom.F90
MOM6/src/ALE/coord_rho.F90
MOM6/src/ALE/coord_sigma.F90
MOM6/src/ALE/coord_slight.F90
MOM6/src/ALE/coord_zlike.F90
MOM6/src/ALE/MOM_ALE.F90
MOM6/src/ALE/MOM_hybgen_regrid.F90
Expand All @@ -47,6 +46,7 @@ target_sources(OM3_mom6 PRIVATE
MOM6/src/ALE/regrid_edge_values.F90
MOM6/src/ALE/regrid_interp.F90
MOM6/src/ALE/regrid_solvers.F90
MOM6/src/ALE/remapping_attic.F90

MOM6/src/core/MOM_barotropic.F90
MOM6/src/core/MOM_boundary_update.F90
Expand Down Expand Up @@ -83,14 +83,18 @@ target_sources(OM3_mom6 PRIVATE
MOM6/src/diagnostics/MOM_spatial_means.F90
MOM6/src/diagnostics/MOM_sum_output.F90
MOM6/src/diagnostics/MOM_wave_speed.F90
MOM6/src/diagnostics/MOM_wave_structure.F90

MOM6/src/equation_of_state/MOM_EOS.F90
MOM6/src/equation_of_state/MOM_EOS_Jackett06.F90
MOM6/src/equation_of_state/MOM_EOS_linear.F90
MOM6/src/equation_of_state/MOM_EOS_NEMO.F90
MOM6/src/equation_of_state/MOM_EOS_Roquet_rho.F90
MOM6/src/equation_of_state/MOM_EOS_Roquet_SpV.F90
MOM6/src/equation_of_state/MOM_EOS_TEOS10.F90
MOM6/src/equation_of_state/MOM_EOS_UNESCO.F90
MOM6/src/equation_of_state/MOM_EOS_Wright.F90
MOM6/src/equation_of_state/MOM_EOS_Wright_full.F90
MOM6/src/equation_of_state/MOM_EOS_Wright_red.F90
MOM6/src/equation_of_state/MOM_temperature_convert.F90
MOM6/src/equation_of_state/MOM_TFreeze.F90

MOM6/src/equation_of_state/TEOS10/gsw_chem_potential_water_t_exact.f90
Expand Down Expand Up @@ -134,7 +138,6 @@ target_sources(OM3_mom6 PRIVATE
MOM6/src/framework/MOM_data_override.F90
MOM6/src/framework/MOM_diag_mediator.F90
MOM6/src/framework/MOM_diag_remap.F90
MOM6/src/framework/MOM_diag_vkernels.F90
MOM6/src/framework/MOM_document.F90
MOM6/src/framework/MOM_domains.F90
MOM6/src/framework/MOM_dyn_horgrid.F90
Expand All @@ -147,7 +150,9 @@ target_sources(OM3_mom6 PRIVATE
MOM6/src/framework/MOM_interpolate.F90
MOM6/src/framework/MOM_intrinsic_functions.F90
MOM6/src/framework/MOM_io.F90
MOM6/src/framework/MOM_io_file.F90
MOM6/src/framework/MOM_memory_macros.h
MOM6/src/framework/MOM_netcdf.F90
MOM6/src/framework/MOM_random.F90
MOM6/src/framework/MOM_restart.F90
MOM6/src/framework/MOM_safe_alloc.F90
Expand Down Expand Up @@ -197,6 +202,7 @@ target_sources(OM3_mom6 PRIVATE
MOM6/src/parameterizations/lateral/MOM_spherical_harmonics.F90
MOM6/src/parameterizations/lateral/MOM_thickness_diffuse.F90
MOM6/src/parameterizations/lateral/MOM_tidal_forcing.F90
MOM6/src/parameterizations/lateral/MOM_Zanna_Bolton.F90

MOM6/src/parameterizations/stochastic/MOM_stochastics.F90

Expand Down Expand Up @@ -303,18 +309,18 @@ target_sources(OM3_mom6 PRIVATE
MOM6/config_src/external/stochastic_physics/get_stochy_pattern.F90
MOM6/config_src/external/stochastic_physics/stochastic_physics.F90

MOM6/config_src/infra/FMS1/MOM_coms_infra.F90
MOM6/config_src/infra/FMS1/MOM_constants.F90
MOM6/config_src/infra/FMS1/MOM_couplertype_infra.F90
MOM6/config_src/infra/FMS1/MOM_cpu_clock_infra.F90
MOM6/config_src/infra/FMS1/MOM_data_override_infra.F90
MOM6/config_src/infra/FMS1/MOM_diag_manager_infra.F90
MOM6/config_src/infra/FMS1/MOM_domain_infra.F90
MOM6/config_src/infra/FMS1/MOM_ensemble_manager_infra.F90
MOM6/config_src/infra/FMS1/MOM_error_infra.F90
MOM6/config_src/infra/FMS1/MOM_interp_infra.F90
MOM6/config_src/infra/FMS1/MOM_io_infra.F90
MOM6/config_src/infra/FMS1/MOM_time_manager.F90
MOM6/config_src/infra/FMS2/MOM_coms_infra.F90
MOM6/config_src/infra/FMS2/MOM_constants.F90
MOM6/config_src/infra/FMS2/MOM_couplertype_infra.F90
MOM6/config_src/infra/FMS2/MOM_cpu_clock_infra.F90
MOM6/config_src/infra/FMS2/MOM_data_override_infra.F90
MOM6/config_src/infra/FMS2/MOM_diag_manager_infra.F90
MOM6/config_src/infra/FMS2/MOM_domain_infra.F90
MOM6/config_src/infra/FMS2/MOM_ensemble_manager_infra.F90
MOM6/config_src/infra/FMS2/MOM_error_infra.F90
MOM6/config_src/infra/FMS2/MOM_interp_infra.F90
MOM6/config_src/infra/FMS2/MOM_io_infra.F90
MOM6/config_src/infra/FMS2/MOM_time_manager.F90

MOM6/config_src/drivers/nuopc_cap/mom_cap_methods.F90
MOM6/config_src/drivers/nuopc_cap/mom_cap_time.F90
Expand Down
2 changes: 1 addition & 1 deletion MOM6/MOM6
Submodule MOM6 updated 244 files
9 changes: 3 additions & 6 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,15 @@ set -e
SCRIPT_DIR="$(dirname "$(readlink -f "$0")")" # dir of this script

BUILD_TYPES=('Debug' 'Release')
COMPILER_VERSION=2021.6.0
OPENMPI_VERSION=4.1.4


# CMakeLists.txt requires ESMF v8.3.0 or higher, FMS, and ParallelIO, but NCI doesn't supply them, so we use our own installation via spack.
# This is in /g/data/ik11/spack/ which uses https://github.com/COSIMA/spack-config

module purge
module load cmake/3.24.2
module use /g/data/ik11/spack/0.20.1/modules/access-om3/0.x.0/linux-rocky8-cascadelake # requires membership of "ik11" group
module load esmf/8.4.2 fms/git.2021.03.01=2021.03.01 parallelio/2.5.10 fortranxml/4.1.2
module load intel-compiler/${COMPILER_VERSION} openmpi/${OPENMPI_VERSION}
module use /g/data/ik11/spack/0.21.2/modules/access-om3/0.x.0/linux-rocky8-cascadelake # requires membership of "ik11" group
module load esmf/8.5.0 fms/2023.02 parallelio/2.6.2 fortranxml/4.1.2
module load intel-compiler/2021.10.0 openmpi/4.1.5

cd ${SCRIPT_DIR}
for BUILD_TYPE in "${BUILD_TYPES[@]}"; do
Expand Down
2 changes: 1 addition & 1 deletion share/CESM_share

0 comments on commit 10228ad

Please sign in to comment.