Changeset 10492 for branches/UKMO/CO6_shelfclimate_fabm_noos/NEMOGCM/NEMO/OPA_SRC/DIA/diaregmean.F90

Timestamp:

2019-01-10T10:32:21+01:00 (5 years ago)

Author:

hadjt

Message:

Updated CO6_shelfclimate_fabm for new NOOS Cross sections

File:

• branches/UKMO/CO6_shelfclimate_fabm_noos/NEMOGCM/NEMO/OPA_SRC/DIA/diaregmean.F90 (modified) (11 diffs)

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

@@ -730 +730 @@
       ! Local variables
       INTEGER, DIMENSION(jpi, jpj) :: internal_region_mask    ! Input 3d field and mask 
+      REAL(wp), DIMENSION(jpi, jpj) :: internal_infield    ! Internal data field
       REAL(wp), ALLOCATABLE, DIMENSION(:) ::   zrmet_ave,zrmet_tot,zrmet_var,zrmet_cnt,zrmet_mask_id,zrmet_reg_id  ,zrmet_min,zrmet_max
       REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) ::   zrmet_out
@@ -744 +745 @@
       REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) ::   dummy_zrmet
       LOGICAL       ::   verbose     
-      verbose = .FALSE.
+      verbose = .False.
 
 
@@ -772 +773 @@
         IF( ierr /= 0 )   CALL ctl_stop( 'dia_wri_region_mean: failed to allocate zrmet_reg_id array' )
 
-
+  
       
         IF(lwp .AND. verbose) THEN 
@@ -779 +780 @@
               WRITE(numout,*)
         ENDIF
+        
+      DO ji = 1,jpi
+          DO jj = 1,jpj
+            internal_infield(ji,jj) = infield(ji,jj)
+          END DO
+      END DO
+        
+      ! Check for NANS # JT   03/09/2018
+      DO ji = 1,jpi
+          DO jj = 1,jpj
+              IF ( tmask(ji,jj,1) == 1.0_wp ) THEN
+                  IF ( internal_infield(ji,jj) .ne. internal_infield(ji,jj) ) THEN
+                      WRITE(numout,*) 'dia_wri_region_mean : '//tmp_name//' Nan at (kt,i,j): ',kt,ji - (-jpizoom+1-nimpp+1),jj - (-jpjzoom+1-njmpp+1)
+                      internal_infield(ji,jj) = 0.
+                  ENDIF
+              ELSE                
+                  IF ( internal_infield(ji,jj) .ne. internal_infield(ji,jj) ) THEN
+                      WRITE(numout,*) 'dia_wri_region_mean : '//tmp_name//' Masked Nan at (kt,i,j): ',kt,ji - (-jpizoom+1-nimpp+1),jj - (-jpjzoom+1-njmpp+1)
+                      internal_infield(ji,jj) = 0.
+                  ENDIF
+              ENDIF
+          END DO
+      END DO
+      
       
       zrmet_ave(:) = zmdi
@@ -845 +870 @@
           !WRITE(numout,*) kt,start_reg_mean_loop
           IF(lwp .AND. verbose) WRITE(numout,*) 'dia_wri_region_mean : '//tmp_name//'; begin spatial loops: '
-          DO ji = 1,jpi
-              DO jj = 1,jpj
+          DO ji = nldi,nlei
+              DO jj = nldj,nlej
                     IF ( tmask(ji,jj,1) == 1.0_wp ) THEN
                         ind = internal_region_mask(ji,jj)+1
-                        tot_mat(ind) = tot_mat(ind) + (infield(ji,jj))
-                        ssq_mat(ind) = ssq_mat(ind) + ( infield(ji,jj) *  infield(ji,jj))
+                        tot_mat(ind) = tot_mat(ind) + (internal_infield(ji,jj))
+                        ssq_mat(ind) = ssq_mat(ind) + ( internal_infield(ji,jj) *  internal_infield(ji,jj))
                         cnt_mat(ind) = cnt_mat(ind) + 1.
 
-                        min_mat(ind) = min(min_mat(ind),infield(ji,jj))
-                        max_mat(ind) = max(max_mat(ind),infield(ji,jj))
+                        min_mat(ind) = min(min_mat(ind),internal_infield(ji,jj))
+                        max_mat(ind) = max(max_mat(ind),internal_infield(ji,jj))
                     ENDIF
               END DO
@@ -963 +988 @@
 !            if (zrmet_val .LT. -1e16) zrmet_val = -1e16
 !            if (zrmet_val .GT. 1e16) zrmet_val = 1e16
-!            if (zrmet_val .NE. zrmet_val) zrmet_val = 0.
+            if (zrmet_val .NE. zrmet_val) zrmet_val = 1e20
             zrmet_out(:,:,jm) = zrmet_val
           END DO      
@@ -977 +1002 @@
 !            if (zrmet_val .LT. -1e16) zrmet_val = -1e16
 !            if (zrmet_val .GT. 1e16) zrmet_val = 1e16
-!            if (zrmet_val .NE. zrmet_val) zrmet_val = 0.
+            if (zrmet_val .NE. zrmet_val) zrmet_val = 1e20
             zrmet_out(:,:,jm) = zrmet_val
           END DO
@@ -991 +1016 @@
 !            if (zrmet_val .LT. -1e16) zrmet_val = -1e16
 !            if (zrmet_val .GT. 1e16) zrmet_val = 1e16
-!            if (zrmet_val .NE. zrmet_val) zrmet_val = 0.
+            if (zrmet_val .NE. zrmet_val) zrmet_val = 1e20
             zrmet_out(:,:,jm) = zrmet_val
           END DO
@@ -1005 +1030 @@
 !            if (zrmet_val .LT. -1e16) zrmet_val = -1e16
 !            if (zrmet_val .GT. 1e16) zrmet_val = 1e16
-!            if (zrmet_val .NE. zrmet_val) zrmet_val = 0.
+            if (zrmet_val .NE. zrmet_val) zrmet_val = 1e20
             zrmet_out(:,:,jm) = zrmet_val
           END DO
@@ -1019 +1044 @@
 !            if (zrmet_val .LT. -1e16) zrmet_val = -1e16
 !            if (zrmet_val .GT. 1e16) zrmet_val = 1e16
-!            if (zrmet_val .NE. zrmet_val) zrmet_val = 0.
+            if (zrmet_val .NE. zrmet_val) zrmet_val = 1e20
             zrmet_out(:,:,jm) = zrmet_val
           END DO
@@ -1033 +1058 @@
 !            if (zrmet_val .LT. -1e16) zrmet_val = -1e16
 !            if (zrmet_val .GT. 1e16) zrmet_val = 1e16
-!            if (zrmet_val .NE. zrmet_val) zrmet_val = 0.
+            if (zrmet_val .NE. zrmet_val) zrmet_val = 1e20
             zrmet_out(:,:,jm) = zrmet_val
           END DO