For the drivers calling MOM_wave_interface_init,

alperaltuntas · alperaltuntas · commit c880a156a87d · 2021-12-07T16:21:48.000-07:00
add the optional waves_csp arg to initialize_MOM
calls so as to ensure that the waves_csp is allocated.
This commit also has several misc doxygen fixes.
diff --git a/config_src/drivers/FMS_cap/ocean_model_MOM.F90 b/config_src/drivers/FMS_cap/ocean_model_MOM.F90
@@ -276,7 +276,7 @@ subroutine ocean_model_init(Ocean_sfc, OS, Time_init, Time_in, wind_stagger, gas
   OS%Time = Time_in ; OS%Time_dyn = Time_in
   call initialize_MOM(OS%Time, Time_init, param_file, OS%dirs, OS%MOM_CSp, &
                       OS%restart_CSp, Time_in, offline_tracer_mode=OS%offline_tracer_mode, &
-                      diag_ptr=OS%diag, count_calls=.true.)
+                      diag_ptr=OS%diag, count_calls=.true., waves_CSp=OS%Waves)
   call get_MOM_state_elements(OS%MOM_CSp, G=OS%grid, GV=OS%GV, US=OS%US, C_p=OS%C_p, &
                               C_p_scaled=OS%fluxes%C_p, use_temp=use_temperature)
 
diff --git a/config_src/drivers/mct_cap/mom_ocean_model_mct.F90 b/config_src/drivers/mct_cap/mom_ocean_model_mct.F90
@@ -274,7 +274,7 @@ subroutine ocean_model_init(Ocean_sfc, OS, Time_init, Time_in, gas_fields_ocn, i
   call initialize_MOM(OS%Time, Time_init, param_file, OS%dirs, OS%MOM_CSp, &
                       OS%restart_CSp, Time_in, offline_tracer_mode=OS%offline_tracer_mode, &
                       input_restart_file=input_restart_file, &
-                      diag_ptr=OS%diag, count_calls=.true.)
+                      diag_ptr=OS%diag, count_calls=.true., waves_CSp=OS%Waves)
   call get_MOM_state_elements(OS%MOM_CSp, G=OS%grid, GV=OS%GV, US=OS%US, C_p=OS%C_p, &
                               C_p_scaled=OS%fluxes%C_p, use_temp=use_temperature)
 
diff --git a/config_src/drivers/nuopc_cap/mom_cap_methods.F90 b/config_src/drivers/nuopc_cap/mom_cap_methods.F90
@@ -303,7 +303,7 @@ subroutine mom_import(ocean_public, ocean_grid, importState, ice_ocean_boundary,
       if (ChkErr(rc,__LINE__,u_FILE_u)) return
       call state_getimport(importState,'Sw_pstokes_y', isc, iec, jsc, jec, 1, nsc, stky, rc=rc)
       if (ChkErr(rc,__LINE__,u_FILE_u)) return
-  
+
       ! rotate from true zonal/meridional to local coordinates
       do j = jsc, jec
          jg = j + ocean_grid%jsc - jsc
diff --git a/config_src/drivers/solo_driver/MOM_driver.F90 b/config_src/drivers/solo_driver/MOM_driver.F90
@@ -301,11 +301,12 @@ program MOM_main
   if (sum(date) >= 0) then
     call initialize_MOM(Time, Start_time, param_file, dirs, MOM_CSp, restart_CSp, &
                         segment_start_time, offline_tracer_mode=offline_tracer_mode, &
-                        diag_ptr=diag, tracer_flow_CSp=tracer_flow_CSp, ice_shelf_CSp=ice_shelf_CSp)
+                        diag_ptr=diag, tracer_flow_CSp=tracer_flow_CSp, ice_shelf_CSp=ice_shelf_CSp, &
+                        waves_CSp=Waves_CSp)
   else
     call initialize_MOM(Time, Start_time, param_file, dirs, MOM_CSp, restart_CSp, &
                         offline_tracer_mode=offline_tracer_mode, diag_ptr=diag, &
-                        tracer_flow_CSp=tracer_flow_CSp, ice_shelf_CSp=ice_shelf_CSp)
+                        tracer_flow_CSp=tracer_flow_CSp, ice_shelf_CSp=ice_shelf_CSp, waves_CSp=Waves_CSp)
   endif
 
   call get_MOM_state_elements(MOM_CSp, G=grid, GV=GV, US=US, C_p_scaled=fluxes%C_p)
diff --git a/src/user/MOM_wave_interface.F90 b/src/user/MOM_wave_interface.F90
@@ -83,7 +83,6 @@ module MOM_wave_interface
   real, allocatable, dimension(:,:,:), public :: &
     KvS                !< Viscosity for Stokes Drift shear [Z2 T-1 ~> m2 s-1]
 
-  integer, public :: id_PFu_Stokes = -1 , id_PFv_Stokes = -1
   ! The remainder of this control structure is private
   integer :: WaveMethod = -99 !< Options for including wave information
                               !! Valid (tested) choices are:
@@ -187,6 +186,7 @@ module MOM_wave_interface
                                    !! timing of diagnostic output.
 
   !>@{ Diagnostic handles
+  integer, public :: id_PFu_Stokes = -1 , id_PFv_Stokes = -1
   integer :: id_surfacestokes_x = -1 , id_surfacestokes_y = -1
   integer :: id_3dstokes_x = -1 , id_3dstokes_y = -1
   integer :: id_ddt_3dstokes_x = -1 , id_ddt_3dstokes_y = -1
@@ -1775,7 +1775,7 @@ subroutine waves_register_restarts(CS, HI, GV, param_file, restart_CSp)
 
   if (associated(CS)) then
     call MOM_error(FATAL, "waves_register_restarts: Called with initialized waves control structure")
-  endif 
+  endif
   allocate(CS)
 
   call get_param(param_file, mdl, "USE_WAVES", use_waves, &
