Changeset 3294 for trunk/NEMOGCM/NEMO/OPA_SRC/SBC/sbcana.F90

Timestamp:

2012-01-28T17:44:18+01:00 (12 years ago)

Author:

rblod

Message:

Merge of 3.4beta into the trunk

File:

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

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

@@ -89 +89 @@
          nn_tau000 = MAX( nn_tau000, 1 )     ! must be >= 1
          !
+         qns (:,:) = rn_qns0
+         qsr (:,:) = rn_qsr0
+         emp (:,:) = rn_emp0
+         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
 
-      qns (:,:) = rn_qns0
-      qsr (:,:) = rn_qsr0
-      emp (:,:) = rn_emp0
-      emps(:,:) = rn_emp0
    
       ! Increase the surface stress to its nominal value during the first nn_tau000 time-steps
@@ -193 +199 @@
             ! 23.5 deg : tropics
             qsr (ji,jj) =  230 * COS( 3.1415 * ( gphit(ji,jj) - 23.5 * zcos_sais1 ) / ( 0.9 * 180 ) )
-            qns (ji,jj) = ztrp * ( tb(ji,jj,1) - t_star ) - qsr(ji,jj)
+            qns (ji,jj) = ztrp * ( tsb(ji,jj,1,jp_tem) - t_star ) - qsr(ji,jj)
             IF( gphit(ji,jj) >= 14.845 .AND. 37.2 >= gphit(ji,jj) ) THEN    ! zero at 37.8 deg, max at 24.6 deg
                emp  (ji,jj) =   zemp_S * zconv   &