Changeset 14200 for NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final/src/OCE/DIA/diawri.F90

Timestamp:

2020-12-17T15:36:44+01:00 (4 years ago)

Author:

mcastril

Message:

Merging r14117 through r14199 into dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final

File:

• NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final/src/OCE/DIA/diawri.F90 (modified) (8 diffs)

NEMO/branches/2020/dev_r14116_HPC-04_mcastril_Mixed_Precision_implementation_final/src/OCE/DIA/diawri.F90

@@ -215 +215 @@
       ENDIF
 
-#if ! defined key_qco
-      CALL iom_put( "rhop", rhop(:,:,:) )          ! 3D potential density (sigma0)
-#endif
+      IF( .NOT.lk_SWE )   CALL iom_put( "rhop", rhop(:,:,:) )          ! 3D potential density (sigma0)
 
       IF ( iom_use("taubot") ) THEN                ! bottom stress
@@ -360 +358 @@
       ENDIF
       !    
-      IF ( iom_use("sKEf") ) THEN                        ! surface kinetic energy at F point
+      IF ( iom_use("ssKEf") ) THEN                        ! surface kinetic energy at F point
          z2d(:,:) = 0._wp                                ! CAUTION : only valid in SWE, not with bathymetry
          DO_2D( 0, 0, 0, 0 )
@@ -370 +368 @@
          END_2D
          CALL lbc_lnk( 'diawri', z2d, 'F', 1. )
-         CALL iom_put( "sKEf", z2d )                     
+         CALL iom_put( "ssKEf", z2d )                     
       ENDIF
       !
@@ -473 +471 @@
       IF (ln_dia25h)   CALL dia_25h( kt, Kmm )        ! 25h averaging
       
-      ! Output of vorticity terms
-      IF ( iom_use("relvor")    .OR. iom_use("plavor")    .OR.   &
-         & iom_use("relpotvor") .OR. iom_use("abspotvor") .OR.   &
-         & iom_use("Ens")                                        ) THEN
+      ! Output of surface vorticity terms
+      IF ( iom_use("ssrelvor")    .OR. iom_use("ssplavor")    .OR.   &
+         & iom_use("ssrelpotvor") .OR. iom_use("ssabspotvor") .OR.   &
+         & iom_use("ssEns")                                        ) THEN
          !
          z2d(:,:) = 0._wp 
@@ -485 +483 @@
          END_2D
          CALL lbc_lnk( 'diawri', z2d, 'F', 1. )
-         CALL iom_put( "relvor", z2d )                  ! relative vorticity ( zeta ) 
-         !
-         CALL iom_put( "plavor", ff_f )                 ! planetary vorticity ( f )
+         CALL iom_put( "ssrelvor", z2d )                  ! relative vorticity ( zeta ) 
+         !
+         CALL iom_put( "ssplavor", ff_f )                 ! planetary vorticity ( f )
          !
          DO_2D( 1, 0, 1, 0 )  
@@ -498 +496 @@
          END_2D
          CALL lbc_lnk( 'diawri', z2d, 'F', 1. )
-         CALL iom_put( "relpotvor", z2d )                  ! relative potential vorticity (zeta/h)
+         CALL iom_put( "ssrelpotvor", z2d )                  ! relative potential vorticity (zeta/h)
          !
          DO_2D( 1, 0, 1, 0 )
@@ -509 +507 @@
          END_2D
          CALL lbc_lnk( 'diawri', z2d, 'F', 1. )
-         CALL iom_put( "abspotvor", z2d )                  ! absolute potential vorticity ( q )
+         CALL iom_put( "ssabspotvor", z2d )                  ! absolute potential vorticity ( q )
          !
          DO_2D( 1, 0, 1, 0 )  
@@ -515 +513 @@
          END_2D
          CALL lbc_lnk( 'diawri', z2d, 'F', 1. )
-         CALL iom_put( "Ens", z2d )                        ! potential enstrophy ( 1/2*q2 )
+         CALL iom_put( "ssEns", z2d )                        ! potential enstrophy ( 1/2*q2 )
          !
       ENDIF