Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement box model test from 2001 JCP paper #151

Merged
merged 36 commits into from
Oct 22, 2018
Merged

Implement box model test from 2001 JCP paper #151

Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
3d7e193
Add gbox80 grid configuration
Jun 20, 2018
5c7d7bc
Add option files for the box2001 case (Hunke, E.C., 2001. Viscout-pl…
Jun 20, 2018
aeacd1e
Modifications and additions to F90 files required for the box2001 case
Jun 20, 2018
a6bcb95
Update box2001 namelist file to have both N/S and E/W boundary types …
Jun 21, 2018
e1f4d2e
modifications to allow for constant coriolis
Jul 9, 2018
23ea0fc
modifications for updates to namelist file
Jul 9, 2018
0c793f7
Update ice_in to include coriolis and x/y_spacing variables
Jul 9, 2018
b5fe395
replace x_spacing and y_spacing with dxrect and dyrect in the namelists
Aug 2, 2018
3fd0afe
Add to the box2001 namelist file
Aug 6, 2018
52a0b51
Add new 'thermo' namelist variable to disable thermodynamics. Add co…
Sep 12, 2018
266af9e
Update rectgrid subroutine to set a land mask of 2 grid points around…
Sep 12, 2018
4e8140c
Update user-guide case settings documentation to include the new name…
Sep 12, 2018
c363c30
Fix bug in documentation added in previous commit for box2001
Sep 12, 2018
e843dab
More updates to user guide case settings for box2001 test case
Sep 12, 2018
be79463
Remove duplicate namelist definition in user guide testing
Sep 12, 2018
e8cefca
Add description of box2001 test to the testing documentation
Sep 12, 2018
4a0ef80
Typo fix in documentation
Sep 12, 2018
d3e2a94
Fix indentation
Sep 13, 2018
9d647c8
Updates to remove the thermo namelist variable, and instead turn off …
Sep 21, 2018
f66a56d
Modifications to not call init_flux_* in cice_run if the 2001 test ca…
Sep 28, 2018
d7d095b
Add new kridge and ktransport namelist options, as well as conditiona…
Oct 9, 2018
88b1010
Merge branch 'master' into box2001
mattdturner Oct 11, 2018
e3bea89
Resolve namelist errors that were introduced during the merge conflic…
Oct 11, 2018
a3784d1
Fix a bug that caused binary data to be written to the log file
Oct 12, 2018
428278a
Remove unused variables from ice_step
Oct 15, 2018
52eaef9
Remove unused variables from ice_forcing file
Oct 16, 2018
724f96f
initialize ice state
eclare108213 Oct 17, 2018
eba943c
replace land_override with close_boundaries.
Oct 19, 2018
6e349b8
Replace 'default' with 'latitude' as the default coriolis value
Oct 19, 2018
4611adb
Update documentation to include new namelist variables kridge and ktr…
Oct 19, 2018
64f0d92
Merge branch 'master' into box2001
mattdturner Oct 19, 2018
bd675af
Re-add dxrect and dyrect as variables in ice_init. This was a bug in…
Oct 19, 2018
6e5109d
correct configuration options
eclare108213 Oct 20, 2018
2689ed4
miscellaneous updates, increased run length
eclare108213 Oct 20, 2018
4626b06
use strax,y (input directly) instead of strairx,yT (calculated) and s…
eclare108213 Oct 21, 2018
5e1b713
Update CICE_RunMod conditionals from 'ktherm > 0' to 'ktherm >= 0' si…
Oct 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Re-add dxrect and dyrect as variables in ice_init. This was a bug int… 
…roduced during merge conflict resolution
  • Loading branch information
turner committed Oct 19, 2018
commit bd675af6a545b0f115c5c83b8b9bc2e05aabc14a
3 changes: 2 additions & 1 deletion cicecore/cicedynB/general/ice_init.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ subroutine input_data
oceanmixed_file, restore_ocn, trestore
use ice_arrays_column, only: bgc_data_dir, &
sil_data_type, nit_data_type, fe_data_type
use ice_grid, only: grid_file, gridcpl_file, kmt_file, grid_type, grid_format
use ice_grid, only: grid_file, gridcpl_file, kmt_file, grid_type, grid_format, &
dxrect, dyrect
use ice_dyn_shared, only: ndte, kdyn, revised_evp, yield_curve, &
basalstress, Ktens, e_ratio, coriolis, &
kridge, ktransport
Expand Down