Changeset 7330 for branches/2016/dev_r7233_CMIP6_diags_trunk_version/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90

Timestamp:

2016-11-24T17:10:48+01:00 (7 years ago)

Author:

timgraham

Message:

Final bug fixes needed for compilation

File:

• branches/2016/dev_r7233_CMIP6_diags_trunk_version/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90 (modified) (2 diffs)

branches/2016/dev_r7233_CMIP6_diags_trunk_version/NEMOGCM/NEMO/OPA_SRC/DIA/diaptr.F90

@@ -22 +22 @@
    USE dom_oce          ! ocean space and time domain
    USE phycst           ! physical constants
-   USE ldftra 
    !
    USE iom              ! IOM library
@@ -372 +371 @@
          ENDIF
 
-         IF(ln_ldfeiv) 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 )              
+         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
-               ENDIF
+                  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