Add PIO namelist control for CICE

.gitmodules

@@ -28,8 +28,10 @@
   branch = dev/emc
 [submodule "CICE"]
   path = CICE-interface/CICE
-  url = https://github.com/NOAA-EMC/CICE
-  branch = emc/develop
+  #url = https://github.com/NOAA-EMC/CICE
+  #branch = emc/develop
+  url = https://github.com/DeniseWorthen/CICE
+  branch=feature/pio_options
 [submodule "CDEPS"]
   path = CDEPS-interface/CDEPS
   url = https://github.com/NOAA-EMC/CDEPS

CICE-interface/CMakeLists.txt

@@ -39,7 +39,7 @@ else()
 endif()
 
 # Configuration Options
-set(CICE_IO "NetCDF" CACHE STRING "CICE OPTIONS: Choose IO options.")
+set(CICE_IO "PIO" CACHE STRING "CICE OPTIONS: Choose IO options.")
 set_property(CACHE CICE_IO PROPERTY STRINGS "NetCDF" "PIO" "Binary")
 
 # Too many files to list, so include them via this file

tests/default_vars.sh

@@ -653,6 +653,24 @@ export CICE_RUNID=unknown
 export CICE_USE_RESTART_TIME=.false.
 export CICE_RESTART_DIR=./RESTART/
 export CICE_RESTART_FILE=iced
+
+export CICE_RESTART_FORMAT='pnetcdf2'
+export CICE_RESTART_IOTASKS=-99
+export CICE_RESTART_REARR='box'
+export CICE_RESTART_ROOT=-99
+export CICE_RESTART_STRIDE=-99
+export CICE_RESTART_CHUNK=0,0
+export CICE_RESTART_DEFLATE=0
+
+export CICE_HISTORY_FORMAT='pnetcdf2'
+export CICE_HISTORY_IOTASKS=-99
+export CICE_HISTORY_REARR='box'
+export CICE_HISTORY_ROOT=-99
+export CICE_HISTORY_STRIDE=-99
+export CICE_HISTORY_CHUNK=0,0
+export CICE_HISTORY_DEFLATE=0
+export CICE_HISTORY_PREC=4
+
 export CICE_DUMPFREQ=d
 export CICE_DUMPFREQ_N=1000
 export CICE_DIAGFREQ=`expr $FHMAX \* 3600 / $DT_CICE`

tests/parm/ice_in.IN

@@ -1,48 +1,61 @@
 &setup_nml
