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

update test coverage and test options #129

Merged
merged 6 commits into from
May 11, 2018
Merged

update test coverage and test options #129

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6c9e57d
update test coverage and test options
apcraig Apr 27, 2018
6065f5c
update documentation and fix boxadv settings
apcraig Apr 27, 2018
b7092b8
update tests based on review
apcraig May 3, 2018
f5f261b
update decomp test maxblocks
apcraig May 3, 2018
ad50933
update test coverage and namelist error/warning messages
apcraig May 10, 2018
09df2f6
update test suites
apcraig May 11, 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
update test suites
  • Loading branch information
@apcraig
apcraig committed May 11, 2018
commit 09df2f6f27d1049bebf47ec82c0593592c5a105d
2 changes: 1 addition & 1 deletion cicecore/cicedynB/general/ice_flux.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ module ice_flux
dvidtt, & ! ice volume tendency thermo. (m/s)
dagedtt,& ! ice age tendency thermo. (s/s)
mlt_onset, &! day of year that sfc melting begins
frz_onset, &! day of year that freezing begins (congel or frazil)
frz_onset = c0, &! day of year that freezing begins (congel or frazil)
frazil_diag ! frazil ice growth diagnostic (m/step-->cm/day)

real (kind=dbl_kind), &
Expand Down
1 change: 1 addition & 0 deletions configuration/scripts/options/set_nml.alt04
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ krdg_partic = 0
krdg_redist = 0
frzpnd = 'ccsm'
natmiter = 20
tfrz_option = 'linear_salt'
22 changes: 9 additions & 13 deletions configuration/scripts/tests/base_suite.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,21 @@
# Test Grid PEs Sets BFB-compare
smoke gx3 1x1 debug,diag1,run2day
smoke gx3 1x4 debug,diag1,run2day
smoke gx3 4x1 debug,diag1,run5day
restart gx3 8x2 debug
smoke gx3 8x2 diag1,run5day
smoke gx3 8x2 diag24,run1year,medium
smoke gx3 4x1 debug,diag1,run5day
smoke gx3 8x2 debug,diag1,run5day
smoke gx3 4x2 diag1,run5day smoke_gx3_8x2_diag1_run5day
smoke gx3 4x1 diag1,run5day,thread smoke_gx3_8x2_diag1_run5day
decomp gx3 4x2x25x29x5
restart gx3 8x1 diag1
restart gx3 4x2 debug
smoke gx1 32x1 diag1,run5day,thread
smoke gx1 16x2 diag1,run5day smoke_gx1_32x1_diag1_run5day_thread
smoke gx1 8x4 debug,run2day
restart gx1 32x1 none
restart gx1 13x2 none
restart gx1 40x4 debug,droundrobin
restart gx3 4x4 none
restart gx3 6x2 alt01
restart gx3 8x2 alt02
restart gx3 4x2 alt03
restart gx3 4x4 alt04
restart gx3 4x4 alt05
smoke gbox128 4x2 run5day
smoke gbox128 4x2 boxdyn,run5day
smoke gbox128 2x2 boxadv,run5day
smoke gbox128 4x4 boxrestore,run5day
restart gbox128 4x2 none
restart gbox128 4x2 boxdyn
restart gbox128 2x2 boxadv
restart gbox128 4x4 boxrestore
5 changes: 1 addition & 4 deletions configuration/scripts/tests/decomp_suite.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,13 @@
decomp gx3 4x2x25x29x5
restart gx3 4x2x25x29x4 dslenderX2
restart gx3 4x1x25x116x1 dslenderX1,thread restart_gx3_4x2x25x29x4_dslenderX2
restart gx3 8x2x5x29x10 dsquarepop restart_gx3_4x2x25x29x4_dslenderX2
restart gx3 2x2x5x29x40 dsectcart restart_gx3_4x2x25x29x4_dslenderX2
restart gx3 6x2x4x29x18 dspacecurve restart_gx3_4x2x25x29x4_dslenderX2
restart gx3 8x2x8x10x20 droundrobin restart_gx3_4x2x25x29x4_dslenderX2
restart gx3 6x2x50x58x1 droundrobin restart_gx3_4x2x25x29x4_dslenderX2
restart gx3 4x2x19x19x10 droundrobin restart_gx3_4x2x25x29x4_dslenderX2
restart gx3 1x20x5x29x80 dsectrobin restart_gx3_4x2x25x29x4_dslenderX2
restart gx3 16x2x5x10x15 drakeX2 restart_gx3_4x2x25x29x4_dslenderX2
restart gx3 16x2x5x10x20 drakeX2 restart_gx3_4x2x25x29x4_dslenderX2
restart gx3 8x2x8x10x20 droundrobin,maskhalo restart_gx3_4x2x25x29x4_dslenderX2
restart gx3 1x4x25x29x16 droundrobin restart_gx3_4x2x25x29x4_dslenderX2
restart gx3 1x1x50x58x4 droundrobin,thread restart_gx3_4x2x25x29x4_dslenderX2
restart gx3 1x1x100x116x1 droundrobin restart_gx3_4x2x25x29x4_dslenderX2

2 changes: 1 addition & 1 deletion configuration/scripts/tests/quick_suite.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Test Grid PEs Sets BFB-compare
smoke gx3 8x2 diag1,run5day
restart gx3 8x1 diag1
restart gbox128 8x1 diag1
restart gx3 4x2 debug,diag1,run5day
smoke gx3 4x1 diag1,run5day,thread smoke_gx3_8x2_diag1_run5day
1 change: 1 addition & 0 deletions configuration/scripts/tests/test_decomp.script
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ foreach decomp (${decomps})

end

cp ice_in.0 ice_in
#-----------------------------------------------------------

# turn off general test features, these are done above for this test
Expand Down
2 changes: 2 additions & 0 deletions configuration/scripts/tests/test_restart.script
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ cp ice_in ice_in.2
./cice.run
set res="$?"

cp ice_in.0 ice_in

mv -f ${ICE_CASEDIR}/test_output ${ICE_CASEDIR}/test_output.prev
cat ${ICE_CASEDIR}/test_output.prev | grep -iv "${ICE_TESTNAME} run" >! ${ICE_CASEDIR}/test_output
mv -f ${ICE_CASEDIR}/test_output ${ICE_CASEDIR}/test_output.prev
Expand Down