Changeset 5895 for branches/UKMO/dev_r5518_flux_adjust/NEMOGCM/NEMO/OPA_SRC/SBC/sbcflx_adj.F90

Timestamp:

2015-11-18T17:05:56+01:00 (8 years ago)

Author:

kuniko

Message:

Made treatment of river mouth grids consistent in nn_flxadjfw 1&2.

File:

• branches/UKMO/dev_r5518_flux_adjust/NEMOGCM/NEMO/OPA_SRC/SBC/sbcflx_adj.F90 (modified) (3 diffs)

branches/UKMO/dev_r5518_flux_adjust/NEMOGCM/NEMO/OPA_SRC/SBC/sbcflx_adj.F90

@@ -105 +105 @@
                   DO ji = 1, jpi
                      zerp = ( 1. - 2.*rnfmsk(ji,jj) )  &              ! No damping in vicinity of river mouths
-                        &        * sf_erp(1)%fnow(ji,jj,1)     &      
-                        &        * MAX( sss_m(ji,jj), 1.e-20 )
+                        &        * sf_erp(1)%fnow(ji,jj,1)
                      sfx(ji,jj) = sfx(ji,jj) + zerp                 ! salt flux
                   END DO
@@ -117 +116 @@
                DO jj = 1, jpj
                   DO ji = 1, jpi                            
-                     zerp = sf_erp(1)%fnow(ji,jj,1)
+                     zerp = ( 1. - 2.*rnfmsk(ji,jj) )  &              ! No damping in vicinity of river mouths
+                        &        * sf_erp(1)%fnow(ji,jj,1)
                      IF( ln_sssr_bnd )   zerp = SIGN( 1., zerp ) * MIN( zerp_bnd, ABS(zerp) )
                      emp(ji,jj) = emp (ji,jj) + zerp
@@ -191 +191 @@
          !
          ! fill sf_qrp with sn_qrp and control print
-         CALL fld_fill( sf_qrp, (/ sn_qrp /), cn_dir, 'sbc_flx_adj', 'Heat flux adjustment', 'namsbc_flx_adj' )
+         CALL fld_fill( sf_qrp, (/ sn_qrp /), cn_dir, 'sbc_qrp', 'Heat flux adjustment', 'namsbc_flx_adj' )
          IF( sf_qrp(1)%ln_tint )   ALLOCATE( sf_qrp(1)%fdta(jpi,jpj,1,2), STAT=ierror )
          IF( ierror > 0 )   CALL ctl_stop( 'STOP', 'sbc_flx_adj: unable to allocate sf_qrp data array' )