Change default forcing to JRA55do, changes answers

CICE-Consortium · Jul 14, 2023 · 12435b8 · 12435b8
1 parent f9d3002
commit 12435b8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/configuration/scripts/options/set_nml.gx1 b/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'

diff --git a/configuration/scripts/options/set_nml.gx3 b/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'

diff --git a/configuration/scripts/options/set_nml.tx1 b/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
diff --git a/configuration/scripts/tests/base_suite.ts b/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