Skip to content

Commit 60d37f3

Browse files
Theresa MorrisonTheresa Morrison
Theresa Morrison
authored and
Theresa Morrison
committed
Remove eqn_of_state from generic tracer routines
Remove eqn_of_state from generic tracer interfaces because the photoacclimation mixed layer depth is now calculated in MOM6 and passed to MOM6.
1 parent d54abce commit 60d37f3

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

config_src/external/GFDL_ocean_BGC/generic_tracer.F90

+1-2
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ end subroutine generic_tracer_coupler_accumulate
7070
!> Calls the corresponding generic_X_update_from_source routine for each package X
7171
subroutine generic_tracer_source(Temp,Salt,rho_dzt,dzt,hblt_depth,ilb,jlb,tau,dtts,&
7272
grid_dat,model_time,nbands,max_wavelength_band,sw_pen_band,opacity_band,internal_heat,&
73-
frunoff,grid_ht, current_wave_stress, sosga, geolat, eqn_of_state, photo_acc_dpth)
73+
frunoff,grid_ht, current_wave_stress, sosga, geolat, photo_acc_dpth)
7474
integer, intent(in) :: ilb !< Lower bounds of x extent of input arrays on data domain
7575
integer, intent(in) :: jlb !< Lower bounds of y extent of input arrays on data domain
7676
real, dimension(ilb:,jlb:,:), intent(in) :: Temp !< Potential temperature [deg C]
@@ -97,7 +97,6 @@ subroutine generic_tracer_source(Temp,Salt,rho_dzt,dzt,hblt_depth,ilb,jlb,tau,dt
9797
real, dimension(ilb:,jlb:),optional , intent(in) :: current_wave_stress !< Unknown, and presently unused by MOM6
9898
real, optional , intent(in) :: sosga !< Global average sea surface salinity [ppt]
9999
real, dimension(ilb:,jlb:),optional, intent(in) :: geolat !< Latitude
100-
type(EOS_type), optional, intent(in) :: eqn_of_state !< A pointer to the equation of state
101100
real, dimension(ilb:,jlb:), optional, intent(in) :: photo_acc_dpth
102101
end subroutine generic_tracer_source
103102

src/tracer/MOM_generic_tracer.F90

+3-3
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ subroutine MOM_generic_tracer_column_physics(h_old, h_new, ea, eb, fluxes, Hml,
640640
call generic_tracer_source(tv%T, tv%S, rho_dzt, dzt, dz_ml, G%isd, G%jsd, 1, dt, &
641641
G%areaT, get_diag_time_end(CS%diag), &
642642
optics%nbands, optics%max_wavelength_band, optics%sw_pen_band, optics%opacity_band, &
643-
internal_heat=tv%internal_heat, frunoff=fluxes%frunoff, sosga=sosga, geolat=G%geolatT, eqn_of_state=tv%eqn_of_state, &
643+
internal_heat=tv%internal_heat, frunoff=fluxes%frunoff, sosga=sosga, geolat=G%geolatT, &
644644
photo_acc_dpth=mld_pha)
645645
else
646646
! tv%internal_heat is a null pointer unless DO_GEOTHERMAL = True,
@@ -652,15 +652,15 @@ subroutine MOM_generic_tracer_column_physics(h_old, h_new, ea, eb, fluxes, Hml,
652652
sw_pen_band=G%US%QRZ_T_to_W_m2*optics%sw_pen_band(:,:,:), &
653653
opacity_band=G%US%m_to_Z*optics%opacity_band(:,:,:,:), &
654654
internal_heat=G%US%RZ_to_kg_m2*US%C_to_degC*tv%internal_heat(:,:), &
655-
frunoff=G%US%RZ_T_to_kg_m2s*fluxes%frunoff(:,:), sosga=sosga, geolat=G%geolatT, eqn_of_state=tv%eqn_of_state, &
655+
frunoff=G%US%RZ_T_to_kg_m2s*fluxes%frunoff(:,:), sosga=sosga, geolat=G%geolatT, &
656656
photo_acc_dpth=mld_pha*US%Z_to_m)
657657
else
658658
call generic_tracer_source(US%C_to_degC*tv%T, US%S_to_ppt*tv%S, rho_dzt, dzt, dz_ml, G%isd, G%jsd, 1, dt, &
659659
G%US%L_to_m**2*G%areaT(:,:), get_diag_time_end(CS%diag), &
660660
optics%nbands, optics%max_wavelength_band, &
661661
sw_pen_band=G%US%QRZ_T_to_W_m2*optics%sw_pen_band(:,:,:), &
662662
opacity_band=G%US%m_to_Z*optics%opacity_band(:,:,:,:), &
663-
frunoff=G%US%RZ_T_to_kg_m2s*fluxes%frunoff(:,:), sosga=sosga, geolat=G%geolatT, eqn_of_state=tv%eqn_of_state, &
663+
frunoff=G%US%RZ_T_to_kg_m2s*fluxes%frunoff(:,:), sosga=sosga, geolat=G%geolatT, &
664664
photo_acc_dpth=mld_pha*US%Z_to_m)
665665
endif
666666
endif

0 commit comments

Comments
 (0)