Changeset 8389 for branches

Timestamp:

2017-07-27T16:45:56+02:00 (7 years ago)

Author:

frrh

Message:

Reinstate original use of fse3t_a, having ensured contents will be initialised
immediately upon allocation evevn if no physical values area available.

Location:

branches/UKMO/dev_r5518_fix_NaNs/NEMOGCM/NEMO

Files:

• OPA_SRC/DOM/dom_oce.F90 (modified) (2 diffs)
• TOP_SRC/trcrst.F90 (modified) (1 diff)

branches/UKMO/dev_r5518_fix_NaNs/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90

@@ -355 +355 @@
          &      gdept_0 (jpi,jpj,jpk) , e3t_0(jpi,jpj,jpk) , e3u_0 (jpi,jpj,jpk) ,                         &
          &      gdepw_0 (jpi,jpj,jpk) , e3w_0(jpi,jpj,jpk) , e3vw_0(jpi,jpj,jpk) , e3uw_0(jpi,jpj,jpk) , STAT=ierr(4) )
+
+      ! Initilaise key variables at risk of being intercepted before properly set up. 
+      e3t_0(:,:,:) = 0.0
          !
 #if defined key_vvl
@@ -368 +371 @@
          &      ehu_b    (jpi,jpj)    , ehv_b  (jpi,jpj),                                                     &
          &      ehur_b   (jpi,jpj)    , ehvr_b (jpi,jpj),                                  STAT=ierr(5) )                          
+
+      ! Initilaise key variables at risk of being intercepted before properly set up. 
+      e3t_n(:,:,:) = 0.0
 #endif
          !

branches/UKMO/dev_r5518_fix_NaNs/NEMOGCM/NEMO/TOP_SRC/trcrst.F90

@@ -751 +751 @@
 
       IF( lwp )  WRITE(numout,*) 'STAT- ', names
-      !
-      ! RSRH The following should use fse3t_n not fse3t_a which 
-      ! will be undefined at the start of a run! Just because it 
-      ! doesn't crash on certain platforms doesn't make it universally 
-      ! safe or portable! 
-      zvol(:,:) = e1e2t(:,:) * fse3t_n(:,:,1) * tmask(:,:,1)
+      
+      ! fse3t_a will be undefined at the start of a run, but this routine
+      ! may be called at any stage! Hence we MUST make sure it is 
+      ! initialised to zero when allocated to enable us to test for 
+      ! zero content here and avoid potentially dangerous and non-portable 
+      ! operations (e.g. divide by zero, global sums of junk values etc.)   
+      zvol(:,:) = e1e2t(:,:) * fse3t_a(:,:,1) * tmask(:,:,1)
       ztraf = glob_sum( dgtr(:,:) * zvol(:,:) )
       !! areasf = glob_sum(e1e2t(:,:) * tmask(:,:,1) )