Changeset 15342

Timestamp:

2021-10-07T14:28:55+02:00 (20 months ago)

Author:

hadjt

Message:

The region mean code namelist now has an entry to specified number of regions, this used to be counted in iom_init, which was messy. Instead, it is read from the namelist, and checked in regionmean initialization, and the model is stopped if there is a mismatch.

Still without iom_put or kara mld

Location:

NEMO/branches/UKMO/NEMO_4.0.4_CO9_shelf_climate/src/OCE

Files:

• DIA/diaregmean.F90 (modified) (4 diffs)
• IOM/iom.F90 (modified) (6 diffs)

NEMO/branches/UKMO/NEMO_4.0.4_CO9_shelf_climate/src/OCE/DIA/diaregmean.F90

@@ -26 +26 @@
 
    LOGICAL , PUBLIC ::   ln_diaregmean  ! region mean calculation
+   INTEGER , PUBLIC ::   n_regions_output
    PUBLIC   dia_regmean_init            ! routine called by nemogcm.F90
    PUBLIC   dia_regmean                 ! routine called by diawri.F90   
@@ -79 +80 @@
       INTEGER  ::   jj,ji               ! i and j index
       INTEGER  ::   tmpint              ! temporary integer
+      INTEGER  ::   nn_regions_output,check_regions_output
       REAL(wp),  ALLOCATABLE,   DIMENSION(:,:) ::   tmpregion !: temporary region_mask
       INTEGER, DIMENSION(3) ::   zdimsz   ! number of elements in each of the 3 dimensions (i.e., lon, lat, no of masks, 297,  375,  4) for an array
       INTEGER               ::   zndims   ! number of dimensions in an array (i.e. 3, )
 
-
+      CHARACTER(len=128) :: stop_error_message
 #if defined key_fabm
       INTEGER               ::   js,jl,jn, tmp_dummy
@@ -93 +95 @@
 #endif
 
-      !
-      NAMELIST/nam_diaregmean/ ln_diaregmean,ln_diaregmean_ascii,ln_diaregmean_bin,ln_diaregmean_nc,&
+      
+#if defined key_fabm
+      NAMELIST/nam_diaregmean/ ln_diaregmean,nn_regions_output,ln_diaregmean_ascii,ln_diaregmean_bin,ln_diaregmean_nc,&
         & ln_diaregmean_karamld, ln_diaregmean_pea,ln_diaregmean_diaar5,ln_diaregmean_diasbc,ln_diaregmean_bgc
+#else
+      NAMELIST/nam_diaregmean/ ln_diaregmean,nn_regions_output,ln_diaregmean_ascii,ln_diaregmean_bin,ln_diaregmean_nc,&
+        & ln_diaregmean_karamld, ln_diaregmean_pea,ln_diaregmean_diaar5,ln_diaregmean_diasbc
+#endif
       
       
@@ -292 +299 @@
           ! without missing any number, so the number of regions is the maximum number + 1 (for land). mpp_max across the 
           ! processors to get the global maxima
+          check_regions_output = 0
           DO maskno = 1,nmasks
               tmpint = maxval(region_mask(:,:,maskno))
               CALL mpp_max( 'diaregionmean', tmpint )
               nreg_mat(maskno) = tmpint + 1
-          END DO
-        
+              check_regions_output = check_regions_output + tmpint + 1
+          END DO
+
+
+
+          ! can't use IOM call, as this iom isn't called yet... maybe move into step after iom_init?
+          n_regions_output = nn_regions_output
+          write (stop_error_message, "(A70,I3,A8,I3)") "dia_regmean_init: namelist:nam_diaregmean nn_regions_output should be ",check_regions_output," but is ",n_regions_output
+          
+          IF (check_regions_output .NE. n_regions_output) THEN
+              CALL ctl_stop(trim(stop_error_message))
+          ENDIF
+
+
+
+
           IF(lwp) THEN 
               ! if writing out as binary and text, open the files. 

NEMO/branches/UKMO/NEMO_4.0.4_CO9_shelf_climate/src/OCE/IOM/iom.F90

@@ -48 +48 @@
    USE diurnal_bulk, ONLY : ln_diurnal_only, ln_diurnal
 
+   !JT
+   !USE diaregmean , ONLY : ln_diaregmean, n_regions_output
+   !JT
+
    IMPLICIT NONE
    PUBLIC   !   must be public to be able to access iom_def through iom
@@ -58 +62 @@
    PUBLIC iom_init, iom_swap, iom_open, iom_close, iom_setkt, iom_varid, iom_get, iom_get_var
    PUBLIC iom_chkatt, iom_getatt, iom_putatt, iom_getszuld, iom_rstput, iom_delay_rst, iom_put
