Changeset 4602

Timestamp:

2014-03-28T11:32:43+01:00 (10 years ago)

Author:

gm

Message:

#1264 correct an incompatibility ln_ana & ln_ssr

File:

• branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPA_SRC/SBC/sbcana.F90 (modified) (2 diffs)

branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPA_SRC/SBC/sbcana.F90

@@ -89 +89 @@
          nn_tau000 = MAX( nn_tau000, 1 )     ! must be >= 1
          !
+         utau(:,:) = rn_utau0
+         vtau(:,:) = rn_vtau0
+         taum(:,:) = SQRT ( rn_utau0 * rn_utau0 + rn_vtau0 * rn_vtau0 )
+         wndm(:,:) = SQRT ( taum(1,1) /  ( zrhoa * zcdrag ) )
+         !
          qns (:,:) = rn_qns0
          qsr (:,:) = rn_qsr0
@@ -94 +99 @@
          emps(:,:) = rn_emp0
          !
-         utau(:,:) = rn_utau0
-         vtau(:,:) = rn_vtau0
-         taum(:,:) = SQRT ( rn_utau0 * rn_utau0 + rn_vtau0 * rn_vtau0 )
-         wndm(:,:) = SQRT ( taum(1,1) /  ( zrhoa * zcdrag ) )
-         !
       ENDIF
 
-   
-      ! Increase the surface stress to its nominal value during the first nn_tau000 time-steps
-      IF( kt <= nn_tau000 ) THEN
-         zfacto = 0.5 * (  1. - COS( rpi * FLOAT( kt ) / FLOAT( nn_tau000 ) )  )
-         zcoef = 1. / ( zrhoa * zcdrag ) 
-         ztx = zfacto * rn_utau0
-         zty = zfacto * rn_vtau0
-         zmod = SQRT( ztx * ztx + zty * zty )
-         utau(:,:) = ztx
-         vtau(:,:) = zty
-         taum(:,:) = zmod
-         zmod = SQRT( zmod * zcoef )
-         wndm(:,:) = zmod
+      IF( MOD( kt - 1, nn_fsbc ) == 0 ) THEN 
+         !
+         ! Increase the surface stress to its nominal value during the first nn_tau000 time-steps
+         IF( kt <= nn_tau000 ) THEN
+            zfacto = 0.5 * (  1. - COS( rpi * FLOAT( kt ) / FLOAT( nn_tau000 ) )  )
+            zcoef = 1. / ( zrhoa * zcdrag ) 
+            ztx = zfacto * rn_utau0
+            zty = zfacto * rn_vtau0
+            zmod = SQRT( ztx * ztx + zty * zty )
+            utau(:,:) = ztx
+            vtau(:,:) = zty
+            taum(:,:) = zmod
+            zmod = SQRT( zmod * zcoef )
+            wndm(:,:) = zmod
+         ENDIF
+         !
+         ! retore heat and fresh water fluxes as they may have been changed by sbcssr module
+         qns (:,:) = rn_qns0
+         qsr (:,:) = rn_qsr0
+         emp (:,:) = rn_emp0
+         emps(:,:) = rn_emp0
+         !
       ENDIF
       !