Merge branch 'master' of https://github.com/CICE-Consortium/Icepack i…

…nto HEAD

.travis.yml

@@ -39,7 +39,7 @@ notifications:
   email: false
 
 after_failure:
-  - "for runlog in travis_suite.travisCItest/*.travisCItest/logs/icepack.runlog.*; do
+  - "for runlog in $TRAVIS_BUILD_DIR/travis_suite.travisCItest/*.travisCItest/logs/icepack.runlog.*; do
     echo \"### Contents of $runlog ###\" && cat $runlog; done"
   - "git config --global user.email '[email protected]' &&
     git config --global user.name 'ciceconsortium' &&

README.md

@@ -39,7 +39,7 @@ The [Icepack wiki](https://github.com/CICE-Consortium/Icepack/wiki) page contain
 - larger files such as the gx1 grid, land mask, and forcing files
 - testing data
 
-The [Test-Results repository](https://github.com/CICE-Consortium/Test-Results) has test results for both CICE and Icepack.
+The [Test-Results wiki](https://github.com/CICE-Consortium/Test-Results/wiki) has test results for both CICE and Icepack.
 
 The [About-Us repository](https://github.com/CICE-Consortium/About-Us) includes background and supporting information about the CICE Consortium, including how to interact with it.   
 

columnphysics/version.txt

@@ -1 +1 @@
-Icepack 1.0.0
+v1.0.0.d0003

configuration/scripts/machines/Macros.hobart_intel

@@ -0,0 +1,33 @@
+#==============================================================================
+# Makefile macros for NCAR cheyenne, intel compiler
+#==============================================================================
+
+CPP        := fpp
+CPPDEFS    := -DFORTRANUNDERSCORE -DNO_R16 -DHAVE_F2008_CONTIGUOUS -DLINUX -DCPRINTEL ${ICE_CPPDEFS}
+CFLAGS     := -qno-opt-dynamic-align -fp-model precise -std=gnu99
+
+FIXEDFLAGS := -fixed -132
+FREEFLAGS  := -free
+FFLAGS     := -qno-opt-dynamic-align  -convert big_endian -assume byterecl -ftz -traceback -assume realloc_lhs -fp-model source -lifcore 
+FFLAGS_NOOPT:= -O0
+FC_AUTO_R8 := -r8
+
+ifeq ($(ICE_BLDDEBUG), true)
+  FFLAGS     += -O0 -g -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created
+else
+  FFLAGS     += -O2 -debug minimal
+endif
+
+ifeq ($(ICE_COMMDIR), mpi)
+  FC         := mpif90
+  LD         := mpif90
+else
+  FC         := ifort
+  LD         := ifort
+endif
+
+SLIBS   := -Wl,-rpath,/usr/local/intel-cluster-15.0.2.164/composer_xe_2015.2.164/compiler/lib/intel64 -lifcore
+
+ifeq ($(DITTO), yes)
+   CPPDEFS :=  $(CPPDEFS) -DREPRODUCIBLE
+endif

configuration/scripts/machines/Macros.hobart_nag

@@ -7,33 +7,28 @@ CPPFLAGS   := -P -traditional
 CPPDEFS    := -DFORTRANUNDERSCORE -DNO_CRAY_POINTERS -DNO_SHR_VMATH -DCPRNAG
 CFLAGS     := -std=gnu99
 
-FIXEDFLAGS :=
-FREEFLAGS  :=
-FFLAGS     := -Wp,-macro=no_com -convert=BIG_ENDIAN -ieee=full -O2
-FFLAGS_NOOPT:=
+FIXEDFLAGS := -fixed
+FREEFLAGS  := -free
+FFLAGS     := -Wp,-macro=no_com -convert=BIG_ENDIAN -ieee=full -O2 -gline
+FFLAGS_NOOPT:= -Wp,-macro=no_com -convert=BIG_ENDIAN -ieee=full -gline
+FC_AUTO_R8 := -r8
 
 ifeq ($(ICE_BLDDEBUG), true)
-  FFLAGS   := -C=all -g -time -f2003 -ieee=stop
+  FFLAGS   := -C=all -g -gline -time -f2003 -ieee=stop
 endif
 
 ifeq ($(ICE_COMMDIR), mpi)
-  FC         := nagfor
+  FC         := mpif90
+  LD         := mpif90
 else
   FC         := nagfor
+  LD         := nagfor
 endif
 
-NETCDF_PATH := /usr/local/netcdf_c-4.3.2_f-4.4.1-nag-6.1
-
-INCLDIR := -I/usr/local/netcdf_c-4.3.2_f-4.4.1-nag-6.1/include
-
 LIB_NETCDF := $(NETCDF_PATH)/lib
 
-SLIBS   := -L/usr/local/nag-6.1/lib/NAG_Fortran -lf61rts -L$(LIB_NETCDF) -lnetcdf -lnetcdff -L/cluster/mvapich2-2.2rc1-gcc-g++-4.8.5-nag-6.1/lib -lmpich -lm -lc
+SLIBS   := -L/usr/local/nag-6.2/lib/NAG_Fortran
 
 ifeq ($(DITTO), yes)
    CPPDEFS :=  $(CPPDEFS) -DREPRODUCIBLE
 endif
-
-ifeq ($(IO_TYPE), netcdf)
-   CPPDEFS :=  $(CPPDEFS) -Dncdf
-endif

configuration/scripts/machines/env.hobart_intel

@@ -0,0 +1,16 @@
+#!/bin/csh -f
+
+source /usr/share/Modules/init/csh
+
+module load compiler/intel/default
+
+setenv ICE_MACHINE_ENVNAME hobart
+setenv ICE_MACHINE_COMPILER nag
+setenv ICE_MACHINE_MAKE gmake
+setenv ICE_MACHINE_WKDIR /scratch/cluster/$user/ICEPACK_RUNS
+setenv ICE_MACHINE_INPUTDATA /fs/cgd/csm/inputdata
+setenv ICE_MACHINE_BASELINE /scratch/cluster/$user/ICEPACK_BASELINE
+setenv ICE_MACHINE_SUBMIT "qsub"
+setenv ICE_MACHINE_ACCT P00000000
+setenv ICE_MACHINE_TPNODE 24
+setenv ICE_MACHINE_BLDTHRDS 1

configuration/scripts/machines/env.hobart_nag

@@ -2,7 +2,7 @@
 
 source /usr/share/Modules/init/csh
 
-module load compiler/nag/6.1
+module load compiler/nag/6.2
 module load mpi/nag/mvapich2-2.2rc1
 
 setenv ICE_MACHINE_ENVNAME hobart

configuration/scripts/tests/report_results.csh

@@ -4,11 +4,14 @@ set gh_repository = "CICE-Consortium/Test-Results.wiki.git"
 set wikirepo = "https://github.com/${gh_repository}"
 set wikiname = Test-Results.wiki
 
-set tsubdir = icepack_testing
-set hfile = "icepack_by_hash"
-set mfile = "icepack_by_mach"
-set vfile = "icepack_by_vers"
-set bfile = "icepack_by_bran"
+if (! -e results.log) then
+  echo " "
+  echo "ERROR report_results failure, results.log file missing"
+  echo "  Please run results.csh first"
+  echo "  ABORTING"
+  echo " "
+  exit -9
+endif
 
 rm -r -f ${wikiname}
 
@@ -57,7 +60,13 @@ set xcdat = `echo $cdat | sed 's|-||g' | cut -c 3-`
 set xctim = `echo $ctim | sed 's|:||g'`
 set shrepo = `echo $repo | tr '[A-Z]' '[a-z]'`
 
+set tsubdir = icepack_master
+set hfile = "icepack_by_hash"
+set mfile = "icepack_by_mach"
+set vfile = "icepack_by_vers"
+set bfile = "icepack_by_bran"
 if ("${shrepo}" !~ "*cice-consortium*") then
+  set tsubdir = icepack_dev
   set hfile = {$hfile}_forks
   set mfile = {$mfile}_forks
   set vfile = {$vfile}_forks
@@ -78,7 +87,7 @@ unset noglob
 
 foreach compiler ( ${compilers} )
 
-  set ofile = "${shhash}.${mach}.${compiler}.${xcdat}.${xctim}"
+  set ofile = "${vers}.${shhash}.${mach}.${compiler}.${xcdat}.${xctim}"
   set outfile = "${wikiname}/${tsubdir}/${ofile}.md"
   mkdir -p ${wikiname}/${tsubdir}
   echo "${0}: writing to ${outfile}"
@@ -343,7 +352,7 @@ end
 #=====================
 
 cd ${wikiname}
-git add ${tsubdir}/${shhash}.${mach}*.md
+git add ${tsubdir}/*.md
 git add ${tsubdir}/${ofile}.md
 git add ${tsubdir}/${hfile}.md
 git add ${tsubdir}/${mfile}.md

icepack.setup

@@ -1,7 +1,7 @@
 #!/bin/csh -f
 
 set ICE_SANDBOX = `pwd`
-set ICE_SCRIPTS = ${ICE_SANDBOX}/configuration/scripts
+set ICE_SCRIPTS = "${ICE_SANDBOX}/configuration/scripts"
 set initargv = ( $argv[*] ) 
 
 set helpheader = 0
@@ -23,7 +23,8 @@ set baseCom = $spval  # Baseline compare
 set baseGen = $spval  # Baseline generate
 set bfbcomp = $spval  # BFB compare
 set report  = 0       # test results reporting
-set versno = `grep "release =" doc/source/conf.py | cut -d \' -f 2`
+#set versno = `grep "release =" doc/source/conf.py | cut -d \' -f 2`
+set versno = `git log | grep 'v[0-9]\.[0-9]\.[0-9]\.[a-z][0-9]*' | head -1 | sed 's/.*\(v[0-9]\.[0-9]\.[0-9]\.[a-z][0-9]*\).*/\1/' `
 
 if ($#argv < 1) then
   set helpheader = 1
@@ -274,7 +275,7 @@ if (($testsuite != $spval || $test != $spval) && $testid == $spval) then
 endif
 
 #Update version.txt
-echo "Icepack ${versno}"  >! columnphysics/version.txt
+echo "${versno}"  >! columnphysics/version.txt
 
 # Check to see if this is a test-suite run.  If so, loop through the various
 #   tests and create a separate folder for each