Changeset 8386

Timestamp:

2017-07-27T14:22:16+02:00 (7 years ago)

Author:

frrh

Message:

Avoid passing in the same variable twice to repcmo with conflicting
INTENTS which leads to junk values in coupling fields and crashes
when using -ei.

Apply what I think is the correct solution to use fse3t_n instead
of fse3t_a in passive tracer summary output.

Location:

branches/UKMO/dev_r5518_fix_NaNs/NEMOGCM/NEMO

Files:

• OPA_SRC/SBC/sbccpl.F90 (modified) (5 diffs)
• TOP_SRC/trcrst.F90 (modified) (2 diffs)

branches/UKMO/dev_r5518_fix_NaNs/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

@@ -2137 +2137 @@
       REAL(wp) ::   zumax, zvmax
       REAL(wp), POINTER, DIMENSION(:,:)   ::   zfr_l, ztmp1, ztmp2, zotx1, zoty1, zotz1, zitx1, zity1, zitz1
+      REAL(wp), POINTER, DIMENSION(:,:)   ::   zotx1_in, zoty1_in
       REAL(wp), POINTER, DIMENSION(:,:,:) ::   ztmp3, ztmp4   
       !!----------------------------------------------------------------------
@@ -2143 +2144 @@
       !
       CALL wrk_alloc( jpi,jpj, zfr_l, ztmp1, ztmp2, zotx1, zoty1, zotz1, zitx1, zity1, zitz1 )
+      CALL wrk_alloc( jpi,jpj, zotx1_in, zoty1_in)
       CALL wrk_alloc( jpi,jpj,jpl, ztmp3, ztmp4 )
 
@@ -2411 +2413 @@
             zotx1(:,:) = un(:,:,1)  
             zoty1(:,:) = vn(:,:,1)  
-         ELSE        
+         ELSE
             SELECT CASE( TRIM( sn_snd_crt%cldes ) )
             CASE( 'oce only'             )      ! C-grid ==> T
@@ -2547 +2549 @@
                   ENDDO
                ENDDO
-               
+
                ! Ensure any N fold and wrap columns are updated
                CALL lbc_lnk(ztmp1, 'V', -1.0)
                CALL lbc_lnk(ztmp2, 'U', -1.0)
-               
+                            
                ikchoix = -1
-               CALL repcmo (zotx1,ztmp2,ztmp1,zoty1,zotx1,zoty1,ikchoix)
+               ! We need copies of zotx1 and zoty2 in order to avoid problems 
+               ! caused by INTENTs used in the following subroutine. 
+               zotx1_in(:,:) = zotx1(:,:)
+               zoty1_in(:,:) = zoty1(:,:)
+               CALL repcmo (zotx1_in,ztmp2,ztmp1,zoty1_in,zotx1,zoty1,ikchoix)
            ENDIF
          ENDIF
@@ -2622 +2628 @@
       !
       CALL wrk_dealloc( jpi,jpj, zfr_l, ztmp1, ztmp2, zotx1, zoty1, zotz1, zitx1, zity1, zitz1 )
+      CALL wrk_dealloc( jpi,jpj, zotx1_in, zoty1_in )
       CALL wrk_dealloc( jpi,jpj,jpl, ztmp3, ztmp4 )
       !

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

@@ -752 +752 @@
       IF( lwp )  WRITE(numout,*) 'STAT- ', names
       !
-      zvol(:,:) = e1e2t(:,:) * fse3t_a(:,:,1) * tmask(:,:,1)
+      ! 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)
       ztraf = glob_sum( dgtr(:,:) * zvol(:,:) )
       !! areasf = glob_sum(e1e2t(:,:) * tmask(:,:,1) )
@@ -764 +768 @@
 
       text_zmean = "N/A"
-      ! Avoid divide by zero when this routine is called from parts of the code
-      ! which may not have necessary time level variables to calculate areasf.
+      ! Avoid divide by zero. areasf must be positive.
       IF  (areasf > 0.0) THEN 
          zmean = ztraf / areasf