Merge branch 'dev/gfdl' into horiz_param_args

config_src/infra/FMS1/MOM_domain_infra.F90

@@ -1716,13 +1716,13 @@ subroutine clone_MD_to_d2D(MD_in, mpp_domain, min_halo, halo_size, symmetric, &
                 symmetry=symmetric_dom, xextent=xextent, yextent=yextent, name=dom_name)
   endif
 
-  if ((MD_in%io_layout(1) + MD_in%io_layout(2) > 0) .and. &
-      (MD_in%layout(1)*MD_in%layout(2) > 1)) then
-    call mpp_define_io_domain(mpp_domain, MD_in%io_layout)
-  else
-    call mpp_define_io_domain(mpp_domain, (/ 1, 1 /) )
+  if (MD_in%layout(1) * MD_in%layout(2) > 1) then
+    if ((MD_in%io_layout(1) + MD_in%io_layout(2) > 0)) then
+      call mpp_define_io_domain(mpp_domain, MD_in%io_layout)
+    else
+      call mpp_define_io_domain(mpp_domain, [1, 1] )
+    endif
   endif
-
 end subroutine clone_MD_to_d2D
 
 !> Returns the index ranges that have been stored in a MOM_domain_type

src/framework/MOM_io.F90

@@ -6,7 +6,7 @@ module MOM_io
 use MOM_array_transform,  only : allocate_rotated_array, rotate_array
 use MOM_array_transform,  only : rotate_array_pair, rotate_vector
 use MOM_domains,          only : MOM_domain_type, domain1D, broadcast, get_domain_components
-use MOM_domains,          only : rescale_comp_data, AGRID, BGRID_NE, CGRID_NE
+use MOM_domains,          only : rescale_comp_data, num_PEs, AGRID, BGRID_NE, CGRID_NE
 use MOM_dyn_horgrid,      only : dyn_horgrid_type
 use MOM_ensemble_manager, only : get_ensemble_id
 use MOM_error_handler,    only : MOM_error, NOTE, FATAL, WARNING, is_root_PE
@@ -236,6 +236,8 @@ subroutine create_file(IO_handle, filename, vars, novars, fields, threading, tim
     IsgB = dG%IsgB ; IegB = dG%IegB ; JsgB = dG%JsgB ; JegB = dG%JegB
   endif
 
+  if (domain_set .and. (num_PEs() == 1)) thread = SINGLE_FILE
+
   one_file = .true.
   if (domain_set) one_file = (thread == SINGLE_FILE)