Review feedback

CICE/patches/ice_domain.F90.patch

@@ -1,16 +1,7 @@
 diff --git a/cicecore/cicedyn/infrastructure/ice_domain.F90 b/cicecore/cicedyn/infrastructure/ice_domain.F90
-index 8b680f2..cf13fcc 100644
+index 8b680f2..47a0f00 100644
 --- a/cicecore/cicedyn/infrastructure/ice_domain.F90
 +++ b/cicecore/cicedyn/infrastructure/ice_domain.F90
-@@ -88,7 +88,7 @@ module ice_domain
-        distribution_wght_file  ! file for distribution_wght=file
-
-     integer (int_kind) :: &
--       nprocs                ! num of processors
-+       nprocs, nprocs_x, nprocs_y                ! num of processors
-
- !***********************************************************************
-
 @@ -101,7 +101,7 @@ subroutine init_domain_blocks
  !  This routine reads in domain information and calls the routine
  !  to set up the block decomposition.
@@ -20,39 +11,60 @@ index 8b680f2..cf13fcc 100644
     use ice_domain_size, only: ncat, nilyr, nslyr, max_blocks, &
         nx_global, ny_global, block_size_x, block_size_y
     use ice_fileunits, only: goto_nml
-@@ -204,6 +204,14 @@ subroutine init_domain_blocks
+@@ -112,7 +112,8 @@ subroutine init_domain_blocks
+ !----------------------------------------------------------------------
 
-    endif
+    integer (int_kind) :: &
+-      nml_error          ! namelist read error flag
++      nml_error, &          ! namelist read error flag
++      nprocs_x, nprocs_y    ! procs decomposed into blocks
 
-+   if (nprocs .ne. -1) then
-+      if (my_task == master_task) then
-+         write(nu_diag,*) subname//' WARNING: nprocs is deprecated, please remove from namelist'
-+      endif
-+   endif
-+
-+   nprocs = get_num_procs()
-+
-    call broadcast_scalar(nprocs,            master_task)
-    call broadcast_scalar(processor_shape,   master_task)
-    call broadcast_scalar(distribution_type, master_task)
-@@ -216,10 +224,14 @@ subroutine init_domain_blocks
+    character(len=char_len)      :: nml_name ! text namelist name
+    character(len=char_len_long) :: tmpstr2 ! for namelist check
+@@ -216,21 +217,33 @@ subroutine init_domain_blocks
     call broadcast_scalar(maskhalo_bound,    master_task)
     call broadcast_scalar(add_mpi_barriers,  master_task)
     call broadcast_scalar(debug_blocks,      master_task)
-+
-+   ! update nprocs_x and nprocs_y
-+   call proc_decomposition(nprocs, nprocs_x, nprocs_y)
-+   ! set max_blocks
-    if (my_task == master_task) then
-      if (max_blocks < 1) then
+-   if (my_task == master_task) then
+-     if (max_blocks < 1) then
 -       max_blocks=( ((nx_global-1)/block_size_x + 1) *         &
 -                    ((ny_global-1)/block_size_y + 1) - 1) / nprocs + 1
-+       max_blocks=((nx_global-1)/block_size_x/nprocs_x+1) * &
+-       max_blocks=max(1,max_blocks)
+-       write(nu_diag,'(/,a52,i6,/)') &
+-         '(ice_domain): max_block < 1: max_block estimated to ',max_blocks
+-     endif
+-   endif
+    call broadcast_scalar(max_blocks,        master_task)
+    call broadcast_scalar(block_size_x,      master_task)
+    call broadcast_scalar(block_size_y,      master_task)
+    call broadcast_scalar(nx_global,         master_task)
+    call broadcast_scalar(ny_global,         master_task)
+
++   ! Set nprocs if not set in namelist
++   if (nprocs == -1) then
++      nprocs = get_num_procs()
++   else if (nprocs /= get_num_procs()) then
++      write(nu_diag,*) subname,' ERROR: nprocs, get_num_procs = ',nprocs,get_num_procs()
++      call abort_ice(subname//' ERROR: Input nprocs not same as system request', file=__FILE__, line=__LINE__)
++   endif
++
++   ! Determine max_blocks if not set
++   if (max_blocks < 1) then
++      call proc_decomposition(nprocs, nprocs_x, nprocs_y)
++      max_blocks=((nx_global-1)/block_size_x/nprocs_x+1) * &
 +                  ((ny_global-1)/block_size_y/nprocs_y+1)
-        max_blocks=max(1,max_blocks)
-        write(nu_diag,'(/,a52,i6,/)') &
-          '(ice_domain): max_block < 1: max_block estimated to ',max_blocks
-@@ -242,16 +254,6 @@ subroutine init_domain_blocks
++      max_blocks=max(1,max_blocks)
++      if (my_task == master_task) then
++         write(nu_diag,'(/,a52,i6,/)') &
++            '(ice_domain): max_block < 1: max_block estimated to ',max_blocks
++      endif
++   endif
++   
++   
+ !----------------------------------------------------------------------
+ !
+ !  perform some basic checks on domain
+@@ -242,16 +255,6 @@ subroutine init_domain_blocks
        !*** domain size zero or negative
        !***
        call abort_ice(subname//' ERROR: Invalid domain: size < 1', file=__FILE__, line=__LINE__) ! no domain