-    days_per_year  = 365
-    use_leap_years = .true.
-    year_init      = @[SYEAR]
-    month_init     = @[SMONTH]
-    day_init       = @[SDAY]
-    sec_init       = @[SECS]
-    dt             = @[DT_CICE]
-    npt            = @[CICE_NPT]
-    ndtd           = 1
-    runtype        = '@[CICE_RUNTYPE]'
-    runid          = '@[CICE_RUNID]'
-    ice_ic         = 'cice_model.res.nc'
-    restart        = .true.
-    restart_ext    = .false.
-    use_restart_time = @[CICE_USE_RESTART_TIME]
-    restart_format = 'nc'
-    lcdf64         = .false.
-    numin          = 21
-    numax          = 89
-    restart_dir    = '@[CICE_RESTART_DIR]'
-    restart_file   = '@[CICE_RESTART_FILE]'
-    pointer_file   = './ice.restart_file'
-    dumpfreq       = '@[CICE_DUMPFREQ]'
-    dumpfreq_n     = @[CICE_DUMPFREQ_N]
-    dump_last      = .false.
-    bfbflag        = 'off'
-    diagfreq       = @[CICE_DIAGFREQ]
-    diag_type      = 'file'
-    diag_file      = 'ice_diag.d'
-    print_global   = .true.
-    print_points   = .true.
-    latpnt(1)      =  90.
-    lonpnt(1)      =  0.
-    latpnt(2)      = -65.
-    lonpnt(2)      = -45.
-    histfreq       = 'm','d','h','x','x'
-    histfreq_n     = @[CICE_HISTFREQ_N]
-    hist_avg       = @[CICE_HIST_AVG]
-    history_dir    = '@[CICE_HISTORY_DIR]'
-    history_file   = 'iceh'
-    write_ic       = .true.
-    incond_dir     = '@[CICE_INCOND_DIR]'
-    incond_file    = 'iceh_ic'
-    version_name   = 'CICE_6.0.2'
+    days_per_year       = 365
+    use_leap_years      = .true.
+    year_init           = @[SYEAR]
+    month_init          = @[SMONTH]
+    day_init            = @[SDAY]
+    sec_init            = @[SECS]
+    dt                  = @[DT_CICE]
+    npt                 = @[CICE_NPT]
+    ndtd                = 1
+    runtype             = '@[CICE_RUNTYPE]'
+    runid               = '@[CICE_RUNID]'
+    ice_ic              = 'cice_model.res.nc'
+    restart             = .true.
+    restart_ext         = .false.
+    use_restart_time    = @[CICE_USE_RESTART_TIME]
+    numin               = 21
+    numax               = 89
+    restart_format      = '@[CICE_RESTART_FORMAT]'
+    restart_iotasks     = @[CICE_RESTART_IOTASKS]
+    restart_rearranger  = '@[CICE_RESTART_REARR]'
+    restart_root        = @[CICE_RESTART_ROOT]
+    restart_stride      = @[CICE_RESTART_STRIDE]
+    restart_chunksize   = @[CICE_RESTART_CHUNK]
+    restart_deflate     = @[CICE_RESTART_DEFLATE]
+    restart_dir         = '@[CICE_RESTART_DIR]'
+    restart_file        = '@[CICE_RESTART_FILE]'
+    pointer_file        = './ice.restart_file'
+    dumpfreq            = '@[CICE_DUMPFREQ]'
+    dumpfreq_n          = @[CICE_DUMPFREQ_N]
+    dump_last           = .false.
+    bfbflag             = 'off'
+    diagfreq            = @[CICE_DIAGFREQ]
+    diag_type           = 'file'
+    diag_file           = 'ice_diag.d'
+    print_global        = .true.
+    print_points        = .true.
+    latpnt(1)           =  90.
+    lonpnt(1)           =  0.
+    latpnt(2)           = -65.
+    lonpnt(2)           = -45.
+    history_format      = '@[CICE_HISTORY_FORMAT]'
+    history_iotasks     = @[CICE_HISTORY_IOTASKS]
+    history_rearranger  = '@[CICE_HISTORY_REARR]'
+    history_root        = @[CICE_HISTORY_ROOT]
+    history_stride      = @[CICE_HISTORY_STRIDE]
+    history_chunksize   = @[CICE_HISTORY_CHUNK]
+    history_deflate     = @[CICE_HISTORY_DEFLATE]
+    history_precision   = @[CICE_HISTORY_PREC]
+    histfreq            = 'm','d','h','x','x'
+    histfreq_n          = @[CICE_HISTFREQ_N]
+    hist_avg            = @[CICE_HIST_AVG]
+    history_dir         = '@[CICE_HISTORY_DIR]'
+    history_file        = 'iceh'
+    write_ic            = .true.
+    incond_dir          = '@[CICE_INCOND_DIR]'
+    incond_file         = 'iceh_ic'
+    version_name        = 'CICE_6.0.2'
 /
 
 &grid_nml

tests/test_changes.list

@@ -1,5 +1,9 @@
-hafs_regional_atm_ocn intel
-hafs_regional_docn intel
-hafs_regional_docn_oisst intel
-control_p8_atmlnd intel
-control_restart_p8_atmlnd intel
+cpld_control_gfsv17_iau intel
+cpld_control_ciceC_p8 intel
+cpld_control_c192_p8 intel
+cpld_restart_c192_p8 intel
+cpld_control_c48 intel
+datm_cdeps_ciceC_cfsr intel
+datm_cdeps_mx025_cfsr intel
+datm_cdeps_mx025_gefs intel
+cpld_control_nowave_noaero_p8 gnu