Sync all git submodules to match the versions found in the CESM versi…

…on used for tests.

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "MOM6/MOM6"]
 	path = MOM6/MOM6
-	url = https://github.com/mom-ocean/MOM6
+	url = https://github.com/NCAR/MOM6.git
 [submodule "CICE6/CICE6"]
 	path = CICE/CICE
 	url = https://github.com/ESCOMP/CICE

MOM6/mom6_files.cmake

@@ -1,71 +1,71 @@
 list(APPEND mom6_src_files
-  MOM6/src/ALE/MOM_ALE.F90
-  MOM6/src/ALE/MOM_regridding.F90
-  MOM6/src/ALE/MOM_remapping.F90
-  MOM6/src/ALE/P1M_functions.F90
-  MOM6/src/ALE/P3M_functions.F90
-  MOM6/src/ALE/PCM_functions.F90
-  MOM6/src/ALE/PLM_functions.F90
-  MOM6/src/ALE/PPM_functions.F90
-  MOM6/src/ALE/PQM_functions.F90
   MOM6/src/ALE/coord_adapt.F90
   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
   MOM6/src/ALE/MOM_hybgen_remap.F90
   MOM6/src/ALE/MOM_hybgen_unmix.F90
+  MOM6/src/ALE/MOM_regridding.F90
+  MOM6/src/ALE/MOM_remapping.F90
+  MOM6/src/ALE/P1M_functions.F90
+  MOM6/src/ALE/P3M_functions.F90
+  MOM6/src/ALE/PCM_functions.F90
+  MOM6/src/ALE/PLM_functions.F90
   MOM6/src/ALE/polynomial_functions.F90
+  MOM6/src/ALE/PPM_functions.F90
+  MOM6/src/ALE/PQM_functions.F90
   MOM6/src/ALE/regrid_consts.F90
   MOM6/src/ALE/regrid_edge_values.F90
   MOM6/src/ALE/regrid_interp.F90
   MOM6/src/ALE/regrid_solvers.F90
 
-  MOM6/src/core/MOM.F90
-  MOM6/src/core/MOM_CoriolisAdv.F90
-  MOM6/src/core/MOM_PressureForce.F90
-  MOM6/src/core/MOM_PressureForce_Montgomery.F90
-  MOM6/src/core/MOM_PressureForce_FV.F90
   MOM6/src/core/MOM_barotropic.F90
   MOM6/src/core/MOM_boundary_update.F90
-  MOM6/src/core/MOM_checksum_packages.F90
   MOM6/src/core/MOM_check_scaling.F90
+  MOM6/src/core/MOM_checksum_packages.F90
   MOM6/src/core/MOM_continuity.F90
   MOM6/src/core/MOM_continuity_PPM.F90
+  MOM6/src/core/MOM_CoriolisAdv.F90
   MOM6/src/core/MOM_density_integrals.F90
   MOM6/src/core/MOM_dynamics_split_RK2.F90
   MOM6/src/core/MOM_dynamics_unsplit.F90
   MOM6/src/core/MOM_dynamics_unsplit_RK2.F90
+  MOM6/src/core/MOM.F90
   MOM6/src/core/MOM_forcing_type.F90
   MOM6/src/core/MOM_grid.F90
   MOM6/src/core/MOM_interface_heights.F90
   MOM6/src/core/MOM_isopycnal_slopes.F90
   MOM6/src/core/MOM_open_boundary.F90
   MOM6/src/core/MOM_porous_barriers.F90
+  MOM6/src/core/MOM_PressureForce.F90
+  MOM6/src/core/MOM_PressureForce_FV.F90
+  MOM6/src/core/MOM_PressureForce_Montgomery.F90
   MOM6/src/core/MOM_stoch_eos.F90
   MOM6/src/core/MOM_transcribe_grid.F90
   MOM6/src/core/MOM_unit_tests.F90
   MOM6/src/core/MOM_variables.F90
   MOM6/src/core/MOM_verticalGrid.F90
 
-  MOM6/src/diagnostics/MOM_PointAccel.F90
   MOM6/src/diagnostics/MOM_debugging.F90
-  MOM6/src/diagnostics/MOM_spatial_means.F90
   MOM6/src/diagnostics/MOM_diagnostics.F90
   MOM6/src/diagnostics/MOM_obsolete_diagnostics.F90
   MOM6/src/diagnostics/MOM_obsolete_params.F90
+  MOM6/src/diagnostics/MOM_PointAccel.F90
+  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_linear.F90
   MOM6/src/equation_of_state/MOM_EOS_NEMO.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_linear.F90
   MOM6/src/equation_of_state/MOM_TFreeze.F90
 
   MOM6/src/equation_of_state/TEOS10/gsw_chem_potential_water_t_exact.f90
@@ -92,10 +92,10 @@ list(APPEND mom6_src_files
   MOM6/src/equation_of_state/TEOS10/gsw_rho_first_derivatives.f90
   MOM6/src/equation_of_state/TEOS10/gsw_rho_second_derivatives.f90
   MOM6/src/equation_of_state/TEOS10/gsw_sp_from_sr.f90
+  MOM6/src/equation_of_state/TEOS10/gsw_sr_from_sp.f90
   MOM6/src/equation_of_state/TEOS10/gsw_specvol.f90
   MOM6/src/equation_of_state/TEOS10/gsw_specvol_first_derivatives.f90
   MOM6/src/equation_of_state/TEOS10/gsw_specvol_second_derivatives.f90
-  MOM6/src/equation_of_state/TEOS10/gsw_sr_from_sp.f90
   MOM6/src/equation_of_state/TEOS10/gsw_t_deriv_chem_potential_water_t_exact.f90
   MOM6/src/equation_of_state/TEOS10/gsw_t_freezing_exact.f90
   MOM6/src/equation_of_state/TEOS10/gsw_t_freezing_poly.f90
@@ -122,20 +122,19 @@ list(APPEND mom6_src_files
   MOM6/src/framework/MOM_interpolate.F90
   MOM6/src/framework/MOM_intrinsic_functions.F90
   MOM6/src/framework/MOM_io.F90
-  MOM6/src/framework/posix.F90
+  MOM6/src/framework/MOM_memory_macros.h
   MOM6/src/framework/MOM_random.F90
   MOM6/src/framework/MOM_restart.F90
   MOM6/src/framework/MOM_safe_alloc.F90
   MOM6/src/framework/MOM_string_functions.F90
-  MOM6/src/framework/MOM_unit_scaling.F90
   MOM6/src/framework/MOM_unique_scales.F90
-  MOM6/src/framework/MOM_unit_testing.F90
+  MOM6/src/framework/MOM_unit_scaling.F90
   MOM6/src/framework/MOM_write_cputime.F90
-  MOM6/src/framework/testing/MOM_file_parser_tests.F90
+  MOM6/src/framework/posix.F90
 
-  MOM6/src/ice_shelf/MOM_ice_shelf.F90
   MOM6/src/ice_shelf/MOM_ice_shelf_diag_mediator.F90
   MOM6/src/ice_shelf/MOM_ice_shelf_dynamics.F90
+  MOM6/src/ice_shelf/MOM_ice_shelf.F90
   MOM6/src/ice_shelf/MOM_ice_shelf_initialize.F90
   MOM6/src/ice_shelf/MOM_ice_shelf_state.F90
   MOM6/src/ice_shelf/MOM_marine_ice.F90
@@ -148,25 +147,38 @@ list(APPEND mom6_src_files
   MOM6/src/initialization/MOM_state_initialization.F90
   MOM6/src/initialization/MOM_tracer_initialization_from_Z.F90
 
-  MOM6/src/parameterizations/lateral/MOM_MEKE.F90
-  MOM6/src/parameterizations/lateral/MOM_MEKE_types.F90
+  MOM6/src/ocean_data_assim/MOM_oda_driver.F90
+  MOM6/src/ocean_data_assim/MOM_oda_incupd.F90
+
+  MOM6/src/parameterizations/CVmix/cvmix_background.F90
+  MOM6/src/parameterizations/CVmix/cvmix_convection.F90
+  MOM6/src/parameterizations/CVmix/cvmix_ddiff.F90
+  MOM6/src/parameterizations/CVmix/cvmix_kinds_and_types.F90
+  MOM6/src/parameterizations/CVmix/cvmix_kpp.F90
+  MOM6/src/parameterizations/CVmix/cvmix_math.F90
+  MOM6/src/parameterizations/CVmix/cvmix_put_get.F90
+  MOM6/src/parameterizations/CVmix/cvmix_shear.F90
+  MOM6/src/parameterizations/CVmix/cvmix_tidal.F90
+  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_load_love_numbers.F90
   MOM6/src/parameterizations/lateral/MOM_lateral_mixing_coeffs.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
 
+  MOM6/src/parameterizations/stochastic/MOM_stochastics.F90
+
   MOM6/src/parameterizations/vertical/MOM_ALE_sponge.F90
-  MOM6/src/parameterizations/vertical/MOM_CVMix_KPP.F90
+  MOM6/src/parameterizations/vertical/MOM_bkgnd_mixing.F90
+  MOM6/src/parameterizations/vertical/MOM_bulk_mixed_layer.F90
   MOM6/src/parameterizations/vertical/MOM_CVMix_conv.F90
   MOM6/src/parameterizations/vertical/MOM_CVMix_ddiff.F90
+  MOM6/src/parameterizations/vertical/MOM_CVMix_KPP.F90
   MOM6/src/parameterizations/vertical/MOM_CVMix_shear.F90
-  MOM6/src/parameterizations/vertical/MOM_bkgnd_mixing.F90
-  MOM6/src/parameterizations/vertical/MOM_bulk_mixed_layer.F90
   MOM6/src/parameterizations/vertical/MOM_diabatic_aux.F90
   MOM6/src/parameterizations/vertical/MOM_diabatic_driver.F90
   MOM6/src/parameterizations/vertical/MOM_diapyc_energy_req.F90
@@ -184,74 +196,59 @@ list(APPEND mom6_src_files
   MOM6/src/parameterizations/vertical/MOM_tidal_mixing.F90
   MOM6/src/parameterizations/vertical/MOM_vert_friction.F90
 
-  MOM6/src/parameterizations/CVmix/cvmix_background.F90
-  MOM6/src/parameterizations/CVmix/cvmix_convection.F90
-  MOM6/src/parameterizations/CVmix/cvmix_ddiff.F90
-  MOM6/src/parameterizations/CVmix/cvmix_kinds_and_types.F90
-  MOM6/src/parameterizations/CVmix/cvmix_kpp.F90
-  MOM6/src/parameterizations/CVmix/cvmix_math.F90
-  MOM6/src/parameterizations/CVmix/cvmix_put_get.F90
-  MOM6/src/parameterizations/CVmix/cvmix_shear.F90
-  MOM6/src/parameterizations/CVmix/cvmix_tidal.F90
-  MOM6/src/parameterizations/CVmix/cvmix_utils.F90
-
-  MOM6/src/parameterizations/stochastic/MOM_stochastics.F90
-
+  MOM6/src/tracer/advection_test_tracer.F90
+  MOM6/src/tracer/boundary_impulse_tracer.F90
   MOM6/src/tracer/DOME_tracer.F90
-
+  MOM6/src/tracer/dyed_obc_tracer.F90
+  MOM6/src/tracer/dye_example.F90
+  MOM6/src/tracer/ideal_age_example.F90
   MOM6/src/tracer/ISOMIP_tracer.F90
-
-  MOM6/src/tracer/MOM_OCMIP2_CFC.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_neutral_diffusion.F90
-  MOM6/src/tracer/nw2_tracers.F90
+  MOM6/src/tracer/MOM_OCMIP2_CFC.F90
   MOM6/src/tracer/MOM_offline_aux.F90
   MOM6/src/tracer/MOM_offline_main.F90
-  MOM6/src/tracer/MOM_tracer_Z_init.F90
   MOM6/src/tracer/MOM_tracer_advect.F90
   MOM6/src/tracer/MOM_tracer_diabatic.F90
   MOM6/src/tracer/MOM_tracer_flow_control.F90
   MOM6/src/tracer/MOM_tracer_hor_diff.F90
   MOM6/src/tracer/MOM_tracer_registry.F90
   MOM6/src/tracer/MOM_tracer_types.F90
-  MOM6/src/tracer/RGC_tracer.F90
-  MOM6/src/tracer/advection_test_tracer.F90
-  MOM6/src/tracer/boundary_impulse_tracer.F90
-  MOM6/src/tracer/dye_example.F90
-  MOM6/src/tracer/dyed_obc_tracer.F90
-  MOM6/src/tracer/ideal_age_example.F90
+  MOM6/src/tracer/MOM_tracer_Z_init.F90
+  MOM6/src/tracer/nw2_tracers.F90
   MOM6/src/tracer/oil_tracer.F90
   MOM6/src/tracer/pseudo_salt_tracer.F90
+  MOM6/src/tracer/RGC_tracer.F90
   MOM6/src/tracer/tracer_example.F90
-  MOM6/src/tracer/MOM_CFC_cap.F90
 
+  MOM6/src/user/adjustment_initialization.F90
+  MOM6/src/user/baroclinic_zone_initialization.F90
+  MOM6/src/user/basin_builder.F90
+  MOM6/src/user/benchmark_initialization.F90
   MOM6/src/user/BFB_initialization.F90
   MOM6/src/user/BFB_surface_forcing.F90
+  MOM6/src/user/circle_obcs_initialization.F90
+  MOM6/src/user/dense_water_initialization.F90
   MOM6/src/user/DOME2d_initialization.F90
   MOM6/src/user/DOME_initialization.F90
-  MOM6/src/user/ISOMIP_initialization.F90
+  MOM6/src/user/dumbbell_initialization.F90
+  MOM6/src/user/dumbbell_surface_forcing.F90
+  MOM6/src/user/dyed_channel_initialization.F90
+  MOM6/src/user/dyed_obcs_initialization.F90
+  MOM6/src/user/external_gwave_initialization.F90
   MOM6/src/user/Idealized_Hurricane.F90
+  MOM6/src/user/ISOMIP_initialization.F90
   MOM6/src/user/Kelvin_initialization.F90
+  MOM6/src/user/lock_exchange_initialization.F90
   MOM6/src/user/MOM_controlled_forcing.F90
   MOM6/src/user/MOM_wave_interface.F90
   MOM6/src/user/Neverworld_initialization.F90
   MOM6/src/user/Phillips_initialization.F90
   MOM6/src/user/RGC_initialization.F90
   MOM6/src/user/Rossby_front_2d_initialization.F90
   MOM6/src/user/SCM_CVMix_tests.F90
-  MOM6/src/user/adjustment_initialization.F90
-  MOM6/src/user/basin_builder.F90
-  MOM6/src/user/baroclinic_zone_initialization.F90
-  MOM6/src/user/benchmark_initialization.F90
-  MOM6/src/user/circle_obcs_initialization.F90
-  MOM6/src/user/dense_water_initialization.F90
-  MOM6/src/user/dumbbell_initialization.F90
-  MOM6/src/user/dumbbell_surface_forcing.F90
-  MOM6/src/user/dyed_channel_initialization.F90
-  MOM6/src/user/dyed_obcs_initialization.F90
-  MOM6/src/user/external_gwave_initialization.F90
-  MOM6/src/user/lock_exchange_initialization.F90
   MOM6/src/user/seamount_initialization.F90
   MOM6/src/user/shelfwave_initialization.F90
   MOM6/src/user/sloshing_initialization.F90
@@ -262,22 +259,18 @@ list(APPEND mom6_src_files
   MOM6/src/user/user_initialization.F90
   MOM6/src/user/user_revise_forcing.F90
 
-  MOM6/src/ocean_data_assim/MOM_oda_driver.F90
-  MOM6/src/ocean_data_assim/MOM_oda_incupd.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
   MOM6/config_src/external/GFDL_ocean_BGC/generic_tracer.F90
   MOM6/config_src/external/GFDL_ocean_BGC/generic_tracer_utils.F90
   MOM6/config_src/external/ODA_hooks/kdtree.f90
   MOM6/config_src/external/ODA_hooks/ocean_da_core.F90
   MOM6/config_src/external/ODA_hooks/ocean_da_types.F90
   MOM6/config_src/external/ODA_hooks/write_ocean_obs.F90
-  MOM6/config_src/external/drifters/MOM_particles.F90
-  MOM6/config_src/external/drifters/MOM_particles_types.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/stochastic_physics/stochastic_physics.F90
+
   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
@@ -293,13 +286,12 @@ list(APPEND mom6_src_files
   MOM6/config_src/infra/FMS1/MOM_time_manager.F90
 
   MOM6/config_src/drivers/nuopc_cap/mom_cap.F90
-  MOM6/config_src/drivers/nuopc_cap/ocn_comp_NUOPC.F90
-  MOM6/config_src/drivers/nuopc_cap/time_utils.F90
   MOM6/config_src/drivers/nuopc_cap/mom_cap_methods.F90
   MOM6/config_src/drivers/nuopc_cap/mom_cap_time.F90
   MOM6/config_src/drivers/nuopc_cap/mom_ocean_model_nuopc.F90
   MOM6/config_src/drivers/nuopc_cap/mom_surface_forcing_nuopc.F90
-  MOM6/config_src/drivers/unit_tests/MOM_unit_test_driver.F90
+  MOM6/config_src/drivers/nuopc_cap/ocn_comp_NUOPC.F90
+  MOM6/config_src/drivers/nuopc_cap/time_utils.F90
 )
 
 list(APPEND mom6_solo_src_files

WW3/CMakeLists.txt

@@ -52,7 +52,6 @@ add_compile_definitions(W3_O15)
 add_compile_definitions(W3_IC4)
 add_compile_definitions(W3_IS0)
 add_compile_definitions(W3_REF0)
-add_compile_definitions(ENDIANNESS="big_endian")
 
 set_property(SOURCE WW3/model/src/w3initmd.F90
   APPEND

WW3/ww3_files.cmake

@@ -22,7 +22,6 @@ list(APPEND ww3_src_files
   WW3/model/src/w3iosfmd.F90
   WW3/model/src/w3iotrmd.F90
   WW3/model/src/w3meminfo.F90
-  WW3/model/src/w3nmlshelmd.F90
   WW3/model/src/w3odatmd.F90
   WW3/model/src/w3parall.F90
   WW3/model/src/w3partmd.F90
@@ -47,12 +46,10 @@ list(APPEND ww3_src_files
   WW3/model/src/w3wavemd.F90
   WW3/model/src/w3wdasmd.F90
   WW3/model/src/w3wdatmd.F90
-  WW3/model/src/wmmdatmd.F90
   WW3/model/src/wav_comp_nuopc.F90
   WW3/model/src/wav_grdout.F90
   WW3/model/src/wav_import_export.F90
   WW3/model/src/wav_kind_mod.F90
   WW3/model/src/wav_shel_inp.F90
-  WW3/model/src/wav_shr_flags.F90
   WW3/model/src/wav_shr_mod.F90
 )