Changeset 8193 for branches/UKMO/dev_r5518_GO6_package_fix_rnf_MOCI_TEST_SUITE/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90

Timestamp:

2017-06-20T10:46:27+02:00 (7 years ago)

Author:

andmirek

Message:

ticket #1914 back to 8188

File:

• branches/UKMO/dev_r5518_GO6_package_fix_rnf_MOCI_TEST_SUITE/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90 (modified) (2 diffs)

branches/UKMO/dev_r5518_GO6_package_fix_rnf_MOCI_TEST_SUITE/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90

@@ -343 +343 @@
             ENDIF
          ENDIF
-<<<<<<< .working
 
          IF( iom_use("sopht_vt") .OR. iom_use("sopst_vs") ) THEN   
@@ -434 +433 @@
          ENDIF
 #endif
-=======
-
-         IF( iom_use("sopht_vt") .OR. iom_use("sopst_vs") ) THEN   
-            z2d(1,:) = htr_vt(:,1) * rc_pwatt        !  (conversion in PW) 
-            DO ji = 1, jpi
-               z2d(ji,:) = z2d(1,:)
-            ENDDO
-            cl1 = 'sopht_vt'
-            CALL iom_put( TRIM(cl1), z2d )
-            z2d(1,:) = str_vs(:,1) * rc_ggram        !  (conversion in Gg)
-            DO ji = 1, jpi
-               z2d(ji,:) = z2d(1,:)
-            ENDDO
-            cl1 = 'sopst_vs'
-            CALL iom_put( TRIM(cl1), z2d )
-            IF( ln_subbas ) THEN
-              DO jn=2,nptr
-               z2d(1,:) = htr_vt(:,jn) * rc_pwatt        !  (conversion in PW)
-               DO ji = 1, jpi
-                 z2d(ji,:) = z2d(1,:)
-               ENDDO
-               cl1 = TRIM('sopht_vt_'//clsubb(jn))                 
-               CALL iom_put( cl1, z2d )
-               z2d(1,:) = str_vs(:,jn) * rc_ggram        ! (conversion in Gg)
-               DO ji = 1, jpi
-                  z2d(ji,:) = z2d(1,:)
-               ENDDO
-               cl1 = TRIM('sopst_vs_'//clsubb(jn))                 
-               CALL iom_put( cl1, z2d )              
-              ENDDO
-            ENDIF
-         ENDIF
-
-#ifdef key_diaeiv
-         IF(lk_traldf_eiv) THEN
-            IF( iom_use("sophteiv") .OR. iom_use("sopsteiv") ) THEN 
-               z2d(1,:) = htr_eiv(:,1) * rc_pwatt        !  (conversion in PW) 
-               DO ji = 1, jpi
-                  z2d(ji,:) = z2d(1,:)
-               ENDDO
-               cl1 = 'sophteiv'
-               CALL iom_put( TRIM(cl1), z2d )
-               z2d(1,:) = str_eiv(:,1) * rc_ggram        !  (conversion in Gg)
-               DO ji = 1, jpi
-                  z2d(ji,:) = z2d(1,:)
-               ENDDO
-               cl1 = 'sopsteiv'
-               CALL iom_put( TRIM(cl1), z2d )
-               IF( ln_subbas ) THEN
-                  DO jn=2,nptr
-                     z2d(1,:) = htr_eiv(:,jn) * rc_pwatt        !  (conversion in PW)
-                     DO ji = 1, jpi
-                        z2d(ji,:) = z2d(1,:)
-                     ENDDO
-                     cl1 = TRIM('sophteiv_'//clsubb(jn))                 
-                     CALL iom_put( cl1, z2d )
-                     z2d(1,:) = str_eiv(:,jn) * rc_ggram        ! (conversion in Gg)
-                     DO ji = 1, jpi
-                        z2d(ji,:) = z2d(1,:)
-                     ENDDO
-                     cl1 = TRIM('sopsteiv_'//clsubb(jn)) 
-                     CALL iom_put( cl1, z2d )              
-                  ENDDO
-               ENDIF
-            ENDIF
-         ENDIF
-#endif
->>>>>>> .merge-right.r7923
          !
       ENDIF