-
-   !JT
-   INTEGER , PUBLIC ::   n_regions_output
-   !JT
 
    PUBLIC iom_use, iom_context_finalize, iom_miss_val
@@ -126 +126 @@
 
     !JT
-
-      REAL(wp),  ALLOCATABLE,   DIMENSION(:,:) ::   tmpregion !: temporary region_mask
-      INTEGER, DIMENSION(3) ::   zdimsz   ! number of elements in each of the 3 dimensions (i.e., lon, lat, no of masks, 297,  375,  4) for an array
-      INTEGER               ::   zndims   ! number of dimensions in an array (i.e. 3, )
-      INTEGER :: inum, nmasks,ierr,maskno,idmaskvar,tmpint
-      REAL(wp), ALLOCATABLE,   DIMENSION(:,:,:)  ::   tmp_region_mask_real   ! tempory region_mask of reals
-      
       LOGICAL ::   ln_diaregmean  ! region mean calculation
-   
+      INTEGER  ::  nn_regions_output, n_regions_output
     
       INTEGER :: ios                  ! Local integer output status for namelist read
@@ -148 +141 @@
       LOGICAL :: ln_diaregmean_bgc  ! region mean calculation including BGC
 #endif
-
-
     !JT
 
@@ -174 +165 @@
       
 #if defined key_fabm
-      NAMELIST/nam_diaregmean/ ln_diaregmean,ln_diaregmean_ascii,ln_diaregmean_bin,ln_diaregmean_nc,&
+      NAMELIST/nam_diaregmean/ ln_diaregmean,nn_regions_output,ln_diaregmean_ascii,ln_diaregmean_bin,ln_diaregmean_nc,&
         & ln_diaregmean_karamld, ln_diaregmean_pea,ln_diaregmean_diaar5,ln_diaregmean_diasbc,ln_diaregmean_bgc
 #else
-      NAMELIST/nam_diaregmean/ ln_diaregmean,ln_diaregmean_ascii,ln_diaregmean_bin,ln_diaregmean_nc,&
+      NAMELIST/nam_diaregmean/ ln_diaregmean,nn_regions_output,ln_diaregmean_ascii,ln_diaregmean_bin,ln_diaregmean_nc,&
         & ln_diaregmean_karamld, ln_diaregmean_pea,ln_diaregmean_diaar5,ln_diaregmean_diasbc
 #endif
@@ -193 +184 @@
       IF(lwm) WRITE ( numond, nam_diaregmean )
 
-      IF (ln_diaregmean) THEN
-      
-        ! Open region mask for region means, and retrieve the size of the mask (number of levels)          
-          CALL iom_open ( 'region_mask.nc', inum )
-          idmaskvar = iom_varid( inum, 'mask', kdimsz=zdimsz, kndims=zndims, ldstop = .FALSE.)          
-          nmasks = zdimsz(3)
-          
-          ! read in the region mask (which contains floating point numbers) into a temporary array of reals.
-          ALLOCATE( tmp_region_mask_real(jpi,jpj,nmasks),  STAT= ierr )
-          IF( ierr /= 0 )   CALL ctl_stop( 'dia_regmean_init: failed to allocate tmp_region_mask_real array' )
-          
-          ! Use jpdom_unknown to read in a n layer mask.
-          tmp_region_mask_real(:,:,:) = 0
-          CALL iom_get( inum, jpdom_unknown, 'mask', tmp_region_mask_real(1:nlci,1:nlcj,1:nmasks),   &
-              &          kstart = (/ mig(1),mjg(1),1 /), kcount = (/ nlci,nlcj,nmasks /) )
-          
-          CALL iom_close( inum )
-          !Convert the region mask of reals into one of integers. 
-          
-          
-          n_regions_output = 0
-          DO maskno = 1,nmasks
-              tmpint = maxval(int(tmp_region_mask_real(:,:,maskno)))
-              CALL mpp_max( 'iom',tmpint )
-              n_regions_output = n_regions_output + (tmpint + 1)
-          END DO
-      
-          
-        
+      !IF(lwp) WRITE(numout,*) 'JT IOM_init: ln_diaregmean = ', ln_diaregmean
+      IF (ln_diaregmean) THEN      
+        n_regions_output = nn_regions_output
+        IF(lwp) WRITE(numout,*) 'JT IOM_init: n_regions_output , ln_diaregmean =  ', n_regions_output ,ln_diaregmean
+         
       ELSE
         n_regions_output = 1
-      ENDIF
-      
-      
-
-
-
+        IF(lwp) WRITE(numout,*) 'JT IOM_init: n_regions_output , ln_diaregmean =  ', n_regions_output ,ln_diaregmean
+      ENDIF
     !JT