Change default forcing to JRA55do, changes answers

.github/workflows/test-cice.yml

@@ -121,7 +121,7 @@ jobs:
           cd $HOME/cice-dirs/input
           wget --progress=dot:giga https://zenodo.org/record/3728358/files/CICE_data_gx3_grid_ic-20200320.tar.gz && tar xvfz CICE_data_gx3_grid_ic-20200320.tar.gz
           wget --progress=dot:giga https://zenodo.org/record/3728362/files/CICE_data_gx3_forcing_NCAR_bulk-20200320.tar.gz && tar xvfz CICE_data_gx3_forcing_NCAR_bulk-20200320.tar.gz
-          wget --progress=dot:giga https://zenodo.org/record/3728364/files/CICE_data_gx3_forcing_JRA55-20200320.tar.gz && tar xvfz CICE_data_gx3_forcing_JRA55-20200320.tar.gz
+          wget --progress=dot:giga https://zenodo.org/record/8117763/files/CICE_data_gx3_forcing_JRA55do-20230703.tar.gz && tar xvfz CICE_data_gx3_forcing_JRA55do-20230703.tar.gz
           pwd
           ls -alR
 #      - name: run case

configuration/scripts/options/set_nml.gx1

@@ -14,7 +14,7 @@ maskhalo_remap = .true.
 maskhalo_bound = .true.
 fyear_init      = 2005
 atm_data_format = 'nc'
-atm_data_type   = 'JRA55'
+atm_data_type   = 'JRA55do'
 atm_data_dir    = 'ICE_MACHINE_INPUTDATA/CICE_data/forcing/gx1'
 precip_units    = 'mks'
 ocn_data_dir    = 'ICE_MACHINE_INPUTDATA/CICE_data/forcing/gx1/CESM/MONTHLY'

configuration/scripts/options/set_nml.gx3

@@ -11,7 +11,7 @@ kmt_file    = 'ICE_MACHINE_INPUTDATA/CICE_data/grid/gx3/kmt_gx3.bin'
 bathymetry_file = 'ICE_MACHINE_INPUTDATA/CICE_data/grid/gx3/global_gx3.bathy.nc'
 fyear_init      = 2005
 atm_data_format = 'nc'
-atm_data_type   = 'JRA55'
+atm_data_type   = 'JRA55do'
 atm_data_dir    = 'ICE_MACHINE_INPUTDATA/CICE_data/forcing/gx3'
 precip_units    = 'mks'
 ocn_data_format = 'bin'

configuration/scripts/options/set_nml.tx1

@@ -8,6 +8,6 @@ grid_file   = 'ICE_MACHINE_INPUTDATA/CICE_data/grid/tx1/grid_tx1.bin'
 kmt_file    = 'ICE_MACHINE_INPUTDATA/CICE_data/grid/tx1/kmt_tx1.bin'
 atm_data_dir    = 'ICE_MACHINE_INPUTDATA/CICE_data/forcing/tx1'
 atm_data_format = 'nc'
-atm_data_type   = 'JRA55'
+atm_data_type   = 'JRA55do'
 year_init      = 2005
 fyear_init      = 2005

configuration/scripts/tests/base_suite.ts

@@ -12,7 +12,7 @@ smoke          gx3     4x1        diag1,run5day,thread      smoke_gx3_8x2_diag1_
 smoke          gx3     1x8        diag1,run5day,evp1d
 restart        gx1    40x4        droundrobin,medium
 restart        tx1    40x4        dsectrobin,medium
-restart        tx1    40x4        dsectrobin,medium,jra55do
+restart        tx1    40x4        dsectrobin,medium,jra55
 restart        gx3     4x4        none
 restart        gx3    10x4        maskhalo
 restart        gx3     6x2        alt01
@@ -47,14 +47,14 @@ smoke          gbox80  1x1        boxslotcyl
 smoke          gbox12  1x1x12x12x1  boxchan,diag1,debug
 restart        gx3     8x2        modal
 smoke          gx3     8x2        bgcz
-smoke          gx3     8x2        jra55do
+smoke          gx3     8x2        jra55
 smoke          gx3     8x2        bgczm,debug
 smoke          gx3     8x1        bgcskl,debug
 #smoke          gx3     4x1       bgcz,thread        smoke_gx3_8x2_bgcz
 restart        gx1     4x2        bgcsklclim,medium
 restart        gx1     8x1        bgczclim,medium
 smoke          gx1    24x1        medium,run90day,yi2008
