diff --git a/CICE-interface/CICE b/CICE-interface/CICE index cc85eaa90a..116fc5b4f6 160000 --- a/CICE-interface/CICE +++ b/CICE-interface/CICE @@ -1 +1 @@ -Subproject commit cc85eaa90a4451981ddb91dbd7baccf2180c7c1d +Subproject commit 116fc5b4f65325342c421326bb45c2b1c98b0dbe diff --git a/CICE-interface/CMakeLists.txt b/CICE-interface/CMakeLists.txt index 5ad78a1616..1097dbfcab 100644 --- a/CICE-interface/CMakeLists.txt +++ b/CICE-interface/CMakeLists.txt @@ -43,8 +43,7 @@ else() endif() # Configuration Options -#set(CICE_IO "PIO" CACHE STRING "CICE OPTIONS: Choose IO 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 diff --git a/tests/tests/atm_ds2s_docn_pcice b/tests/tests/atm_ds2s_docn_pcice index a4d3b63daf..7414923a82 100644 --- a/tests/tests/atm_ds2s_docn_pcice +++ b/tests/tests/atm_ds2s_docn_pcice @@ -105,8 +105,6 @@ export CICE_PRESCRIBED=true export stream_files_dice=$ocn_data export MESH_DICE=$MESH_OCN export eps_imesh=4.0e-1 -export CICE_RESTART_FORMAT='hdf5' -export CICE_HISTORY_FORMAT='hdf5' export RESTART_N=12 export RESTART_INTERVAL="${RESTART_N} -1"