Changeset 1494 for trunk/NEMO

Timestamp:

2009-07-20T11:27:56+02:00 (15 years ago)

Author:

ctlod

Message:

move the computation of zsrp=deds/rday term out of a loop, see ticket: #406

File:

• trunk/NEMO/OPA_SRC/SBC/sbcssr.F90 (modified) (2 diffs)

trunk/NEMO/OPA_SRC/SBC/sbcssr.F90

@@ -164 +164 @@
             !
             IF( nn_sssr == 1 ) THEN                   ! Salinity damping term (salt flux, emps only)
+               zsrp = deds / rday                                     ! from [mm/day] to [kg/m2/s]
 !CDIR COLLAPSE
                ! use zerp scalar to optimize memory access (speedup the loop)
                DO jj = 1, jpj
                   DO ji = 1, jpi
-                     zsrp = deds / rday                               ! from [mm/day] to [kg/m2/s]
                      zerp = zsrp * ( 1. - 2.*rnfmsk(ji,jj) )   &      ! No damping in vicinity of river mouths
                         &        * ( sss_m(ji,jj) - sf_sss(1)%fnow(ji,jj) )   &
@@ -178 +178 @@
                CALL iom_put( "erp", erp )                             ! freshwater flux damping
             ELSEIF( nn_sssr == 2 ) THEN               ! Salinity damping term (volume flux, emp and emps)
+               zsrp = deds / rday                                     ! from [mm/day] to [kg/m2/s]
 !CDIR COLLAPSE
                ! use zerp scalar to optimize memory access (speedup the loop)
                DO jj = 1, jpj
                   DO ji = 1, jpi                            
-                     zsrp = deds / rday                               ! from [mm/day] to [kg/m2/s]
                      zerp = zsrp * ( 1. - 2.*rnfmsk(ji,jj) )   &      ! No damping in vicinity of river mouths
                         &        * ( sss_m(ji,jj) - sf_sss(1)%fnow(ji,jj) )   &