Update testing

- Add prod suite including 10 year gx1prod and qc test - Update unit test compare scripts
DeniseWorthen · Aug 13, 2021 · c5794b4 · c5794b4
1 parent 7b5c2b4
commit c5794b4
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 7 deletions.
diff --git a/cicecore/drivers/unittest/bcstchk/bcstchk.F90 b/cicecore/drivers/unittest/bcstchk/bcstchk.F90
@@ -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

diff --git a/cicecore/drivers/unittest/calchk/calchk.F90 b/cicecore/drivers/unittest/calchk/calchk.F90
@@ -41,7 +41,7 @@ program calchk
          failflag = 'FAIL'
 
       write(6,*) ' '
-      write(6,*) 'Running CALCHK'
+      write(6,*) 'RunningUnitTest CALCHK'
       write(6,*) ' '
 
       errorflag0   = passflag

diff --git a/cicecore/drivers/unittest/helloworld/helloworld.F90 b/cicecore/drivers/unittest/helloworld/helloworld.F90
@@ -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'
 

diff --git a/cicecore/drivers/unittest/sumchk/sumchk.F90 b/cicecore/drivers/unittest/sumchk/sumchk.F90
@@ -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

diff --git a/configuration/scripts/options/set_nml.run10year b/configuration/scripts/options/set_nml.run10year
@@ -0,0 +1,7 @@
+npt_unit       = 'y'
+npt            = 10
+dumpfreq       = 'y'
+dumpfreq_n     = 12
+diagfreq       = 24
+histfreq       = 'm','x','x','x','x'
+
diff --git a/configuration/scripts/tests/base_suite.ts b/configuration/scripts/tests/base_suite.ts
@@ -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
 smoke          gx3     8x2        diag24,run1year,medium
 smoke          gx3     7x2        diag1,bigdiag,run1day,diagpt1
 decomp         gx3     4x2x25x29x5  none

diff --git a/configuration/scripts/tests/comparelog.csh b/configuration/scripts/tests/comparelog.csh
@@ -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`

diff --git a/configuration/scripts/tests/prod_suite.ts b/configuration/scripts/tests/prod_suite.ts
@@ -0,0 +1,3 @@
+# Test         Grid    PEs        Sets    BFB-compare
+smoke          gx1    64x1        qc,medium
+smoke          gx1    64x2        gx1prod,long,run10year