diff --git a/configuration/scripts/options/set_nml.boxsymw b/configuration/scripts/options/set_nml.boxclosed similarity index 89% rename from configuration/scripts/options/set_nml.boxsymw rename to configuration/scripts/options/set_nml.boxclosed index 4be1f5f95..d55faa302 100644 --- a/configuration/scripts/options/set_nml.boxsymw +++ b/configuration/scripts/options/set_nml.boxclosed @@ -23,11 +23,6 @@ kridge = -1 ktransport = -1 coriolis = 'zero' atmbndy = 'constant' -atm_data_type = 'uniform_west' -ocn_data_type = 'calm' -ice_data_type = 'uniform' -ice_data_conc = 'parabolic' -ice_data_dist = 'uniform' calc_strair = .false. rotate_wind = .false. restore_ice = .false. diff --git a/configuration/scripts/options/set_nml.boxforcee b/configuration/scripts/options/set_nml.boxforcee new file mode 100644 index 000000000..357fa69d5 --- /dev/null +++ b/configuration/scripts/options/set_nml.boxforcee @@ -0,0 +1,5 @@ +atm_data_type = 'uniform_east' +ocn_data_type = 'calm' +ice_data_type = 'uniform' +ice_data_conc = 'parabolic' +ice_data_dist = 'uniform' diff --git a/configuration/scripts/options/set_nml.boxforcen b/configuration/scripts/options/set_nml.boxforcen new file mode 100644 index 000000000..87cbaea40 --- /dev/null +++ b/configuration/scripts/options/set_nml.boxforcen @@ -0,0 +1,5 @@ +atm_data_type = 'uniform_north' +ocn_data_type = 'calm' +ice_data_type = 'uniform' +ice_data_conc = 'parabolic' +ice_data_dist = 'uniform' diff --git a/configuration/scripts/options/set_nml.boxforcene b/configuration/scripts/options/set_nml.boxforcene new file mode 100644 index 000000000..396fabde0 --- /dev/null +++ b/configuration/scripts/options/set_nml.boxforcene @@ -0,0 +1,5 @@ +atm_data_type = 'uniform_northeast' +ocn_data_type = 'calm' +ice_data_type = 'uniform' +ice_data_conc = 'parabolic' +ice_data_dist = 'uniform' diff --git a/configuration/scripts/options/set_nml.boxislandsn b/configuration/scripts/options/set_nml.boxislandsn deleted file mode 100644 index dd386ce5a..000000000 --- a/configuration/scripts/options/set_nml.boxislandsn +++ /dev/null @@ -1,46 +0,0 @@ -npt = 48 -kmt_type = 'boxislands' -ice_ic = 'internal' -use_leap_years = .false. -histfreq = 'd','x','x','x','x' -grid_type = 'rectangular' -dxrect = 16.e5 -dyrect = 16.e5 -close_boundaries = .false. -ew_boundary_type = 'cyclic' -ns_boundary_type = 'open' -ktherm = -1 -kstrength = 0 -kdyn = 1 -kridge = -1 -ktransport = -1 -coriolis = 'constant' -atmbndy = 'constant' -atm_data_type = 'uniform_north' -ocn_data_type = 'calm' -ice_data_type = 'uniform' -ice_data_conc = 'parabolic' -ice_data_dist = 'uniform' -rotate_wind = .false. -calc_strair = .false. -restore_ice = .false. -tr_iage = .false. -tr_FY = .false. -tr_pond_lvl = .false. -f_aice = 'd' -f_hi = 'd' -f_hs = 'd' -f_Tsfc = 'd' -f_uvel = 'd' -f_vvel = 'd' -f_uatm = 'd' -f_vatm = 'd' -f_uocn = 'd' -f_vocn = 'd' -f_strairx = 'd' -f_strairy = 'd' -f_strocnx = 'd' -f_strocny = 'd' -f_divu = 'd' -f_sig1 = 'd' -f_sig2 = 'd' diff --git a/configuration/scripts/options/set_nml.boxislandsne b/configuration/scripts/options/set_nml.boxislandsne deleted file mode 100644 index 75db55722..000000000 --- a/configuration/scripts/options/set_nml.boxislandsne +++ /dev/null @@ -1,46 +0,0 @@ -npt = 48 -kmt_type = 'boxislands' -ice_ic = 'internal' -use_leap_years = .false. -histfreq = 'd','x','x','x','x' -grid_type = 'rectangular' -dxrect = 16.e5 -dyrect = 16.e5 -close_boundaries = .false. -ew_boundary_type = 'cyclic' -ns_boundary_type = 'open' -ktherm = -1 -kstrength = 0 -kdyn = 1 -kridge = -1 -ktransport = -1 -coriolis = 'constant' -atmbndy = 'constant' -atm_data_type = 'uniform_northeast' -ocn_data_type = 'calm' -ice_data_type = 'uniform' -ice_data_conc = 'parabolic' -ice_data_dist = 'uniform' -rotate_wind = .false. -calc_strair = .false. -restore_ice = .false. -tr_iage = .false. -tr_FY = .false. -tr_pond_lvl = .false. -f_aice = 'd' -f_hi = 'd' -f_hs = 'd' -f_Tsfc = 'd' -f_uvel = 'd' -f_vvel = 'd' -f_uatm = 'd' -f_vatm = 'd' -f_uocn = 'd' -f_vocn = 'd' -f_strairx = 'd' -f_strairy = 'd' -f_strocnx = 'd' -f_strocny = 'd' -f_divu = 'd' -f_sig1 = 'd' -f_sig2 = 'd' diff --git a/configuration/scripts/options/set_nml.boxislandse b/configuration/scripts/options/set_nml.boxopen similarity index 84% rename from configuration/scripts/options/set_nml.boxislandse rename to configuration/scripts/options/set_nml.boxopen index 4a8a47705..bdc832f7d 100644 --- a/configuration/scripts/options/set_nml.boxislandse +++ b/configuration/scripts/options/set_nml.boxopen @@ -1,5 +1,4 @@ npt = 48 -kmt_type = 'boxislands' ice_ic = 'internal' use_leap_years = .false. histfreq = 'd','x','x','x','x' @@ -16,11 +15,6 @@ kridge = -1 ktransport = -1 coriolis = 'constant' atmbndy = 'constant' -atm_data_type = 'uniform_east' -ocn_data_type = 'calm' -ice_data_type = 'uniform' -ice_data_conc = 'parabolic' -ice_data_dist = 'uniform' rotate_wind = .false. calc_strair = .false. restore_ice = .false. diff --git a/configuration/scripts/options/set_nml.boxsyme b/configuration/scripts/options/set_nml.boxsyme deleted file mode 100644 index 3ff31d2c4..000000000 --- a/configuration/scripts/options/set_nml.boxsyme +++ /dev/null @@ -1,58 +0,0 @@ -days_per_year = 360 -use_leap_years = .false. -npt_unit = 'd' -npt = 5 -ice_ic = 'internal' -restart_ext = .true. -histfreq = 'd','1','x','x','x' -grid_type = 'rectangular' -kmt_type = 'default' -dxrect = 16.e5 -dyrect = 16.e5 -close_boundaries = .true. -ew_boundary_type = 'open' -ns_boundary_type = 'open' -tr_iage = .false. -tr_FY = .false. -tr_lvl = .false. -tr_pond_lvl = .false. -ktherm = -1 -kstrength = 0 -kdyn = 1 -kridge = -1 -ktransport = -1 -coriolis = 'zero' -atmbndy = 'constant' -atm_data_type = 'uniform_east' -ocn_data_type = 'calm' -ice_data_type = 'uniform' -ice_data_conc = 'parabolic' -ice_data_dist = 'uniform' -calc_strair = .false. -rotate_wind = .false. -restore_ice = .false. -f_aice = 'd1' -f_hi = 'd1' -f_hs = 'd' -f_Tsfc = 'd' -f_uvel = 'd1' -f_vvel = 'd1' -f_uatm = 'd' -f_vatm = 'd' -f_uocn = 'd' -f_vocn = 'd' -f_strairx = 'd1' -f_strairy = 'd1' -f_strtltx = 'd1' -f_strtlty = 'd1' -f_strcorx = 'd1' -f_strcory = 'd1' -f_strocnx = 'd1' -f_strocny = 'd1' -f_strintx = 'd1' -f_strinty = 'd1' -f_taubx = 'd1' -f_tauby = 'd1' -f_divu = 'd1' -f_sig1 = 'd1' -f_sig2 = 'd1' diff --git a/configuration/scripts/options/set_nml.boxsymn b/configuration/scripts/options/set_nml.boxsymn deleted file mode 100644 index 90ef74813..000000000 --- a/configuration/scripts/options/set_nml.boxsymn +++ /dev/null @@ -1,58 +0,0 @@ -days_per_year = 360 -use_leap_years = .false. -npt_unit = 'd' -npt = 5 -ice_ic = 'internal' -restart_ext = .true. -histfreq = 'd','1','x','x','x' -grid_type = 'rectangular' -kmt_type = 'default' -dxrect = 16.e5 -dyrect = 16.e5 -close_boundaries = .true. -ew_boundary_type = 'open' -ns_boundary_type = 'open' -tr_iage = .false. -tr_FY = .false. -tr_lvl = .false. -tr_pond_lvl = .false. -ktherm = -1 -kstrength = 0 -kdyn = 1 -kridge = -1 -ktransport = -1 -coriolis = 'zero' -atmbndy = 'constant' -atm_data_type = 'uniform_north' -ocn_data_type = 'calm' -ice_data_type = 'uniform' -ice_data_conc = 'parabolic' -ice_data_dist = 'uniform' -calc_strair = .false. -rotate_wind = .false. -restore_ice = .false. -f_aice = 'd1' -f_hi = 'd1' -f_hs = 'd' -f_Tsfc = 'd' -f_uvel = 'd1' -f_vvel = 'd1' -f_uatm = 'd' -f_vatm = 'd' -f_uocn = 'd' -f_vocn = 'd' -f_strairx = 'd1' -f_strairy = 'd1' -f_strtltx = 'd1' -f_strtlty = 'd1' -f_strcorx = 'd1' -f_strcory = 'd1' -f_strocnx = 'd1' -f_strocny = 'd1' -f_strintx = 'd1' -f_strinty = 'd1' -f_taubx = 'd1' -f_tauby = 'd1' -f_divu = 'd1' -f_sig1 = 'd1' -f_sig2 = 'd1' diff --git a/configuration/scripts/options/set_nml.boxsymne b/configuration/scripts/options/set_nml.boxsymne deleted file mode 100644 index 5c7374976..000000000 --- a/configuration/scripts/options/set_nml.boxsymne +++ /dev/null @@ -1,58 +0,0 @@ -days_per_year = 360 -use_leap_years = .false. -npt_unit = 'd' -npt = 5 -ice_ic = 'internal' -restart_ext = .true. -histfreq = 'd','1','x','x','x' -grid_type = 'rectangular' -kmt_type = 'default' -dxrect = 16.e5 -dyrect = 16.e5 -close_boundaries = .true. -ew_boundary_type = 'open' -ns_boundary_type = 'open' -tr_iage = .false. -tr_FY = .false. -tr_lvl = .false. -tr_pond_lvl = .false. -ktherm = -1 -kstrength = 0 -kdyn = 1 -kridge = -1 -ktransport = -1 -coriolis = 'constant' -atmbndy = 'constant' -atm_data_type = 'uniform_northeast' -ocn_data_type = 'calm' -ice_data_type = 'uniform' -ice_data_conc = 'parabolic' -ice_data_dist = 'uniform' -calc_strair = .false. -rotate_wind = .false. -restore_ice = .false. -f_aice = 'd1' -f_hi = 'd1' -f_hs = 'd' -f_Tsfc = 'd' -f_uvel = 'd1' -f_vvel = 'd1' -f_uatm = 'd' -f_vatm = 'd' -f_uocn = 'd' -f_vocn = 'd' -f_strairx = 'd1' -f_strairy = 'd1' -f_strtltx = 'd1' -f_strtlty = 'd1' -f_strcorx = 'd1' -f_strcory = 'd1' -f_strocnx = 'd1' -f_strocny = 'd1' -f_strintx = 'd1' -f_strinty = 'd1' -f_taubx = 'd1' -f_tauby = 'd1' -f_divu = 'd1' -f_sig1 = 'd1' -f_sig2 = 'd1' diff --git a/configuration/scripts/options/set_nml.boxsyms b/configuration/scripts/options/set_nml.boxsyms deleted file mode 100644 index 7fc0fc5a0..000000000 --- a/configuration/scripts/options/set_nml.boxsyms +++ /dev/null @@ -1,58 +0,0 @@ -days_per_year = 360 -use_leap_years = .false. -npt_unit = 'd' -npt = 5 -ice_ic = 'internal' -restart_ext = .true. -histfreq = 'd','1','x','x','x' -grid_type = 'rectangular' -kmt_type = 'default' -dxrect = 16.e5 -dyrect = 16.e5 -close_boundaries = .true. -ew_boundary_type = 'open' -ns_boundary_type = 'open' -tr_iage = .false. -tr_FY = .false. -tr_lvl = .false. -tr_pond_lvl = .false. -ktherm = -1 -kstrength = 0 -kdyn = 1 -kridge = -1 -ktransport = -1 -coriolis = 'zero' -atmbndy = 'constant' -atm_data_type = 'uniform_south' -ocn_data_type = 'calm' -ice_data_type = 'uniform' -ice_data_conc = 'parabolic' -ice_data_dist = 'uniform' -calc_strair = .false. -rotate_wind = .false. -restore_ice = .false. -f_aice = 'd1' -f_hi = 'd1' -f_hs = 'd' -f_Tsfc = 'd' -f_uvel = 'd1' -f_vvel = 'd1' -f_uatm = 'd' -f_vatm = 'd' -f_uocn = 'd' -f_vocn = 'd' -f_strairx = 'd1' -f_strairy = 'd1' -f_strtltx = 'd1' -f_strtlty = 'd1' -f_strcorx = 'd1' -f_strcory = 'd1' -f_strocnx = 'd1' -f_strocny = 'd1' -f_strintx = 'd1' -f_strinty = 'd1' -f_taubx = 'd1' -f_tauby = 'd1' -f_divu = 'd1' -f_sig1 = 'd1' -f_sig2 = 'd1' diff --git a/configuration/scripts/options/set_nml.gbox12 b/configuration/scripts/options/set_nml.gbox12 index 96701522f..b8a07840b 100644 --- a/configuration/scripts/options/set_nml.gbox12 +++ b/configuration/scripts/options/set_nml.gbox12 @@ -2,7 +2,7 @@ ice_ic = 'internal' grid_type = 'rectangular' kmt_type = 'default' atm_data_type = 'box2001' -ocn_data_type = 'calm' +ocn_data_type = 'box2001' ice_data_type = 'box2001' ice_data_conc = 'box2001' ice_data_dist = 'box2001' diff --git a/configuration/scripts/options/set_nml.gbox180 b/configuration/scripts/options/set_nml.gbox180 index 96701522f..b8a07840b 100644 --- a/configuration/scripts/options/set_nml.gbox180 +++ b/configuration/scripts/options/set_nml.gbox180 @@ -2,7 +2,7 @@ ice_ic = 'internal' grid_type = 'rectangular' kmt_type = 'default' atm_data_type = 'box2001' -ocn_data_type = 'calm' +ocn_data_type = 'box2001' ice_data_type = 'box2001' ice_data_conc = 'box2001' ice_data_dist = 'box2001' diff --git a/configuration/scripts/options/set_nml.gbox80 b/configuration/scripts/options/set_nml.gbox80 index 96701522f..b8a07840b 100644 --- a/configuration/scripts/options/set_nml.gbox80 +++ b/configuration/scripts/options/set_nml.gbox80 @@ -2,7 +2,7 @@ ice_ic = 'internal' grid_type = 'rectangular' kmt_type = 'default' atm_data_type = 'box2001' -ocn_data_type = 'calm' +ocn_data_type = 'box2001' ice_data_type = 'box2001' ice_data_conc = 'box2001' ice_data_dist = 'box2001' diff --git a/configuration/scripts/tests/cice.results.csh b/configuration/scripts/tests/cice.results.csh index 13580c0be..4074115cb 100644 --- a/configuration/scripts/tests/cice.results.csh +++ b/configuration/scripts/tests/cice.results.csh @@ -5,12 +5,13 @@ cat ./results.log | grep -iv "#machinfo" | grep -iv "#envinfo" set pends = `cat ./results.log | grep PEND | wc -l` set misses = `cat ./results.log | grep MISS | wc -l` set failures = `cat ./results.log | grep FAIL | wc -l` -set failbuild = `cat ./results.log | grep FAIL | grep " build " | wc -l` -set failrun = `cat ./results.log | grep FAIL | grep " run " | wc -l` -set failtest = `cat ./results.log | grep FAIL | grep " test " | wc -l` -set failcomp = `cat ./results.log | grep FAIL | grep " compare " | wc -l` -set failbfbc = `cat ./results.log | grep FAIL | grep " bfbcomp " | wc -l` -set failgen = `cat ./results.log | grep FAIL | grep " generate " | wc -l` +set failbuild = `cat ./results.log | grep FAIL | grep " build" | wc -l` +set failrun = `cat ./results.log | grep FAIL | grep " run" | wc -l` +set failtest = `cat ./results.log | grep FAIL | grep " test" | wc -l` +set failcomp = `cat ./results.log | grep FAIL | grep " compare" | wc -l` +set failclog = `cat ./results.log | grep FAIL | grep " complog" | wc -l` +set failbfbc = `cat ./results.log | grep FAIL | grep " bfbcomp" | wc -l` +set failgen = `cat ./results.log | grep FAIL | grep " generate" | wc -l` set success = `cat ./results.log | grep 'PASS\|COPY' | wc -l` set comments = `cat ./results.log | grep "#" | wc -l` set alltotal = `cat ./results.log | wc -l` @@ -29,9 +30,13 @@ echo " #failbuild = $failbuild" >> results.log echo " #failrun = $failrun" >> results.log echo " #failtest = $failtest" >> results.log echo " #failcomp = $failcomp" >> results.log +echo " #failclog = $failclog" >> results.log echo " #failbfbc = $failbfbc" >> results.log echo " #failgen = $failgen" >> results.log +set stamp = `date '+%y%m%d-%H%M%S'` +cp results.log results.$stamp.log + echo "" echo "Descriptors:" echo " PASS - successful completion" @@ -49,6 +54,7 @@ echo "$failures of $chkcnt tests FAILED" #echo " $failrun of $failures FAILED run" #echo " $failtest of $failures FAILED test" #echo " $failcomp of $failures FAILED compare" +#echo " $failclog of $failures FAILED compare" #echo " $failbfbc of $failures FAILED bfbcomp" #echo " $failgen of $failures FAILED generate" exit $failures diff --git a/configuration/scripts/tests/gridsys_suite.ts b/configuration/scripts/tests/gridsys_suite.ts index b33d58ea9..d9752073f 100644 --- a/configuration/scripts/tests/gridsys_suite.ts +++ b/configuration/scripts/tests/gridsys_suite.ts @@ -8,15 +8,10 @@ smoke gbox80 1x1 box2001 smoke gbox80 2x2 boxwallblock smoke gbox80 1x1 boxslotcyl smoke gbox80 2x4 boxnodyn -#smoke gbox80 2x2 boxsymn,run1day -smoke gbox80 4x2 boxsyme,run1day -#smoke gbox80 4x1 boxsymne,run1day -#smoke gbox80 2x2 boxsymn,run1day,kmtislands -smoke gbox80 4x1 boxsyme,run1day,kmtislands -#smoke gbox80 4x2 boxsymne,run1day,kmtislands -#smoke gbox80 8x1 boxislandsn,run1day -smoke gbox80 4x2 boxislandse,run1day -#smoke gbox80 2x4 boxislandsne,run1day +smoke gbox80 4x2 boxclosed,boxforcee,run1day +smoke gbox80 4x1 boxclosed,boxforcene,run1day,kmtislands +smoke gbox80 4x2 boxopen,kmtislands,boxforcee,run1day +smoke gbox80 2x2 boxclosed,boxforcen,run1day,vargrid smoke gx3 1x1x100x116x1 reprosum,run10day smoke gx3 1x1x25x29x16 reprosum,run10day,dwblockall smoke_gx3_1x1x100x116x1_reprosum_run10day smoke gx3 1x1x5x4x580 reprosum,run10day,dwblockall smoke_gx3_1x1x100x116x1_reprosum_run10day @@ -26,17 +21,6 @@ smoke gx1 32x1x16x16x32 reprosum,run10day,cmplogrest,dwblockall smoke gx1 32x1x16x12x40 reprosum,run10day,cmplogrest,dwblockall smoke_gx1_32x1x16x16x32_reprosum_run10day smoke gx1 32x1x16x12x40 reprosum,run10day,cmplogrest smoke_gx1_32x1x16x16x32_reprosum_run10day -smoke gbox80 2x2 boxsymn,run1day,vargrid -smoke gbox80 4x2 boxsyme,run1day,vargrid -smoke gbox80 4x1 boxsymne,run1day,vargrid -#smoke gbox80 2x2 boxsymn,run1day,kmtislands,vargrid -#smoke gbox80 4x1 boxsyme,run1day,kmtislands,vargrid -#smoke gbox80 4x2 boxsymne,run1day,kmtislands,vargrid -#smoke gbox80 8x1 boxislandsn,run1day,vargrid -#smoke gbox80 4x2 boxislandse,run1day,vargrid -#smoke gbox80 2x4 boxislandsne,run1day,vargrid - - smoke gx3 8x2 diag1,run5day,gridcd smoke gx3 8x4 diag1,run5day,debug,gridcd restart gx3 4x2 debug,diag1,gridcd @@ -46,15 +30,10 @@ smoke gbox80 1x1 box2001,gridcd smoke gbox80 2x2 boxwallblock,gridcd smoke gbox80 1x1 boxslotcyl,gridcd smoke gbox80 2x4 boxnodyn,gridcd -#smoke gbox80 2x2 boxsymn,run1day,gridcd -smoke gbox80 4x2 boxsyme,run1day,gridcd -#smoke gbox80 4x1 boxsymne,run1day,gridcd -#smoke gbox80 2x2 boxsymn,run1day,kmtislands,gridcd -smoke gbox80 4x1 boxsyme,run1day,kmtislands,gridcd -#smoke gbox80 4x2 boxsymne,run1day,kmtislands,gridcd -#smoke gbox80 8x1 boxislandsn,run1day,gridcd -smoke gbox80 4x2 boxislandse,run1day,gridcd -#smoke gbox80 2x4 boxislandsne,run1day,gridcd +smoke gbox80 4x2 boxclosed,boxforcee,run1day,gridcd +smoke gbox80 4x1 boxclosed,boxforcene,run1day,kmtislands,gridcd +smoke gbox80 4x2 boxopen,kmtislands,boxforcee,run1day,gridcd +smoke gbox80 2x2 boxclosed,boxforcen,run1day,vargrid,gridcd smoke gx3 1x1x100x116x1 reprosum,run10day,gridcd smoke gx3 1x1x25x29x16 reprosum,run10day,dwblockall,gridcd smoke_gx3_1x1x100x116x1_gridcd_reprosum_run10day smoke gx3 1x1x5x4x580 reprosum,run10day,dwblockall,gridcd smoke_gx3_1x1x100x116x1_gridcd_reprosum_run10day @@ -64,16 +43,6 @@ smoke gx1 32x1x16x16x32 reprosum,run10day,cmplogrest,dwblockall,g smoke gx1 32x1x16x12x40 reprosum,run10day,cmplogrest,dwblockall,gridcd smoke_gx1_32x1x16x16x32_gridcd_reprosum_run10day smoke gx1 32x1x16x12x40 reprosum,run10day,cmplogrest,gridcd smoke_gx1_32x1x16x16x32_gridcd_reprosum_run10day -smoke gbox80 2x2 boxsymn,run1day,vargrid,gridcd -smoke gbox80 4x2 boxsyme,run1day,vargrid,gridcd -smoke gbox80 4x1 boxsymne,run1day,vargrid,gridcd -#smoke gbox80 2x2 boxsymn,run1day,kmtislands,vargrid,gridcd -#smoke gbox80 4x1 boxsyme,run1day,kmtislands,vargrid,gridcd -#smoke gbox80 4x2 boxsymne,run1day,kmtislands,vargrid,gridcd -#smoke gbox80 8x1 boxislandsn,run1day,vargrid,gridcd -#smoke gbox80 4x2 boxislandse,run1day,vargrid,gridcd -#smoke gbox80 2x4 boxislandsne,run1day,vargrid,gridcd - smoke gx3 8x2 diag1,run5day,gridc smoke gx3 8x4 diag1,run5day,debug,gridc restart gx3 4x2 debug,diag1,gridc @@ -83,15 +52,10 @@ smoke gbox80 1x1 box2001,gridc smoke gbox80 2x2 boxwallblock,gridc smoke gbox80 1x1 boxslotcyl,gridc smoke gbox80 2x4 boxnodyn,gridc -#smoke gbox80 2x2 boxsymn,run1day,gridc -smoke gbox80 4x2 boxsyme,run1day,gridc -#smoke gbox80 4x1 boxsymne,run1day,gridc -#smoke gbox80 2x2 boxsymn,run1day,kmtislands,gridc -smoke gbox80 4x1 boxsyme,run1day,kmtislands,gridc -#smoke gbox80 4x2 boxsymne,run1day,kmtislands,gridc -#smoke gbox80 8x1 boxislandsn,run1day,gridc -smoke gbox80 4x2 boxislandse,run1day,gridc -#smoke gbox80 2x4 boxislandsne,run1day,gridc +smoke gbox80 4x2 boxclosed,boxforcee,run1day,gridc +smoke gbox80 4x1 boxclosed,boxforcene,run1day,kmtislands,gridc +smoke gbox80 4x2 boxopen,kmtislands,boxforcee,run1day,gridc +smoke gbox80 2x2 boxclosed,boxforcen,run1day,vargrid,gridc smoke gx3 1x1x100x116x1 reprosum,run10day,gridc smoke gx3 1x1x25x29x16 reprosum,run10day,dwblockall,gridc smoke_gx3_1x1x100x116x1_gridc_reprosum_run10day smoke gx3 1x1x5x4x580 reprosum,run10day,dwblockall,gridc smoke_gx3_1x1x100x116x1_gridc_reprosum_run10day @@ -100,12 +64,3 @@ smoke gx1 32x1x16x16x32 reprosum,run10day,gridc smoke gx1 32x1x16x16x32 reprosum,run10day,cmplogrest,dwblockall,gridc smoke_gx1_32x1x16x16x32_gridc_reprosum_run10day smoke gx1 32x1x16x12x40 reprosum,run10day,cmplogrest,dwblockall,gridc smoke_gx1_32x1x16x16x32_gridc_reprosum_run10day smoke gx1 32x1x16x12x40 reprosum,run10day,cmplogrest,gridc smoke_gx1_32x1x16x16x32_gridc_reprosum_run10day -smoke gbox80 2x2 boxsymn,run1day,vargrid,gridc -smoke gbox80 4x2 boxsyme,run1day,vargrid,gridc -smoke gbox80 4x1 boxsymne,run1day,vargrid,gridc -#smoke gbox80 2x2 boxsymn,run1day,kmtislands,vargrid,gridc -#smoke gbox80 4x1 boxsyme,run1day,kmtislands,vargrid,gridc -#smoke gbox80 4x2 boxsymne,run1day,kmtislands,vargrid,gridc -#smoke gbox80 8x1 boxislandsn,run1day,vargrid,gridc -#smoke gbox80 4x2 boxislandse,run1day,vargrid,gridc -#smoke gbox80 2x4 boxislandsne,run1day,vargrid,gridc diff --git a/doc/source/user_guide/ug_implementation.rst b/doc/source/user_guide/ug_implementation.rst index a3f7d11bc..4bcfe1ede 100644 --- a/doc/source/user_guide/ug_implementation.rst +++ b/doc/source/user_guide/ug_implementation.rst @@ -312,6 +312,34 @@ Special treatment is also required in the scattering routine, and when computing global sums one of each pair of coincident points has to be excluded. +***************** +Rectangular grids +***************** + +Rectangular test grids can be defined for CICE. They are generated +internally and defined by several namelist +settings including ``grid_type`` = ``rectangular``, ``nx_global``, ``ny_global``, +``dx_rect``, ``dy_rect``, ``lonrefrect``, and ``latrefrect``. Forcing and +initial condition can be set via namelists ``atm_data_type``, ``ocn_data_type``, +``ice_data_type``, ``ice_data_conc``, ``ice_data_dist``. Variable grid spacing +is also supported with the namelist settings ``scale_dxdy`` which turns on +the option, and ``dxscale`` and ``dyscale`` which sets the variable grid scaling +factor. Values of 1.0 will produced constant grid spacing. For rectangular grids, +``lonrefrect`` and ``latrefrect`` define the lower left longitude and latitude +value of the grid, ``dx_rect`` and ``dy_rect`` define the base grid spacing, and +``dxscale`` and ``dyscale`` provide the grid space scaling. The base spacing +is set in the center of the rectangular domain and the scaling is applied symetrically +outward as a multiplicative factor in the x and y directions. + +Several predefined rectangular grids are available in CICE with +**cice.setup --grid** including ``gbox12``, ``gbox80``, ``gbox128``, and ``gbox180`` +where 12, 80, 128, and 180 are the number of gridcells in each direction. +Several predefined options also exist, set with **cice.setup --set**, to +establish varied idealized configurations of box tests including ``box2001``, +``boxadv``, ``boxchan``, ``boxnodyn``, ``boxrestore``, ``boxslotcyl``, and +``boxopen``, ``boxclosed``, and ``boxforcee``. See **cice.setup --help** for a current +list of supported settings. + ************** Vertical Grids **************