Changeset 8197 for branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90

Timestamp:

2017-06-21T11:39:54+02:00 (7 years ago)

Author:

glong

Message:

Changed id's to be chars e.g. hpg to more easily identify output (and updated field_def.xml accordingly). Also rearranged scaling factors in dyn_vrt_dia subroutines in divcur.F90

File:

• branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90 (modified) (6 diffs)

branches/UKMO/GO6_dyn_vrt_diag/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90

@@ -48 +48 @@
    USE lib_fortran
    USE timing          ! Timing
+   USE divcur          ! for dyn_vrt_dia_3d
 #if defined key_agrif
    USE agrif_opa_interp
@@ -108 +109 @@
       INTEGER, INTENT(  out) ::   kindic   ! solver convergence flag (<0 if not converge)
       !
+      CHARACTER(len=3) ::  id_vrt_dia_spg = "spg" ! TODO remove once flags set properly
       INTEGER  ::   ji, jj, jk   ! dummy loop indices
       REAL(wp) ::   z2dt, z2dtg, zgcb, zbtd, ztdgu, ztdgv   ! local scalars
@@ -130 +132 @@
          !                                                        ! gcx, gcxb
       ENDIF
+
+      IF ( l_trddyn .OR. ( id_vrt_dia_spg == "spg" ) )   THEN
+         CALL wrk_alloc( jpi, jpj, jpk, ztrdu, ztrdv )
+      END IF
 
       ! Local constant initialization
@@ -184 +190 @@
          END DO
          !
-         IF( l_trddyn )   THEN                      ! temporary save of spg trends
-            CALL wrk_alloc( jpi, jpj, jpk, ztrdu, ztrdv )
+                                          ! temporary save of spg trends
+         IF ( l_trddyn .OR. ( id_vrt_dia_spg == "spg" ) )   THEN
             DO jk = 1, jpkm1              ! unweighted time stepping 
                DO jj = 2, jpjm1
@@ -328 +334 @@
 #endif      
 
-      IF( l_trddyn )   THEN                     
+      IF ( l_trddyn .OR. ( id_vrt_dia_spg == "spg" ) )   THEN                     
          ztrdu(:,:,:) = ua(:,:,:)                 ! save the after velocity before the filtered SPG
          ztrdv(:,:,:) = va(:,:,:)
          !
-         CALL wrk_alloc( jpi, jpj, zpw )
-         !
-         zpw(:,:) = - z2dt * gcx(:,:)
-         CALL iom_put( "ssh_flt" , zpw )          ! output equivalent ssh modification due to implicit filter
-         !
-         !                                        ! save surface pressure flux: -pw at z=0
-         zpw(:,:) = - rau0 * grav * sshn(:,:) * wn(:,:,1) * tmask(:,:,1)
-         CALL iom_put( "pw0_exp" , zpw )
-         zpw(:,:) = wn(:,:,1)
-         CALL iom_put( "w0" , zpw )
-         zpw(:,:) =  rau0 * z2dtg * gcx(:,:) * wn(:,:,1) * tmask(:,:,1)
-         CALL iom_put( "pw0_flt" , zpw )
-         !
-         CALL wrk_dealloc( jpi, jpj, zpw ) 
-         !                                   
+         IF ( l_trddyn ) THEN
+            CALL wrk_alloc( jpi, jpj, zpw )
+            !
+            zpw(:,:) = - z2dt * gcx(:,:)
+            CALL iom_put( "ssh_flt" , zpw )          ! output equivalent ssh modification due to implicit filter
+            !
+            !                                        ! save surface pressure flux: -pw at z=0
+            zpw(:,:) = - rau0 * grav * sshn(:,:) * wn(:,:,1) * tmask(:,:,1)
+            CALL iom_put( "pw0_exp" , zpw )
+            zpw(:,:) = wn(:,:,1)
+            CALL iom_put( "w0" , zpw )
+            zpw(:,:) =  rau0 * z2dtg * gcx(:,:) * wn(:,:,1) * tmask(:,:,1)
+            CALL iom_put( "pw0_flt" , zpw )
+            !
+            CALL wrk_dealloc( jpi, jpj, zpw ) 
+            !                                   
+         ENDIF
       ENDIF
       
@@ -363 +371 @@
       END DO
 
-      IF( l_trddyn )   THEN                      ! save the explicit SPG trends for further diagnostics
+      IF ( l_trddyn .OR. ( id_vrt_dia_spg == "spg" ) )   THEN                      ! save the explicit SPG trends for further diagnostics
          ztrdu(:,:,:) = ( ua(:,:,:) - ztrdu(:,:,:) ) / z2dt
          ztrdv(:,:,:) = ( va(:,:,:) - ztrdv(:,:,:) ) / z2dt
-         CALL trd_dyn( ztrdu, ztrdv, jpdyn_spgflt, kt )
+         !
+         IF ( l_trddyn ) THEN
+            CALL trd_dyn( ztrdu, ztrdv, jpdyn_spgflt, kt )
+         END IF
+         !
+         IF ( id_vrt_dia_spg == "spg" ) THEN
+            ! TODO remove kt after validation
+            CALL dyn_vrt_dia_3d( ztrdu, ztrdv, id_vrt_dia_spg, kt )
+         END IF
          !
          CALL wrk_dealloc( jpi, jpj, jpk, ztrdu, ztrdv )