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

Jump to bottom

Fix QC test, fix bug in history time axis, fix history output averaging for timestep output #624

Merged
merged 10 commits into from
Aug 19, 2021
Merged

Fix QC test, fix bug in history time axis, fix history output averaging for timestep output #624

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
441f693
Fix history features
apcraig Aug 10, 2021
15763d8
revert set_nml.histall
apcraig Aug 10, 2021
b3364a6
fix implementation error
apcraig Aug 11, 2021
96d5851
update model log output in ice_init
apcraig Aug 11, 2021
7b5c2b4
Fix QC issues
apcraig Aug 12, 2021
c5794b4
Update testing
apcraig Aug 13, 2021
eaa3c3a
update documentation
apcraig Aug 13, 2021
e31ce7e
reset calchk to 100000 years
apcraig Aug 13, 2021
83068c7
update evp1d test
apcraig Aug 13, 2021
3fd897e
Merge branch 'master' of https://github.com/cice-consortium/cice into…
apcraig Aug 13, 2021
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
2 changes: 1 addition & 1 deletion cicecore/drivers/unittest/bcstchk/bcstchk.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ program bcstchk
write(6,*) ' '
write(6,*) '=========================================================='
write(6,*) ' '
write(6,*) 'Running BCSTCHK'
write(6,*) 'RunningUnitTest BCSTCHK'
write(6,*) ' '
write(6,*) ' npes = ',npes
write(6,*) ' my_task = ',my_task
Expand Down
2 changes: 1 addition & 1 deletion cicecore/drivers/unittest/calchk/calchk.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ program calchk
failflag = 'FAIL'

write(6,*) ' '
write(6,*) 'Running CALCHK'
write(6,*) 'RunningUnitTest CALCHK'
write(6,*) ' '

errorflag0 = passflag
Expand Down
2 changes: 1 addition & 1 deletion cicecore/drivers/unittest/helloworld/helloworld.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

program hello_world

write(6,*) 'hello_world'
write(6,*) 'RunningUnitTest hello_world'
write(6,*) 'hello_world COMPLETED SUCCESSFULLY'
write(6,*) 'hello_world TEST COMPLETED SUCCESSFULLY'

Expand Down
2 changes: 1 addition & 1 deletion cicecore/drivers/unittest/sumchk/sumchk.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ program sumchk
write(6,*) ' '
write(6,*) '=========================================================='
write(6,*) ' '
write(6,*) 'Running SUMCHK'
write(6,*) 'RunningUnitTest SUMCHK'
write(6,*) ' '
write(6,*) ' npes = ',npes
write(6,*) ' my_task = ',my_task
Expand Down
7 changes: 7 additions & 0 deletions configuration/scripts/options/set_nml.run10year
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
npt_unit = 'y'
npt = 10
dumpfreq = 'y'
dumpfreq_n = 12
diagfreq = 24
histfreq = 'm','x','x','x','x'

1 change: 0 additions & 1 deletion configuration/scripts/tests/base_suite.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ smoke gx3 1x1 debug,diag1,run2day
smoke gx3 1x4 debug,diag1,run2day
smoke gx3 4x1 debug,diag1,run5day
restart gx3 8x2 debug
smoke gx1 64x1 qc,medium
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, seems you changed your mind :)

smoke gx3 8x2 diag24,run1year,medium
smoke gx3 7x2 diag1,bigdiag,run1day,diagpt1
decomp gx3 4x2x25x29x5 none
Expand Down
4 changes: 2 additions & 2 deletions configuration/scripts/tests/comparelog.csh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ if (${filearg} == 1) then
cat ${base_data} | grep -A 99999999 "total ice area (km^2)" | grep -e istep1: -e = | grep -iv "min, max, sum" >&! ${base_out}
cat ${test_data} | grep -A 99999999 "total ice area (km^2)" | grep -e istep1: -e = | grep -iv "min, max, sum" >&! ${test_out}
else
cp -f ${base_data} ${base_out}
cp -f ${test_data} ${test_out}
sed -n '/RunningUnitTest/,$p' ${base_data} >! ${base_out}
sed -n '/RunningUnitTest/,$p' ${test_data} >! ${test_out}
endif

set basenum = `cat ${base_out} | wc -l`
Expand Down
3 changes: 3 additions & 0 deletions configuration/scripts/tests/prod_suite.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Test Grid PEs Sets BFB-compare
smoke gx1 64x1 qc,medium
smoke gx1 64x2 gx1prod,long,run10year
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there is a missing newline at EOF here