Changeset 4932 for branches/2014/dev_r4879_UKMO_NOC_MERGE/NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90

Timestamp:

2014-12-01T11:08:54+01:00 (10 years ago)

Author:

acc

Message:

Branch dev_r4879_UKMO_NOC_MERGE, Check in merged UKMO_OBSASM branch; all conflicts resolved

File:

• branches/2014/dev_r4879_UKMO_NOC_MERGE/NEMOGCM/NEMO/OPA_SRC/DIA/diaharm.F90 (modified) (2 diffs)

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

@@ -328 +328 @@
                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)
+               out_u(ji,jj,       jh) = X1 * umask_i(ji,jj)
+               out_u(ji,jj,nb_ana+jh) = X2 * umask_i(ji,jj)
             ENDDO
          ENDDO
@@ -362 +362 @@
                X1=ana_amp(ji,jj,jh,1)
                X2=-ana_amp(ji,jj,jh,2)
-               out_v(ji,jj,jh)=X1 * vmask_i(ji,jj)
+               out_v(ji,jj,       jh)=X1 * vmask_i(ji,jj)
                out_v(ji,jj,nb_ana+jh)=X2 * vmask_i(ji,jj)
             END DO