From 0bf0fdcabd00df95d1028a66f71784b0b68f1178 Mon Sep 17 00:00:00 2001
From: "David A. Bailey" <dbailey@ucar.edu>
Date: Fri, 16 Dec 2022 17:43:19 -0700
Subject: [PATCH] Fix OMP setup and 'setmask' (#806)

* Fix OMP setup

* Update meshgrid
---
 cicecore/cicedyn/general/ice_init.F90              | 3 +--
 cicecore/cicedyn/infrastructure/ice_grid.F90       | 4 +---
 cicecore/drivers/nuopc/cmeps/ice_comp_nuopc.F90    | 4 ++--
 cicecore/drivers/nuopc/cmeps/ice_import_export.F90 | 4 ++--
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/cicecore/cicedyn/general/ice_init.F90 b/cicecore/cicedyn/general/ice_init.F90
index 1d16d1ac2..d56ad002e 100644
--- a/cicecore/cicedyn/general/ice_init.F90
+++ b/cicecore/cicedyn/general/ice_init.F90
@@ -2422,8 +2422,7 @@ subroutine input_data
           grid_type  /=  'rectangular'    .and. &
           grid_type  /=  'cpom_grid'      .and. &
           grid_type  /=  'regional'       .and. &
-          grid_type  /=  'latlon'         .and. &
-          grid_type  /=  'setmask' ) then
+          grid_type  /=  'latlon') then
          if (my_task == master_task) write(nu_diag,*) subname//' ERROR: unknown grid_type=',trim(grid_type)
          abort_list = trim(abort_list)//":20"
       endif
diff --git a/cicecore/cicedyn/infrastructure/ice_grid.F90 b/cicecore/cicedyn/infrastructure/ice_grid.F90
index d6c612f00..b775c21f2 100644
--- a/cicecore/cicedyn/infrastructure/ice_grid.F90
+++ b/cicecore/cicedyn/infrastructure/ice_grid.F90
@@ -508,7 +508,6 @@ subroutine init_grid2
       !-----------------------------------------------------------------
 
 ! This code does not work in CESM. Needs to be investigated further.
-#ifndef CESMCOUPLED
 #if defined (_OPENMP)
        !$OMP PARALLEL DO ORDERED PRIVATE(iblk) SCHEDULE(runtime)
        do iblk = 1, nblocks
@@ -521,12 +520,11 @@ subroutine init_grid2
                 write(nu_diag,*) subname,'  omp schedule = ',ompsk,ompcs
              endif
              write(nu_diag,*) subname,' block, thread = ',iblk,OMP_GET_THREAD_NUM()
-             call flush_fileunit(nu_diag)
              !$OMP END ORDERED
           endif
        enddo
        !$OMP END PARALLEL DO
-#endif
+       call flush_fileunit(nu_diag)
 #endif
 
       !-----------------------------------------------------------------
diff --git a/cicecore/drivers/nuopc/cmeps/ice_comp_nuopc.F90 b/cicecore/drivers/nuopc/cmeps/ice_comp_nuopc.F90
index 5f2995132..b94fcff05 100644
--- a/cicecore/drivers/nuopc/cmeps/ice_comp_nuopc.F90
+++ b/cicecore/drivers/nuopc/cmeps/ice_comp_nuopc.F90
@@ -21,7 +21,7 @@ module ice_comp_nuopc
 
   use ice_import_export  , only : ice_import, ice_export, ice_advertise_fields, ice_realize_fields
   use ice_domain_size    , only : nx_global, ny_global
-  use ice_grid           , only : grid_type, init_grid2
+  use ice_grid           , only : grid_format, init_grid2
   use ice_communicate    , only : init_communicate, my_task, master_task, mpi_comm_ice
   use ice_calendar       , only : force_restart_now, write_ic, init_calendar
   use ice_calendar       , only : idate, mday, mmonth, myear, year_init
@@ -684,7 +684,7 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
        if (ChkErr(rc,__LINE__,u_FILE_u)) return
 
        ! Initialize the cice mesh and the cice mask
-       if (trim(grid_type) == 'setmask') then
+       if (trim(grid_format) == 'meshnc') then
           ! In this case cap code determines the mask file
           call ice_mesh_setmask_from_maskfile(ice_maskfile, ice_mesh, rc=rc)
           if (ChkErr(rc,__LINE__,u_FILE_u)) return
diff --git a/cicecore/drivers/nuopc/cmeps/ice_import_export.F90 b/cicecore/drivers/nuopc/cmeps/ice_import_export.F90
index e4db010de..60059e39a 100644
--- a/cicecore/drivers/nuopc/cmeps/ice_import_export.F90
+++ b/cicecore/drivers/nuopc/cmeps/ice_import_export.F90
@@ -27,7 +27,7 @@ module ice_import_export
   use ice_arrays_column  , only : floe_rad_c, wave_spectrum
   use ice_state          , only : vice, vsno, aice, aicen_init, trcr, trcrn
   use ice_grid           , only : tlon, tlat, tarea, tmask, anglet, hm
-  use ice_grid           , only : grid_type
+  use ice_grid           , only : grid_format
   use ice_mesh_mod       , only : ocn_gridcell_frac
   use ice_boundary       , only : ice_HaloUpdate
   use ice_fileunits      , only : nu_diag, flush_fileunit
@@ -1059,7 +1059,7 @@ subroutine ice_export( exportState, rc )
     call state_setexport(exportState, 'ice_fraction', input=ailohi, rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
 
-    if (trim(grid_type) == 'setmask') then
+    if (trim(grid_format) == 'meshnc') then
        call state_setexport(exportState, 'ice_mask', input=ocn_gridcell_frac, rc=rc)
        if (ChkErr(rc,__LINE__,u_FILE_u)) return
     else