Skip to content

Commit

Permalink
Update components to a newer version.
Browse files Browse the repository at this point in the history
  • Loading branch information
micaeljtoliveira committed Aug 28, 2023
1 parent 124de7c commit fa03855
Show file tree
Hide file tree
Showing 15 changed files with 74 additions and 42 deletions.
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "MOM6/MOM6"]
path = MOM6/MOM6
url = https://github.com/NCAR/MOM6.git
[submodule "MOM6/MOM6"]
path = MOM6/MOM6
url = https://github.com/NCAR/MOM6
[submodule "CICE6/CICE6"]
path = CICE/CICE
url = https://github.com/ESCOMP/CICE
Expand Down
2 changes: 1 addition & 1 deletion CDEPS/CDEPS
Submodule CDEPS updated 68 files
+46 −0 .github/actions/buildcdeps/action.yaml
+71 −0 .github/actions/buildesmf/action.yml
+35 −0 .github/actions/buildnetcdff/action.yml
+78 −0 .github/actions/buildpio/action.yml
+30 −0 .github/actions/buildpnetcdf/action.yml
+1 −1 .github/workflows/bumpversion.yml
+80 −94 .github/workflows/extbuild.yml
+4 −0 .gitignore
+53 −33 CMakeLists.txt
+2 −2 README.md
+90 −46 cime_config/buildlib
+15 −7 cime_config/buildlib_comps
+288 −119 cime_config/stream_cdeps.py
+17 −0 cime_config/stream_definition_v2.0.xsd
+14 −4 datm/CMakeLists.txt
+77 −28 datm/atm_comp_nuopc.F90
+13 −3 datm/cime_config/buildnml
+12 −12 datm/cime_config/config_component.xml
+1 −1 datm/cime_config/namelist_definition_datm.xml
+116 −43 datm/cime_config/stream_definition_datm.xml
+13 −9 datm/datm_datamode_cfsr_mod.F90
+19 −9 datm/datm_datamode_clmncep_mod.F90
+2 −2 datm/datm_datamode_cplhist_mod.F90
+15 −10 datm/datm_datamode_era5_mod.F90
+16 −10 datm/datm_datamode_gefs_mod.F90
+14 −4 dice/CMakeLists.txt
+46 −18 dice/ice_comp_nuopc.F90
+14 −4 dlnd/CMakeLists.txt
+38 −17 dlnd/lnd_comp_nuopc.F90
+51 −41 doc/source/conf.py
+113 −39 doc/source/datm.rst
+154 −54 doc/source/design_details.rst
+60 −0 doc/source/dice.rst
+86 −0 doc/source/dlnd.rst
+197 −0 doc/source/docn.rst
+155 −0 doc/source/drof.rst
+67 −0 doc/source/dwav.rst
+273 −0 doc/source/extending.rst
+7 −1 doc/source/index.rst
+92 −17 doc/source/introduction.rst
+259 −127 doc/source/streams.rst
+20 −8 docn/CMakeLists.txt
+58 −9 docn/cime_config/config_component.xml
+39 −26 docn/cime_config/namelist_definition_docn.xml
+38 −5 docn/cime_config/stream_definition_docn.xml
+160 −0 docn/docn_datamode_cplhist_mod.F90
+137 −0 docn/docn_import_data_mod.F90
+78 −22 docn/ocn_comp_nuopc.F90
+13 −3 drof/CMakeLists.txt
+3 −3 drof/cime_config/namelist_definition_drof.xml
+34 −16 drof/rof_comp_nuopc.F90
+1 −2 dshr/CMakeLists.txt
+11 −9 dshr/dshr_dfield_mod.F90
+9 −2 dshr/dshr_fldlist_mod.F90
+60 −42 dshr/dshr_mod.F90
+13 −3 dwav/CMakeLists.txt
+37 −17 dwav/wav_comp_nuopc.F90
+0 −1 share/CMakeLists.txt
+5 −11 share/shr_abort_mod.F90
+4 −3 share/shr_assert_mod.F90.in
+0 −1 share/shr_infnan_mod.F90.in
+40 −24 share/shr_log_mod.F90
+0 −2,217 share/shr_mpi_mod.F90
+15 −12 share/shr_orb_mod.F90
+6 −4 streams/CMakeLists.txt
+2 −2 streams/dshr_methods_mod.F90
+41 −29 streams/dshr_strdata_mod.F90
+10 −3 streams/dshr_stream_mod.F90
2 changes: 2 additions & 0 deletions CDEPS/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,10 @@ list(APPEND cdeps_datm_src_files
list(APPEND cdeps_docn_src_files
CDEPS/docn/docn_datamode_aquaplanet_mod.F90
CDEPS/docn/docn_datamode_copyall_mod.F90
CDEPS/docn/docn_datamode_cplhist_mod.F90
CDEPS/docn/docn_datamode_iaf_mod.F90
CDEPS/docn/docn_datamode_som_mod.F90
CDEPS/docn/docn_import_data_mod.F90
CDEPS/docn/ocn_comp_nuopc.F90
)

Expand Down
2 changes: 1 addition & 1 deletion CICE/CICE
Submodule CICE updated 315 files
4 changes: 2 additions & 2 deletions CICE/cice_files.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ list(APPEND cice_shared_files
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
Expand Down Expand Up @@ -86,8 +88,6 @@ list(APPEND icepack_files
CICE/icepack/columnphysics/icepack_zbgc.F90
CICE/icepack/columnphysics/icepack_zbgc_shared.F90
CICE/icepack/columnphysics/icepack_zsalinity.F90
CICE/icepack/columnphysics/icepack_therm_0layer.F90
CICE/icepack/columnphysics/icepack_meltpond_cesm.F90
)

list(APPEND cice_shared_files_c
Expand Down
2 changes: 1 addition & 1 deletion CMEPS/CMEPS
Submodule CMEPS updated 75 files
+2 −35 .github/pull_request_template.md
+1 −1 .github/workflows/bumpversion.yml
+68 −88 .github/workflows/extbuild.yml
+131 −104 .github/workflows/srt.yml
+24 −0 .pre-commit-config.yaml
+238 −50 cesm/driver/ensemble_driver.F90
+52 −68 cesm/driver/esm.F90
+148 −137 cesm/driver/esm_time_mod.F90
+0 −1 cesm/driver/t_driver_timers_mod.F90
+3 −2 cesm/driver/util.F90
+2 −1 cesm/flux_atmocn/shr_flux_mod.F90
+271 −98 cesm/nuopc_cap_share/driver_pio_mod.F90
+1 −1 cesm/nuopc_cap_share/esm_utils_mod.F90
+27 −18 cesm/nuopc_cap_share/nuopc_shr_methods.F90
+3 −1 cesm/nuopc_cap_share/shr_carma_mod.F90
+7 −4 cesm/nuopc_cap_share/shr_drydep_mod.F90
+92 −74 cesm/nuopc_cap_share/shr_expr_parser_mod.F90
+112 −0 cesm/nuopc_cap_share/shr_lightning_coupling_mod.F90
+23 −17 cesm/nuopc_cap_share/shr_megan_mod.F90
+4 −4 cesm/nuopc_cap_share/shr_ndep_mod.F90
+3 −3 cesm/nuopc_cap_share/shr_ozone_coupling_mod.F90
+6 −0 cime_config/buildexe
+340 −245 cime_config/buildnml
+26 −83 cime_config/config_component.xml
+9 −32 cime_config/config_component_cesm.xml
+167 −52 cime_config/namelist_definition_drv.xml
+14 −1 cime_config/namelist_definition_drv_flds.xml
+2 −1 cime_config/runseq/driver_config.py
+9 −3 cime_config/runseq/runseq_general.py
+33 −1 cime_config/testdefs/testlist_drv.xml
+17 −0 cime_config/testdefs/testmods_dirs/drv/asyncio1node/shell_commands
+22 −0 cime_config/testdefs/testmods_dirs/drv/asyncio1pernode/shell_commands
+1 −1 doc/source/addendum/req_attributes.rst
+8 −8 doc/source/conf.py
+1 −1 doc/source/index.rst
+2 −2 mediator/CMakeLists.txt
+439 −279 mediator/esmFlds.F90
+1,032 −997 mediator/esmFldsExchange_cesm_mod.F90
+32 −40 mediator/esmFldsExchange_hafs_mod.F90
+161 −142 mediator/esmFldsExchange_nems_mod.F90
+20 −1 mediator/fd_cesm.yaml
+126 −104 mediator/med.F90
+39 −49 mediator/med_diag_mod.F90
+2 −5 mediator/med_fraction_mod.F90
+7 −10 mediator/med_internalstate_mod.F90
+173 −248 mediator/med_io_mod.F90
+63 −53 mediator/med_map_mod.F90
+108 −135 mediator/med_merge_mod.F90
+136 −43 mediator/med_methods_mod.F90
+66 −40 mediator/med_phases_aofluxes_mod.F90
+131 −104 mediator/med_phases_history_mod.F90
+23 −26 mediator/med_phases_ocnalb_mod.F90
+2 −2 mediator/med_phases_post_atm_mod.F90
+6 −16 mediator/med_phases_post_glc_mod.F90
+2 −2 mediator/med_phases_post_ice_mod.F90
+1 −1 mediator/med_phases_post_lnd_mod.F90
+1 −1 mediator/med_phases_post_ocn_mod.F90
+2 −2 mediator/med_phases_post_rof_mod.F90
+1 −1 mediator/med_phases_post_wav_mod.F90
+14 −7 mediator/med_phases_prep_atm_mod.F90
+20 −32 mediator/med_phases_prep_glc_mod.F90
+13 −10 mediator/med_phases_prep_ice_mod.F90
+13 −8 mediator/med_phases_prep_lnd_mod.F90
+29 −16 mediator/med_phases_prep_ocn_mod.F90
+37 −34 mediator/med_phases_prep_rof_mod.F90
+10 −6 mediator/med_phases_prep_wav_mod.F90
+7 −5 mediator/med_phases_profile_mod.F90
+37 −40 mediator/med_phases_restart_mod.F90
+2 −3 mediator/med_time_mod.F90
+10 −8 mediator/med_utils_mod.F90
+2 −2 ufs/ccpp/data/MED_typedefs.meta
+5 −5 ufs/flux_atmocn_ccpp_mod.F90
+2 −6 ufs/flux_atmocn_mod.F90
+2 −1 ufs/glc_elevclass_mod.F90
+5 −5 ufs/ufs_io_mod.F90
1 change: 1 addition & 0 deletions MOM6/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ target_include_directories(mom6 PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/MOM6/src/framework>)
target_compile_options(mom6 PRIVATE "$<$<COMPILE_LANGUAGE:Fortran>:${fortran_compile_flags}>")
target_link_libraries(mom6 PUBLIC share
cmeps
FMS::fms_r8
esmf
NetCDF::NetCDF_Fortran)
2 changes: 1 addition & 1 deletion MOM6/MOM6
Submodule MOM6 updated 224 files
8 changes: 7 additions & 1 deletion MOM6/mom6_files.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -162,11 +162,14 @@ list(APPEND mom6_src_files
MOM6/src/parameterizations/CVmix/cvmix_utils.F90

MOM6/src/parameterizations/lateral/MOM_hor_visc.F90
MOM6/src/parameterizations/lateral/MOM_interface_filter.F90
MOM6/src/parameterizations/lateral/MOM_internal_tides.F90
MOM6/src/parameterizations/lateral/MOM_lateral_mixing_coeffs.F90
MOM6/src/parameterizations/lateral/MOM_load_love_numbers.F90
MOM6/src/parameterizations/lateral/MOM_MEKE.F90
MOM6/src/parameterizations/lateral/MOM_MEKE_types.F90
MOM6/src/parameterizations/lateral/MOM_mixed_layer_restrat.F90
MOM6/src/parameterizations/lateral/MOM_spherical_harmonics.F90
MOM6/src/parameterizations/lateral/MOM_thickness_diffuse.F90
MOM6/src/parameterizations/lateral/MOM_tidal_forcing.F90

Expand Down Expand Up @@ -205,7 +208,7 @@ list(APPEND mom6_src_files
MOM6/src/tracer/ISOMIP_tracer.F90
MOM6/src/tracer/MOM_CFC_cap.F90
MOM6/src/tracer/MOM_generic_tracer.F90
MOM6/src/tracer/MOM_lateral_boundary_diffusion.F90
MOM6/src/tracer/MOM_hor_bnd_diffusion.F90
MOM6/src/tracer/MOM_neutral_diffusion.F90
MOM6/src/tracer/MOM_OCMIP2_CFC.F90
MOM6/src/tracer/MOM_offline_aux.F90
Expand Down Expand Up @@ -259,6 +262,9 @@ list(APPEND mom6_src_files
MOM6/src/user/user_initialization.F90
MOM6/src/user/user_revise_forcing.F90

MOM6/config_src/external/database_comms/MOM_database_comms.F90
MOM6/config_src/external/database_comms/database_client_interface.F90

MOM6/config_src/external/drifters/MOM_particles.F90
MOM6/config_src/external/drifters/MOM_particles_types.F90
MOM6/config_src/external/GFDL_ocean_BGC/FMS_coupler_util.F90
Expand Down
7 changes: 4 additions & 3 deletions WW3/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ add_compile_definitions(W3_CESMCOUPLED)
add_compile_definitions(W3_NCO)
add_compile_definitions(W3_DIST)
add_compile_definitions(W3_MPI)
add_compile_definitions(W3_OMPG)
add_compile_definitions(W3_OMPH)
add_compile_definitions(W3_PR3)
add_compile_definitions(W3_UQ)
add_compile_definitions(W3_FLX0)
Expand Down Expand Up @@ -33,9 +31,12 @@ add_compile_definitions(W3_O6)
add_compile_definitions(W3_O7)
add_compile_definitions(W3_O14)
add_compile_definitions(W3_O15)
add_compile_definitions(W3_IC4)
add_compile_definitions(W3_IS0)
add_compile_definitions(W3_REF0)
add_compile_definitions(W3_NOGRB)
add_compile_definitions(W3_IC0)

add_compile_definitions(ENDIANNESS="big_endian")

set_property(SOURCE WW3/model/src/w3initmd.F90
APPEND
Expand Down
2 changes: 1 addition & 1 deletion WW3/WW3
Submodule WW3 updated 1209 files
64 changes: 43 additions & 21 deletions WW3/ww3_files.cmake
Original file line number Diff line number Diff line change
@@ -1,55 +1,77 @@
list(APPEND ww3_src_files
# Common sources
WW3/model/src/constants.F90
WW3/model/src/w3adatmd.F90
WW3/model/src/w3arrymd.F90
WW3/model/src/w3bullmd.F90
WW3/model/src/w3cspcmd.F90
WW3/model/src/w3dispmd.F90
WW3/model/src/w3fld1md.F90
WW3/model/src/w3fld2md.F90
WW3/model/src/w3fldsmd.F90
WW3/model/src/w3flx1md.F90
WW3/model/src/w3gdatmd.F90
WW3/model/src/w3gkemd.F90
WW3/model/src/w3gridmd.F90
WW3/model/src/w3gsrumd.F90
WW3/model/src/w3idatmd.F90
WW3/model/src/w3initmd.F90
WW3/model/src/w3iobcmd.F90
WW3/model/src/w3iogomd.F90
WW3/model/src/w3iogoncdmd.F90
WW3/model/src/w3iogrmd.F90
WW3/model/src/w3iopomd.F90
WW3/model/src/w3iorsmd.F90
WW3/model/src/w3iosfmd.F90
WW3/model/src/w3iotrmd.F90
WW3/model/src/w3meminfo.F90
WW3/model/src/w3macros.h
WW3/model/src/w3metamd.F90
WW3/model/src/w3nmlbouncmd.F90
WW3/model/src/w3nmlboundmd.F90
WW3/model/src/w3nmlgridmd.F90
WW3/model/src/w3nmlmultimd.F90
WW3/model/src/w3nmlounfmd.F90
WW3/model/src/w3nmlounpmd.F90
WW3/model/src/w3nmlprncmd.F90
WW3/model/src/w3nmlshelmd.F90
WW3/model/src/w3nmltrncmd.F90
WW3/model/src/w3nmluprstrmd.F90
WW3/model/src/w3odatmd.F90
WW3/model/src/w3parall.F90
WW3/model/src/w3partmd.F90
WW3/model/src/w3pro3md.F90
WW3/model/src/w3profsmd.F90
WW3/model/src/w3sdb1md.F90
WW3/model/src/w3servmd.F90
WW3/model/src/w3sic4md.F90
WW3/model/src/w3snl1md.F90
WW3/model/src/w3src0md.F90
WW3/model/src/w3src4md.F90
WW3/model/src/w3srcemd.F90
WW3/model/src/w3sbt1md.F90
WW3/model/src/w3str1md.F90
WW3/model/src/w3strkmd.F90
WW3/model/src/w3tidemd.F90
WW3/model/src/w3timemd.F90
WW3/model/src/w3triamd.F90
WW3/model/src/w3uno2md.F90
WW3/model/src/w3updtmd.F90
WW3/model/src/w3uqckmd.F90
WW3/model/src/w3wavemd.F90
WW3/model/src/w3wdasmd.F90
WW3/model/src/w3wdatmd.F90
WW3/model/src/wav_comp_nuopc.F90
WW3/model/src/wmfinlmd.F90
WW3/model/src/wmgridmd.F90
WW3/model/src/wminiomd.F90
WW3/model/src/wminitmd.F90
WW3/model/src/wmiopomd.F90
WW3/model/src/wmmdatmd.F90
WW3/model/src/wmunitmd.F90
WW3/model/src/wmupdtmd.F90
WW3/model/src/wmwavemd.F90
WW3/model/src/w3tidemd.F90
WW3/model/src/wav_grdout.F90
WW3/model/src/wav_import_export.F90
WW3/model/src/w3iogoncdmd.F90
WW3/model/src/wav_shr_flags.F90

# Sources needed for switches
WW3/model/src/w3profsmd.F90
WW3/model/src/w3pro3md.F90
WW3/model/src/w3uqckmd.F90
WW3/model/src/w3fld1md.F90
WW3/model/src/w3fld2md.F90
WW3/model/src/w3src4md.F90
WW3/model/src/w3snl1md.F90
WW3/model/src/w3sbt1md.F90
WW3/model/src/w3sdb1md.F90

# NUOPC cap sources
WW3/model/src/wav_kind_mod.F90
WW3/model/src/wav_shel_inp.F90
WW3/model/src/wav_shr_mod.F90
WW3/model/src/wav_shel_inp.F90
WW3/model/src/wav_comp_nuopc.F90
WW3/model/src/wav_import_export.F90
)
4 changes: 2 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ OPENMPI_VERSION=4.1.4

module purge
module load cmake/3.24.2
module use /g/data/ik11/spack/0.20.1/modules/access-om3/0.1.0/linux-rocky8-x86_64 # requires membership of "ik11" group
module load esmf/8.3.0b09 fms/git.2020.04.03=0.04.03 parallelio/2.5.9
module use /g/data/ik11/spack/0.20.1/modules/access-om3/cesm-0.2.0/linux-rocky8-x86_64 # requires membership of "ik11" group
module load esmf/8.4.2 fms/git.2021.03.01=2021.03.01 parallelio/2.5.10
module load intel-compiler/${COMPILER_VERSION} openmpi/${OPENMPI_VERSION}

cd ${SCRIPT_DIR}
Expand Down
2 changes: 1 addition & 1 deletion share/CESM_share
Submodule CESM_share updated 39 files
+10 −10 .github/workflows/srt.yml
+4 −3 src/shr_file_mod.F90
+52 −36 src/shr_log_mod.F90
+2 −1 src/shr_pio_mod.F90
+4 −3 test/unit/dynamic_vector/CMakeLists.txt
+1 −1 test/unit/dynamic_vector/character16_vector_tests.pf.in
+1 −1 test/unit/dynamic_vector/dynamic_vector_character16.F90
+1 −1 test/unit/dynamic_vector/dynamic_vector_int_ptr.F90
+1 −1 test/unit/dynamic_vector/dynamic_vector_integer.F90
+1 −1 test/unit/dynamic_vector/dynamic_vector_r8.F90
+1 −1 test/unit/dynamic_vector/int_ptr_vector_tests.pf.in
+1 −1 test/unit/dynamic_vector/integer_vector_tests.pf.in
+1 −1 test/unit/dynamic_vector/r8_vector_tests.pf.in
+3 −2 test/unit/shr_abort_test/CMakeLists.txt
+1 −1 test/unit/shr_abort_test/test_shr_abort.pf
+4 −3 test/unit/shr_assert_test/CMakeLists.txt
+1 −1 test/unit/shr_assert_test/test_assert.pf
+1 −1 test/unit/shr_assert_test/test_assert_array.pf
+1 −1 test/unit/shr_assert_test/test_macro.pf
+1 −1 test/unit/shr_assert_test/test_ndebug.pf
+4 −3 test/unit/shr_cal_test/CMakeLists.txt
+1 −1 test/unit/shr_cal_test/test_shr_cal.pf
+4 −3 test/unit/shr_log_test/CMakeLists.txt
+1 −1 test/unit/shr_log_test/test_error_printers.pf
+3 −2 test/unit/shr_precip_test/CMakeLists.txt
+1 −1 test/unit/shr_precip_test/test_shr_precip.pf
+4 −2 test/unit/shr_spfn_test/CMakeLists.txt
+1 −1 test/unit/shr_spfn_test/test_erf_r4.pf
+1 −1 test/unit/shr_spfn_test/test_erf_r8.pf
+1 −1 test/unit/shr_spfn_test/test_gamma_factorial.pf
+1 −1 test/unit/shr_spfn_test/test_igamma.pf
+4 −3 test/unit/shr_strconvert_test/CMakeLists.txt
+1 −1 test/unit/shr_strconvert_test/test_toString.pf
+4 −2 test/unit/shr_string_test/CMakeLists.txt
+1 −1 test/unit/shr_string_test/test_shr_string.pf
+3 −2 test/unit/shr_wv_sat_test/CMakeLists.txt
+1 −1 test/unit/shr_wv_sat_test/test_wv_sat.pf
+1 −1 test/unit/shr_wv_sat_test/test_wv_sat_each_method.pf
+1 −1 unit_test_stubs/util/shr_abort_mod.abortthrows.F90
8 changes: 4 additions & 4 deletions share/src/mct_mod.F90
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
module mct_mod
module m_MCTWorld
implicit none

contains

subroutine mct_world_init(ncomps, globalcomm, mycomms, myids)
subroutine init(ncomps, globalcomm, mycomms, myids)
integer, intent(in) :: ncomps
integer, intent(in) :: globalcomm
integer, dimension(:), pointer :: mycomms
integer, dimension(:), pointer :: myids
end subroutine mct_world_init
end subroutine init

end module mct_mod
end module m_MCTWorld

0 comments on commit fa03855

Please sign in to comment.