-
Notifications
You must be signed in to change notification settings - Fork 132
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added new capability in ice_forcing.F90 to test with JRA55 atmospheri… (
#350) * Added new capability in ice_forcing.F90 to test with JRA55 atmospheric forcing on gx1 grid. * Added JRA55 as an option under atm_data_type * Modified ice_forcing.F90 by replacing elseif (trim(atm_data_format) == 'nc') then ! netcdf with elseif (trim(atm_data_type) == 'JRA55') then ! netcdf Corrected comment regarding JRA55 forcing to state "E.g. record 1 gives conditions at 3 am GMT on 1 January" Modified ./scripts/options/set_nml.jra55 by setting use_restart_time = .false. setting year_init = 2005 setting fyear_init - 2005 and corrected units for precip_units = 'mks' edited ./scripts/tests/base_suite.ts by reinstating bgc restart test and added a jra55 "short" smoke test. * fix an incorrect test in the base suite * Add a check in init_forcing_atmo to check if 'use_leap_years' is set to true. If so, abort if the atm_data_type is not JRA55, default, or box2001 * Fix a mistake in diagnostic warning output for the use_leap_years check * set use_leap_years to false in the boxrestore namelist option file * add use_restart_time specification to test_nml.restart* files * Remove options in JRA55 namelist option file that are the same as the default in ice_in. Also remove the specification of use_restart_time to .false. * fix a bug in the newly-implemented use_leap_years check during initialization * add use_leap_years and use_restart_time specification to jra55 namelist option file * add new jra55_2008 and run90day namelist option files * modify the JRA55 smoke test to be a 90 day test and start in 2008. Also add a restart test for JRA55 in base_suite * update documentation to include citation for JRA55
- Loading branch information
Showing
10 changed files
with
324 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
year_init = 2005 | ||
ice_ic = 'ICE_MACHINE_INPUTDATA/CICE_data/ic/gx1/iced_gx1_v5.nc' | ||
grid_file = 'ICE_MACHINE_INPUTDATA/CICE_data/grid/gx1/grid_gx1.bin' | ||
kmt_file = 'ICE_MACHINE_INPUTDATA/CICE_data/grid/gx1/kmt_gx1.bin' | ||
bathymetry_file = 'ICE_MACHINE_INPUTDATA/CICE_data/grid/gx1/global_gx1.bathy.nc' | ||
use_leap_years = .true. | ||
use_restart_time = .false. | ||
maskhalo_dyn = .true. | ||
maskhalo_remap = .true. | ||
maskhalo_bound = .true. | ||
fyear_init = 2005 | ||
atm_data_dir = 'ICE_MACHINE_INPUTDATA/CICE_data/forcing/gx1/JRA55' | ||
atm_data_format = 'nc' | ||
atm_data_type = 'JRA55' | ||
precip_units = 'mks' | ||
ocn_data_dir = 'default' | ||
bgc_data_dir = 'default' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
year_init = 2008 | ||
ice_ic = 'ICE_MACHINE_INPUTDATA/CICE_data/ic/gx1/iced_gx1_v5.nc' | ||
grid_file = 'ICE_MACHINE_INPUTDATA/CICE_data/grid/gx1/grid_gx1.bin' | ||
kmt_file = 'ICE_MACHINE_INPUTDATA/CICE_data/grid/gx1/kmt_gx1.bin' | ||
bathymetry_file = 'ICE_MACHINE_INPUTDATA/CICE_data/grid/gx1/global_gx1.bathy.nc' | ||
use_leap_years = .true. | ||
use_restart_time = .false. | ||
maskhalo_dyn = .true. | ||
maskhalo_remap = .true. | ||
maskhalo_bound = .true. | ||
fyear_init = 2008 | ||
atm_data_dir = 'ICE_MACHINE_INPUTDATA/CICE_data/forcing/gx1/JRA55' | ||
atm_data_format = 'nc' | ||
atm_data_type = 'JRA55' | ||
precip_units = 'mks' | ||
ocn_data_dir = 'default' | ||
bgc_data_dir = 'default' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
npt = 2160 | ||
dumpfreq = 'd' | ||
dumpfreq_n = 30 | ||
histfreq = 'd','x','x','x','x' | ||
f_aice = 'd' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,3 +2,4 @@ npt = 240 | |
dumpfreq = 'd' | ||
dumpfreq_n = 5 | ||
runtype = 'initial' | ||
use_restart_time = .false. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,4 +3,4 @@ dumpfreq = 'd' | |
dumpfreq_n = 5 | ||
runtype = 'continue' | ||
restart = .true. | ||
|
||
use_restart_time = .true. |
Oops, something went wrong.