Changeset 7599 for branches/UKMO/dev_r5518_GO6_package_for_static_diagnostics/NEMOGCM/NEMO

Timestamp:

2017-01-23T16:12:59+01:00 (7 years ago)

Author:

timgraham

Message:

Fully working version

Location:

branches/UKMO/dev_r5518_GO6_package_for_static_diagnostics/NEMOGCM/NEMO/OPA_SRC

Files:

• DYN/dynldf.F90 (modified) (2 diffs)
• TRA/trabbc.F90 (modified) (1 diff)
• TRA/traldf.F90 (modified) (2 diffs)

branches/UKMO/dev_r5518_GO6_package_for_static_diagnostics/NEMOGCM/NEMO/OPA_SRC/DYN/dynldf.F90

@@ -29 +29 @@
    USE lbclnk         ! ocean lateral boundary conditions (or mpp link)
    USE wrk_nemo        ! Memory Allocation
+   USE iom
    USE timing          ! Timing
 
@@ -91 +92 @@
                 ENDDO
              ENDDO
-             CALL iom_put("ahmt_blb", ztmp)
+             CALL iom_put("ahmt_blp", ztmp)
              CALL wrk_dealloc(jpi, jpj, ztmp)
           ENDIF

branches/UKMO/dev_r5518_GO6_package_for_static_diagnostics/NEMOGCM/NEMO/OPA_SRC/TRA/trabbc.F90

@@ -91 +91 @@
       IF( kt == nit000 ) THEN
       !Output the geothermal heat flux once for CMIP6 diagnostics
-         wrk_alloc(jpi, jpj, ztmp)
-         ztmp(:,:) = qgh_trd0(:,:)*rcp_rau0
+         CALL wrk_alloc(jpi, jpj, ztmp)
+         DO jj=1,jpj
+            DO ji=1,jpi
+               ztmp(ji,jj) = qgh_trd0(ji,jj)*rau0_rcp
+            ENDDO
+         ENDDO
          CALL iom_put( 'hfgeou', ztmp )
-         wrk_dealloc(jpi, jpj, ztmp)
+         CALL wrk_dealloc(jpi, jpj, ztmp)
       ENDIF
 

branches/UKMO/dev_r5518_GO6_package_for_static_diagnostics/NEMOGCM/NEMO/OPA_SRC/TRA/traldf.F90

@@ -31 +31 @@
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
    USE wrk_nemo        ! Memory allocation
+   USE iom
    USE timing          ! Timing
 
@@ -78 +79 @@
 
 #ifdef key_traldf_c2d
-      IF (kt == nit000) THEN
-         CALL iom_put( "aht2D", ahtw)
+      IF (kt == nit000)    CALL iom_put( "aht2D", ahtw)
 #endif