squash this commit. Revert US argument in call to init_oda.

NOAA-GFDL · Mar 19, 2021 · 2e60468 · 2e60468
1 parent 6e00221
commit 2e60468
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/core/MOM.F90 b/src/core/MOM.F90
@@ -2796,7 +2796,7 @@ subroutine initialize_MOM(Time, Time_init, param_file, dirs, CS, restart_CSp, &
                       (LEN_TRIM(dirs%input_filename) == 1))
 
   if (CS%ensemble_ocean) then
-    call init_oda(Time, G, GV, US, CS%diag, CS%odaCS)
+    call init_oda(Time, G, GV, CS%diag, CS%odaCS)
   endif
 
   !### This could perhaps go here instead of in finish_MOM_initialization?

diff --git a/src/ocean_data_assim/MOM_oda_driver.F90 b/src/ocean_data_assim/MOM_oda_driver.F90
@@ -143,12 +143,11 @@ module MOM_oda_driver_mod
 
 !> initialize First_guess (prior) and Analysis grid
 !! information for all ensemble members
-subroutine init_oda(Time, G, GV, US, diag_CS, CS)
+subroutine init_oda(Time, G, GV, diag_CS, CS)
 
   type(time_type), intent(in) :: Time !< The current model time.
   type(ocean_grid_type), pointer :: G !< domain and grid information for ocean model
   type(verticalGrid_type), intent(in) :: GV   !< The ocean's vertical grid structure
-  type(unit_scale_type), pointer :: US !< A pointer to a unit scaling type.
   type(diag_ctrl), target, intent(inout) :: diag_CS !< A pointer to a diagnostic control structure
   type(ODA_CS), pointer, intent(inout) :: CS  !< The DA control structure
 
@@ -190,7 +189,6 @@ subroutine init_oda(Time, G, GV, US, diag_CS, CS)
 ! if it were desirable to have alternate parameters, e.g. for the grid
 ! for the analysis
   call get_MOM_input(PF,dirs,ensemble_num=0)
-  CS%US=>US
   call unit_scaling_init(PF, CS%US)
 
   call get_param(PF, "MOM", "ASSIM_METHOD", assim_method,  &