diff --git a/CDEPS/CDEPS b/CDEPS/CDEPS index 26ab1e0..3c70fc8 160000 --- a/CDEPS/CDEPS +++ b/CDEPS/CDEPS @@ -1 +1 @@ -Subproject commit 26ab1e0acd5b8e0fd527a7e558da026a74f23241 +Subproject commit 3c70fc852aac65ea46c79d727b42d30d97a4a0e0 diff --git a/CDEPS/CMakeLists.txt b/CDEPS/CMakeLists.txt index 4754b0e..68a90f7 100644 --- a/CDEPS/CMakeLists.txt +++ b/CDEPS/CMakeLists.txt @@ -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) diff --git a/CICE/CICE b/CICE/CICE index 8e2aab2..12dd204 160000 --- a/CICE/CICE +++ b/CICE/CICE @@ -1 +1 @@ -Subproject commit 8e2aab217ece5fae933a1f2ad6e0d6ab81ecad8a +Subproject commit 12dd204349090058a66715163932ae3243f9632c diff --git a/CICE/CMakeLists.txt b/CICE/CMakeLists.txt index 1aaa208..25c67cf 100644 --- a/CICE/CMakeLists.txt +++ b/CICE/CMakeLists.txt @@ -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 @@ -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 @@ -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() diff --git a/CICE/patches/ice_comp_nuopc.F90.patch b/CICE/patches/ice_comp_nuopc.F90.patch deleted file mode 100644 index 8fd4e94..0000000 --- a/CICE/patches/ice_comp_nuopc.F90.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/cicecore/drivers/nuopc/cmeps/ice_comp_nuopc.F90 b/cicecore/drivers/nuopc/cmeps/ice_comp_nuopc.F90 -index b94fcff0..af9e4a36 100644 ---- a/cicecore/drivers/nuopc/cmeps/ice_comp_nuopc.F90 -+++ b/cicecore/drivers/nuopc/cmeps/ice_comp_nuopc.F90 -@@ -23,10 +23,10 @@ module ice_comp_nuopc - use ice_domain_size , only : nx_global, ny_global - use ice_grid , only : grid_format, init_grid2 - use ice_communicate , only : init_communicate, my_task, master_task, mpi_comm_ice -- use ice_calendar , only : force_restart_now, write_ic, init_calendar -- use ice_calendar , only : idate, mday, mmonth, myear, year_init -+ use ice_calendar , only : force_restart_now, write_ic -+ use ice_calendar , only : idate, idate0, mday, mmonth, myear, year_init, month_init, day_init - use ice_calendar , only : msec, dt, calendar, calendar_type, nextsw_cday, istep -- use ice_calendar , only : ice_calendar_noleap, ice_calendar_gregorian -+ use ice_calendar , only : ice_calendar_noleap, ice_calendar_gregorian, use_leap_years - use ice_kinds_mod , only : dbl_kind, int_kind, char_len, char_len_long - use ice_fileunits , only : nu_diag, nu_diag_set, inst_index, inst_name - use ice_fileunits , only : inst_suffix, release_all_fileunits, flush_fileunit -@@ -746,7 +746,7 @@ subroutine InitializeRealize(gcomp, importState, exportState, clock, rc) - call cice_init2() - call t_stopf ('cice_init2') - !--------------------------------------------------------------------------- -- ! use EClock to reset calendar information on initial start -+ ! use EClock to reset calendar information - !--------------------------------------------------------------------------- - - ! - on initial run -@@ -762,7 +762,7 @@ subroutine InitializeRealize(gcomp, importState, exportState, clock, rc) - if (ref_ymd /= start_ymd .or. ref_tod /= start_tod) then - if (my_task == master_task) then - write(nu_diag,*) trim(subname),': ref_ymd ',ref_ymd, ' must equal start_ymd ',start_ymd -- write(nu_diag,*) trim(subname),': ref_ymd ',ref_tod, ' must equal start_ymd ',start_tod -+ write(nu_diag,*) trim(subname),': ref_tod',ref_tod, ' must equal start_tod ',start_tod - end if - end if - -@@ -794,6 +794,19 @@ subroutine InitializeRealize(gcomp, importState, exportState, clock, rc) - - end if - -+ ! - start time from ESMF clock. Used to set history time units -+ idate0 = start_ymd -+ year_init = (idate0/10000) -+ month_init= (idate0-year_init*10000)/100 ! integer month of basedate -+ day_init = idate0-year_init*10000-month_init*100 -+ -+ ! - Set use_leap_years based on calendar (as some CICE calls use this instead of the calendar type) -+ if (calendar_type == ice_calendar_gregorian) then -+ use_leap_years = .true. -+ else -+ use_leap_years = .false. ! no_leap calendars -+ endif -+ - call calendar() ! update calendar info - - !---------------------------------------------------------------------------- diff --git a/CICE/patches/ice_mesh_mod.F90.patch b/CICE/patches/ice_mesh_mod.F90.patch deleted file mode 100644 index 932d6fa..0000000 --- a/CICE/patches/ice_mesh_mod.F90.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- ice_mesh_mod.F90.old 2023-08-28 08:55:07.881394000 +1000 -+++ ice_mesh_mod.F90.new 2023-09-18 10:11:53.058232000 +1000 -@@ -668,13 +668,13 @@ - n=0 - do iblk = 1, nblocks - this_block = get_block(blocks_ice(iblk),iblk) -+ ilo = this_block%ilo -+ ihi = this_block%ihi -+ jlo = this_block%jlo -+ jhi = this_block%jhi - do j = jlo, jhi -- jlo = this_block%jlo -- jhi = this_block%jhi - do i = ilo, ihi -- ilo = this_block%ilo -- ihi = this_block%ihi -- n = n+1 -+ n = n + 1 - mask_internal = nint(hm(i,j,iblk),kind=dbl_kind) - mask_file = model_mask(n) - if (mask_internal /= mask_file) then diff --git a/CMEPS/CMEPS b/CMEPS/CMEPS index 98dcf46..ffb5737 160000 --- a/CMEPS/CMEPS +++ b/CMEPS/CMEPS @@ -1 +1 @@ -Subproject commit 98dcf46c8886104b95cddfd5b02588b3dd9f6722 +Subproject commit ffb573791c7670ada8660dbac96c6c84886f62d3 diff --git a/CMEPS/CMakeLists.txt b/CMEPS/CMakeLists.txt index 24dc8a9..e91036b 100644 --- a/CMEPS/CMakeLists.txt +++ b/CMEPS/CMakeLists.txt @@ -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 diff --git a/MOM6/CMakeLists.txt b/MOM6/CMakeLists.txt index e80315e..efd396f 100644 --- a/MOM6/CMakeLists.txt +++ b/MOM6/CMakeLists.txt @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/MOM6/MOM6 b/MOM6/MOM6 index 2e77200..e92c971 160000 --- a/MOM6/MOM6 +++ b/MOM6/MOM6 @@ -1 +1 @@ -Subproject commit 2e77200bff72042bc05e5e5a957274df55493550 +Subproject commit e92c971084e185cfd3902f18072320b45d583a54 diff --git a/WW3/WW3 b/WW3/WW3 index ff7f79c..97740a1 160000 --- a/WW3/WW3 +++ b/WW3/WW3 @@ -1 +1 @@ -Subproject commit ff7f79caccb47fca054b7c6e5bb8b940f354d169 +Subproject commit 97740a1abb36b7ba6e52a7d6f7a37dd06f915633 diff --git a/build.sh b/build.sh index 801f499..0b4733e 100755 --- a/build.sh +++ b/build.sh @@ -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 diff --git a/share/CESM_share b/share/CESM_share index 562025e..cfd5480 160000 --- a/share/CESM_share +++ b/share/CESM_share @@ -1 +1 @@ -Subproject commit 562025e73c588187c8b152190cb5612e54682a76 +Subproject commit cfd54802cb771d5d165803b8acf7712ec5d662b6