Changeset 14714 for branches

Timestamp:

2021-04-14T18:55:43+02:00 (3 years ago)

Author:

rrenshaw

Message:

section transports, hardwire calculation of 1-hour and 24-hour means

File:

• branches/UKMO/AMM15_v3_6_STABLE_package_reanalysis4/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90 (modified) (5 diffs)

branches/UKMO/AMM15_v3_6_STABLE_package_reanalysis4/NEMOGCM/NEMO/OPA_SRC/DIA/diadct.F90

@@ -1 +1 @@
 MODULE diadct
+  !!
+  !! JT/RJR: this version writes accumulated means 1-hourly and 24-hourly
+  !!         NB 24-hour values are means, not sums, of the 24 hourly values
+  !!
   !!=====================================================================
   !!                       ***  MODULE  diadct  ***
@@ -177 +181 @@
 
         !Do calculation for daily, 25hourly mean every hour
-        nn_dct=3600./rdt         ! hard coded for NOOS transects, to give 25 hour means from hourly instantaneous values
+        !JT nn_dct=3600./rdt         ! hard coded for NOOS transects, to give 25 hour means from hourly instantaneous values
 
         !write out daily, 25hourly mean every day
@@ -394 +398 @@
  
         ! Compute transport and write only at nn_dctwri
-        IF ( MOD(kt,nn_dct)==0 .or. &               ! compute transport every nn_dct time steps
-            (ln_NOOS .and. kt==nn_it000 ) )  THEN   ! also include first time step when calculating NOOS 25 hour averages
+        !JT IF ( MOD(kt,nn_dct)==0 .or. &               ! compute transport every nn_dct time steps
+        !JT     (ln_NOOS .and. kt==nn_it000 ) )  THEN   ! also include first time step when calculating NOOS 25 hour averages
+        IF ( MOD(kt,nn_dct_h)==0 ) THEN            ! compute transport every nn_dct_h time steps
             
             
@@ -419 +424 @@
               ! Not 24 values, but 25! divide by ((nn_dctwri/nn_dct) +1)
               !! divide arrays by nn_dctwri/nn_dct  to obtain average
-              transports_3d(:,:,:,:)= transports_3d(:,:,:,:)/((nn_dctwri/nn_dct)+1.)
-              transports_2d(:,:,:)  = transports_2d(:,:,:)  /((nn_dctwri/nn_dct)+1.)
+              !JT transports_3d(:,:,:,:)= transports_3d(:,:,:,:)/((nn_dctwri/nn_dct)+1.)
+              !JT transports_2d(:,:,:)  = transports_2d(:,:,:)  /((nn_dctwri/nn_dct)+1.)
+              transports_3d(:,:,:,:)= transports_3d(:,:,:,:)/((nn_dctwri/nn_dct))
+              transports_2d(:,:,:)  = transports_2d(:,:,:)  /((nn_dctwri/nn_dct))
 
               ! Sum over each class
@@ -453 +460 @@
                   
                   
-                  IF ( ln_NOOS ) CALL transport(secs(jsec),lldebug,jsec)  ! reinitialise for next 25 hour instantaneous average (overlapping values)
+                  !JT IF ( ln_NOOS ) CALL transport(secs(jsec),lldebug,jsec)  ! reinitialise for next 25 hour instantaneous average (overlapping values)