-smoke          gx1    24x1        medium,run90day,yi2008,jra55do
+smoke          gx1    24x1        medium,run90day,yi2008,jra55
 smoke          gx3     8x1        medium,run90day,yi2008
 restart        gx1    24x1        short
 restart        gx1    16x2        seabedLKD,gx1apr,short,debug

doc/source/developer_guide/dg_forcing.rst

@@ -21,10 +21,10 @@ primitive, in part due to historical reasons and in part because standalone runs
 are discouraged for evaluating complex science.  In general, most implementations
 use aspects of the following approach,
 
-- Input files are organized by year.  The underlying implementation provides for some flexibility and extensibility in filenames.  For instance, JRA55 and JRA55do filenames can have syntax like ``[JRA55,JRA55do][_$grid,'']_03hr_forcing[_$grid,'']_$year.nc`` where $grid is optional or may be present at one of two locations within the filename.  This implementation exists to support the current naming conventions within the gx1, gx3, and tx1 JRA55 and JRA55do CICE_DATA directory structure automatically.  See **JRA55_files** in **ice_forcing.F90** for more details.
+- Input files are organized by year.  The underlying implementation provides for some flexibility and extensibility in filenames.  For instance, JRA55 and JRA55do filenames can have syntax like ``[JRA55,JRA55do][_$grid]_03hr_forcing[_$grid]_$year.nc`` where $grid is optional or may be present at one of two locations within the filename.  This implementation exists to support the current naming conventions within the gx1, gx3, and tx1 JRA55 and JRA55do CICE_DATA directory structure automatically.  See **JRA55_files** in **ice_forcing.F90** for more details.
 - Namelist inputs ``fyear`` and ``ycycle`` specify the forcing year dataset.
 - The forcing year is computed on the fly and is assumed to be cyclical over the forcing dataset length defined by ``ycycle``.
-- The namelist ``atm_data_dir`` specifies the path or partial path for the atmosphere input data files and the namelist ``atm_data_type`` defines the atmospheric forcing mode.  ``atm_data_type`` values of ``JRA55``, ``JRA55do``, or ``ncar`` provide some flexibility for directory paths and filenames.  Many details can be gleaned from the CICE_data directory structure and file names as well as from the implementation in **ice_forcing.F90**.  But the main point is that atm_data_dir should be set to ${CICE_DATA_root}/forcing/$grid/[JRA55,JRA55do,NCAR_bulk,''] where [JRA55,JRA55do,NCAR_bulk] are optional but provided for backwards compatibility.  grid is typically gx1, gx3, tx1, or similar.
+- The namelist ``atm_data_dir`` specifies the path or partial path for the atmosphere input data files and the namelist ``atm_data_type`` defines the atmospheric forcing mode.  ``atm_data_type`` values of ``JRA55``, ``JRA55do``, or ``ncar`` provide some flexibility for directory paths and filenames.  Many details can be gleaned from the CICE_data directory structure and file names as well as from the implementation in **ice_forcing.F90**.  But the main point is that atm_data_dir should be set to ``${CICE_DATA_root}/forcing/$grid/[JRA55,JRA55do,NCAR_bulk]`` where ``[JRA55,JRA55do,NCAR_bulk]`` are optional but provided for backwards compatibility.  grid is typically gx1, gx3, tx1, or similar.
 - The namelist ``ocn_data_dir`` specifies the directory of the ocean input data files and the namelist ``ocn_data_type`` defines the ocean forcing mode.
 - The filenames follow a particular naming convention that is defined in the source code (ie. subroutine **JRA55_files**).  The forcing year is typically found just before the **.nc** part of the filename and there are tools (subroutine **file_year**) to update the filename based on the model year and appropriate forcing year.
 - The input data time axis is generally NOT read by the forcing subroutine.  The forcing frequency is hardwired into the model and the file record number is computed based on the forcing frequency and model time.  Mixing leap year input data and noleap model calendars (and vice versa) is not handled particularly gracefully.  The CICE model does not read or check against the input data time axis.