Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow salt_flux_added to be used by generic tracers #196

Merged
merged 1 commit into from
Jul 29, 2024
Merged

Allow salt_flux_added to be used by generic tracers #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MOM6/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ target_sources(OM3_mom6 PRIVATE
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
Expand Down Expand Up @@ -375,6 +374,7 @@ add_patched_source(OM3_mom6 MOM6/config_src/drivers/nuopc_cap/mom_ocean_model_nu
add_patched_source(OM3_mom6 MOM6/config_src/infra/FMS2/MOM_couplertype_infra.F90)
add_patched_source(OM3_mom6 MOM6/src/framework/MOM_coupler_types.F90)
add_patched_source(OM3_mom6 MOM6/src/tracer/MOM_generic_tracer.F90)
add_patched_source(OM3_mom6 MOM6/src/core/MOM_forcing_type.F90)

### Install and Export

Expand Down
2 changes: 1 addition & 1 deletion MOM6/GFDL_generic_tracers
Open in desktop
Submodule GFDL_generic_tracers updated 3 files
+771 −635 generic_tracers/generic_WOMBATlite.F90
+50 −2 generic_tracers/generic_tracer.F90
+14 −3 generic_tracers/generic_tracer_utils.F90
16 changes: 16 additions & 0 deletions MOM6/patches/MOM_forcing_type.F90.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
diff --git a/MOM6/src/core/MOM_forcing_type.F90 b/MOM6/src/core/MOM_forcing_type.F90.new
index 200bbd7..fca9187 100644
--- a/MOM6/src/core/MOM_forcing_type.F90
+++ b/MOM6/src/core/MOM_forcing_type.F90.new
@@ -2080,6 +2080,11 @@ subroutine fluxes_accumulate(flux_tmp, fluxes, G, wt2, forces)

fluxes%salt_flux(i,j) = wt1*fluxes%salt_flux(i,j) + wt2*flux_tmp%salt_flux(i,j)
enddo ; enddo
+ if (associated(fluxes%salt_flux_added) .and. associated(flux_tmp%salt_flux_added)) then
+ do j=js,je ; do i=is,ie
+ fluxes%salt_flux_added(i,j) = wt1*fluxes%salt_flux_added(i,j) + wt2*flux_tmp%salt_flux_added(i,j)
+ enddo ; enddo
+ endif
dougiesquire marked this conversation as resolved.
Show resolved Hide resolved
if (associated(fluxes%heat_added) .and. associated(flux_tmp%heat_added)) then
do j=js,je ; do i=is,ie
fluxes%heat_added(i,j) = wt1*fluxes%heat_added(i,j) + wt2*flux_tmp%heat_added(i,j)
23 changes: 22 additions & 1 deletion MOM6/patches/MOM_generic_tracer.F90.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
diff --git a/MOM6/src/tracer/MOM_generic_tracer.F90 b/MOM6/src/tracer/MOM_generic_tracer.F90.new
index 131110e..7334a56 100644
index 131110e..ae75b2e 100644
--- a/MOM6/src/tracer/MOM_generic_tracer.F90
+++ b/MOM6/src/tracer/MOM_generic_tracer.F90.new
@@ -21,7 +21,7 @@ module MOM_generic_tracer
use generic_tracer, only: generic_tracer_coupler_get, generic_tracer_coupler_set
use generic_tracer, only: generic_tracer_end, generic_tracer_get_list, do_generic_tracer
use generic_tracer, only: generic_tracer_update_from_bottom,generic_tracer_vertdiff_G
- use generic_tracer, only: generic_tracer_coupler_accumulate
+ use generic_tracer, only: generic_tracer_coupler_accumulate, generic_tracer_update_from_coupler

use g_tracer_utils, only: g_tracer_get_name,g_tracer_set_values,g_tracer_set_common,g_tracer_get_common
use g_tracer_utils, only: g_tracer_get_next,g_tracer_type,g_tracer_is_prog,g_tracer_flux_init
@@ -352,7 +352,9 @@ contains
enddo ; enddo ; enddo

Expand All @@ -13,3 +22,15 @@ index 131110e..7334a56 100644
do k=2,nk ; do j=jsc,jec ; do i=isc,iec
if (tr_ptr(i,j,k) /= CS%tracer_land_val) then
tr_ptr(i,j,k) = 0.0
@@ -507,6 +509,11 @@ contains
! the fluxes without coming into this subroutine.
! MOM5 has to modified to conform.

+ !
+ !Call the generic_tracer's update_from_coupler routine (convert salt_flux_added to g/m^2/sec)
+ !
+ call generic_tracer_update_from_coupler(G%isd, G%jsd, 1000*(US%RZ_T_to_kg_m2s*fluxes%salt_flux_added))
+
!
!Add contribution of river to surface flux
!
Loading