Changeset 10974 for branches

Timestamp:

2019-05-13T17:59:17+02:00 (5 years ago)

Author:

rrenshaw

Message:

code fixes

Location:

branches/UKMO/AMM15_v3_6_STABLE_package_reanalysis2/NEMOGCM/NEMO/OPA_SRC/DIA

Files:

• diadct.F90 (modified) (1 diff)
• diaregmean.F90 (modified) (1 diff)

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

@@ -1014 +1014 @@
               SELECT CASE( sec%direction(jseg) )
               CASE(0,1)
-                 ztn   = interp(k%I,k%J,jk,'V',tsn(:,:,:,0) )
-                 zsn   = interp(k%I,k%J,jk,'V',tsn(:,:,:,1) )
+                 ztn   = interp(k%I,k%J,jk,'V',0 )
+                 zsn   = interp(k%I,k%J,jk,'V',1 )
                  zrhop = interp(k%I,k%J,jk,'V',2)
                  zrhoi = interp(k%I,k%J,jk,'V',3)

branches/UKMO/AMM15_v3_6_STABLE_package_reanalysis2/NEMOGCM/NEMO/OPA_SRC/DIA/diaregmean.F90

@@ -103 +103 @@
       !!----------------------------------------------------------------------
       !
+      ! Defaults are generally negative, regional means output switched off
+      ln_diaregmean         = .FALSE.  ! don't write regional means
+      ln_diaregmean_bgc     = .FALSE.  ! don't write biogeochemistry regional means
+      ln_diaregmean_karamld = .FALSE.  ! don't write mixed layer depth
+      ln_diaregmean_pea     = .FALSE.  ! don't write potential energy anomaly
+      ln_diaregmean_diaar5  = .FALSE.  ! don't write AR5 SLR terms
+      ln_diaregmean_diasbc  = .FALSE.  ! don't write surface forcing terms
+
       REWIND ( numnam_ref )              ! Read Namelist nam_diatmb in referdiatmbence namelist : TMB diagnostics
       READ   ( numnam_ref, nam_diaregmean, IOSTAT=ios, ERR= 901 )