Changeset 4603 for trunk/NEMOGCM/NEMO/OPA_SRC/SBC

Timestamp:

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

Author:

gm

Message:

#1264 trunk: correct an incompatibility ln_ana & ln_ssr

File:

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

trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcana.F90

@@ -57 +57 @@
       !!              independant except the stresses which increase from zero
       !!              during the first nn_tau000 time-step 
-      !!                CAUTION : never mask the surface stress field !
       !!
       !! ** Action  : - set the ocean surface boundary condition, i.e.  
-      !!                   utau, vtau, taum, wndm, qns, qsr, emp
+      !!                   utau, vtau, taum, wndm, qns, qsr, emp, sfx
       !!----------------------------------------------------------------------
-      INTEGER, INTENT(in) ::   kt       ! ocean time step
+      INTEGER, INTENT(in) ::   kt   ! ocean time step
       !
-      INTEGER  ::   ios                   ! Local integer output status for namelist read
-      REAL(wp) ::   zfacto                ! local scalar
-      REAL(wp) ::   zrhoa  = 1.22_wp      ! Air density kg/m3
+      INTEGER  ::   ios                   ! local integer
+      REAL(wp) ::   zrhoa  = 1.22_wp      ! air density kg/m3
       REAL(wp) ::   zcdrag = 1.5e-3_wp    ! drag coefficient
-      REAL(wp) ::   ztx, zty, zmod, zcoef ! temporary variables
+      REAL(wp) ::   zfact, ztx            ! local scalars
+      REAL(wp) ::   zcoef, zty, zmod      !   -      -
       !!
       NAMELIST/namsbc_ana/ nn_tau000, rn_utau0, rn_vtau0, rn_qns0, rn_qsr0, rn_emp0
@@ -96 +95 @@
          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 ) )
+         !
          emp (:,:) = rn_emp0
          sfx (:,:) = 0.0_wp
          qns (:,:) = rn_qns0 - emp(:,:) * sst_m(:,:) * rcp      ! including heat content associated with mass flux at SST
          qsr (:,:) = rn_qsr0
-         !
-         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 
+         !
+         IF( kt <= nn_tau000 ) THEN       ! Increase the stress to its nominal value 
+            !                             ! during the first nn_tau000 time-steps
+            zfact = 0.5 * (  1. - COS( rpi * REAL( kt, wp ) / REAL( nn_tau000, wp ) )  )
+            zcoef = 1. / ( zrhoa * zcdrag ) 
+            ztx   = zfact * rn_utau0
+            zty   = zfact * rn_vtau0
+            zmod  = SQRT( ztx * ztx + zty * zty )
+            utau(:,:) = ztx
+            vtau(:,:) = zty
+            taum(:,:) = zmod
+            wndm(:,:) = SQRT( zmod * zcoef )
+         ENDIF
+         !                                ! update heat and fresh water fluxes
+         !                                ! as they may have been changed by sbcssr module
+         emp (:,:) = rn_emp0              ! NB: qns changes with SST if emp /= 0
+         sfx (:,:) = 0._wp
+         qns (:,:) = rn_qns0 - emp(:,:) * sst_m(:,:) * rcp
+         qsr (:,:) = rn_qsr0
+         !
       ENDIF
       !