Changeset 4900 for branches/2014/dev_CNRS_2014/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

Timestamp:

2014-11-27T16:28:53+01:00 (9 years ago)

Author:

cetlod

Message:

2014/dev_CNRS_2014 : Merge in the trunk changes between 4674 and 4728, see ticket #1415

File:

• branches/2014/dev_CNRS_2014/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) (7 diffs)

branches/2014/dev_CNRS_2014/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

@@ -105 +105 @@
    END FUNCTION dyn_spg_ts_alloc
 
-
    SUBROUTINE dyn_spg_ts( kt )
       !!----------------------------------------------------------------------
-      !!                  ***  routine dyn_spg_ts  ***
       !!
-      !! ** Purpose :   Compute the now trend due to the explicit time stepping
-      !!              of the quasi-linear barotropic system. 
+      !! ** Purpose :   
+      !!      -Compute the now trend due to the explicit time stepping
+      !!      of the quasi-linear barotropic system. 
       !!
       !! ** Method  :  
@@ -129 +128 @@
       !!      -Update 3d trend (ua, va) with barotropic component.
       !!
-      !! References : Shchepetkin and McWilliams, Ocean Modelling, 2005
+      !! References : Shchepetkin, A.F. and J.C. McWilliams, 2005: 
+      !!              The regional oceanic modeling system (ROMS): 
+      !!              a split-explicit, free-surface,
+      !!              topography-following-coordinate oceanic model. 
+      !!              Ocean Modelling, 9, 347-404. 
       !!---------------------------------------------------------------------
+      !
       INTEGER, INTENT(in)  ::   kt   ! ocean time-step index
       !
@@ -286 +290 @@
       !
       DO jk = 1, jpkm1
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-               zu_frc(ji,jj) = zu_frc(ji,jj) + fse3u_n(ji,jj,jk) * ua(ji,jj,jk) * umask(ji,jj,jk)
-               zv_frc(ji,jj) = zv_frc(ji,jj) + fse3v_n(ji,jj,jk) * va(ji,jj,jk) * vmask(ji,jj,jk)         
-            END DO
-         END DO
+         zu_frc(:,:) = zu_frc(:,:) + fse3u_n(:,:,jk) * ua(:,:,jk) * umask(:,:,jk)
+         zv_frc(:,:) = zv_frc(:,:) + fse3v_n(:,:,jk) * va(:,:,jk) * vmask(:,:,jk)         
       END DO
       !
@@ -455 +455 @@
       !                                             ! ==================== !  
       ! Initialize barotropic variables:      
+      IF( kt==nit000 .AND. .NOT. ln_rstart )THEN
+         sshbb_e(:,:) = 0._wp
+         ubb_e  (:,:) = 0._wp
+         vbb_e  (:,:) = 0._wp
+         sshb_e (:,:) = 0._wp
+         ub_e   (:,:) = 0._wp
+         vb_e   (:,:) = 0._wp
+      ENDIF
+      !
       IF (ln_bt_fw) THEN                  ! FORWARD integration: start from NOW fields                    
          sshn_e(:,:) = sshn (:,:)            
@@ -899 +908 @@
    END SUBROUTINE dyn_spg_ts
 
-
    SUBROUTINE ts_wgt( ll_av, ll_fw, jpit, zwgt1, zwgt2)
       !!---------------------------------------------------------------------
@@ -1029 +1037 @@
       !
    END SUBROUTINE ts_rst
-
 
    SUBROUTINE dyn_spg_ts_init( kt )
@@ -1165 +1172 @@
    !!======================================================================
 END MODULE dynspg_ts
+
+
+