Changeset 5038 for branches/2014/dev_r4621_NOC4_BDY_VERT_INTERP/NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90

Timestamp:

2015-01-20T15:26:13+01:00 (9 years ago)

Author:

jamesharle

Message:

Merging branch with HEAD of the trunk

File:

• branches/2014/dev_r4621_NOC4_BDY_VERT_INTERP/NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90 (modified) (4 diffs)

branches/2014/dev_r4621_NOC4_BDY_VERT_INTERP/NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90

@@ -193 +193 @@
                   &    +(1.-MOD(jc,2))* ft(jh) *SIN(ana_freq(jh)*ztime + vt(jh) + ut(jh)))
 
-               DO jj = 1, jpj
-                  DO ji = 1, jpi
+               DO jj = 1,jpj
+                  DO ji = 1,jpi
                      ! Elevation
-                     ana_temp(ji,jj,nhc,1) = ana_temp(ji,jj,nhc,1) + ztemp*sshn(ji,jj)           *tmask(ji,jj,1)
+                     ana_temp(ji,jj,nhc,1) = ana_temp(ji,jj,nhc,1) + ztemp*sshn(ji,jj)           *tmask_i(ji,jj)        
 #if defined key_dynspg_ts
-                     ana_temp(ji,jj,nhc,2) = ana_temp(ji,jj,nhc,2) + ztemp*un_b(ji,jj)*hur(ji,jj)*umask(ji,jj,1)
-                     ana_temp(ji,jj,nhc,3) = ana_temp(ji,jj,nhc,3) + ztemp*vn_b(ji,jj)*hvr(ji,jj)*vmask(ji,jj,1)
+                     ana_temp(ji,jj,nhc,2) = ana_temp(ji,jj,nhc,2) + ztemp*un_b(ji,jj)*hur(ji,jj)*umask_i(ji,jj)
+                     ana_temp(ji,jj,nhc,3) = ana_temp(ji,jj,nhc,3) + ztemp*vn_b(ji,jj)*hvr(ji,jj)*vmask_i(ji,jj)
 #endif
                   END DO
@@ -294 +294 @@
                X1 = ana_amp(ji,jj,jh,1)
                X2 =-ana_amp(ji,jj,jh,2)
-               out_eta(ji,jj,jh       ) = X1 * tmask(ji,jj,1)
-               out_eta(ji,jj,jh+nb_ana) = X2 * tmask(ji,jj,1)
+               out_eta(ji,jj,jh       ) = X1 * tmask_i(ji,jj)
+               out_eta(ji,jj,jh+nb_ana) = X2 * tmask_i(ji,jj)
             END DO
          END DO
@@ -326 +326 @@
          DO ji = 1, jpi
             DO jh = 1, nb_ana 
-               X1 = ana_amp(ji,jj,jh,1)
-               X2 =-ana_amp(ji,jj,jh,2)
-               out_u(ji,jj,jh       ) = X1 * umask(ji,jj,1)
-               out_u(ji,jj,nb_ana+jh) = X2 * umask(ji,jj,1)
-            END DO
-         END DO
-      END DO
+               X1= ana_amp(ji,jj,jh,1)
+               X2=-ana_amp(ji,jj,jh,2)
+               out_u(ji,jj,       jh) = X1 * umask_i(ji,jj)
+               out_u(ji,jj,nb_ana+jh) = X2 * umask_i(ji,jj)
+            ENDDO
+         ENDDO
+      ENDDO
 
       ! vbar:
@@ -362 +362 @@
                X1=ana_amp(ji,jj,jh,1)
                X2=-ana_amp(ji,jj,jh,2)
-               out_v(ji,jj,jh)=X1 * vmask(ji,jj,1)
-               out_v(ji,jj,nb_ana+jh)=X2 * vmask(ji,jj,1)
+               out_v(ji,jj,       jh)=X1 * vmask_i(ji,jj)
+               out_v(ji,jj,nb_ana+jh)=X2 * vmask_i(ji,jj)
             END DO
          END DO