Merge pull request #1 from DeniseWorthen/bugfix/mean_salt_rate

Weights mean_salt_rate by icewgt
NOAA-EMC · Sep 13, 2019 · c8e05a8 · c8e05a8
2 parents cabd6a5 + b0183ea
commit c8e05a8
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/module_MEDIATOR.F90 b/src/module_MEDIATOR.F90
@@ -5534,6 +5534,16 @@ subroutine MedPhase_prep_ocn(gcomp, rc)
 !    if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
 !      line=__LINE__, file=__FILE__)) return  ! bail out
 
+    !-------------
+    ! field_for_ocn = field_from_ice * ice_fraction
+    !-------------
+
+    call fieldBundle_FieldMerge(is_local%wrap%FBforOcn, 'mean_salt_rate', &
+                                is_local%wrap%FBIce_o , 'mean_salt_rate', icewgt, &
+                                rc=rc)
+    if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
+      line=__LINE__, file=__FILE__)) return  ! bail out
+
     !-------------
     ! field_for_ocn = field_from_atm * (1-ice_fraction) + field_from_ice * (ice_fraction)
     !-------------