Change license to BSD (#201)

- Change license to BSD
- Use NABMSH to avoid invalid tlag values
- Remove .sch file check

LICENSE

@@ -1,22 +1,58 @@
-NEK5000: Spectral Element Computational Fluid Dynamics Solver
-COPYRIGHT (c) 2008,2009,2010 UCHICAGO ARGONNE, LLC
+Copyright (c) 2008-2017, UCHICAGO ARGONNE, LLC. 
 
-The UChicago Argonne, LLC as Operator of Argonne National 
-Laboratory holds copyright in the Software. The copyright holder 
+The UChicago Argonne, LLC as Operator of Argonne National
+Laboratory holds copyright in the Software. The copyright holder
 reserves all rights except those expressly granted to licensees,
 and U.S. Government license rights.
 
-License
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
 
-    NEK5000 is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
+1. Redistributions of source code must retain the above copyright
+notice, this list of conditions and the disclaimer below.
 
-    NEK5000 is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+2. Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the disclaimer (as noted below)
+in the documentation and/or other materials provided with the
+distribution.
 
-    You should have received a copy of the GNU General Public License
-    along with NEK5000.  If not, see <http://www.gnu.org/licenses/>.
+3. Neither the name of ANL nor the names of its contributors
+may be used to endorse or promote products derived from this software
+without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
+FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL 
+UCHICAGO ARGONNE, LLC, THE U.S. DEPARTMENT OF 
+ENERGY OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED 
+TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Additional BSD Notice
+---------------------
+1. This notice is required to be provided under our contract with
+the U.S. Department of Energy (DOE). This work was produced at
+Argonne National Laboratory under Contract 
+No. DE-AC02-06CH11357 with the DOE.
+
+2. Neither the United States Government nor UCHICAGO ARGONNE, 
+LLC nor any of their employees, makes any warranty, 
+express or implied, or assumes any liability or responsibility for the
+accuracy, completeness, or usefulness of any information, apparatus,
+product, or process disclosed, or represents that its use would not
+infringe privately-owned rights.
+
+3. Also, reference herein to any specific commercial products, process, 
+or services by trade name, trademark, manufacturer or otherwise does 
+not necessarily constitute or imply its endorsement, recommendation, 
+or favoring by the United States Government or UCHICAGO ARGONNE LLC. 
+The views and opinions of authors expressed 
+herein do not necessarily state or reflect those of the United States 
+Government or UCHICAGO ARGONNE, LLC, and shall 
+not be used for advertising or product endorsement purposes.

bin/nek

@@ -2,6 +2,4 @@ echo $1        >  SESSION.NAME
 echo `pwd`'/' >>  SESSION.NAME
 rm -f ioinfo
 mv -f $1.log $1.log1 2>/dev/null
-mv -f $1.sch $1.sch1 2>/dev/null
 time ./nek5000
-rm -f SESSION.NAME

bin/nek1000s

@@ -4,8 +4,5 @@ rm -f ioinfo
 echo -1000 >ioinfo
 rm -f logfile
 mv -f $1.log.1 $1.log1.1 2>/dev/null
-mv -f $1.sch $1.sch1 2>/dev/null
 time ./nek5000 > $1.log.1 
 ln $1.log.1 logfile
-rm -f SESSION.NAME
-

bin/nek1000steps

@@ -3,7 +3,5 @@ echo `pwd`'/' >>  SESSION.NAME
 rm -f ioinfo logfile
 echo -1000 > ioinfo
 mv -f $1.log.$2 $1.log1.$2 2>/dev/null
-mv -f $1.sch $1.sch1 2>/dev/null
 mpiexec -np $2 ./nek5000 > $1.log.$2
 ln $1.log.$2 logfile
-rm -f SESSION.NAME

bin/nek10s

@@ -4,8 +4,5 @@ rm -f ioinfo
 echo -10 >ioinfo
 rm -f logfile
 mv -f $1.log.1 $1.log1.1 2>/dev/null
-mv -f $1.sch $1.sch1 2>/dev/null
 time ./nek5000 > $1.log.1 
 ln $1.log.1 logfile
-rm -f SESSION.NAME
-

bin/nek10steps

@@ -3,7 +3,5 @@ echo `pwd`'/' >>  SESSION.NAME
 rm -f ioinfo logfile
 echo -10 > ioinfo
 mv -f $1.log.$2 $1.log1.$2 2>/dev/null
-mv -f $1.sch $1.sch1 2>/dev/null
 mpiexec -np $2 ./nek5000 > $1.log.$2
 ln $1.log.$2 logfile
-rm -f SESSION.NAME

bin/nek200s

@@ -4,8 +4,5 @@ rm -f ioinfo
 echo -200 >ioinfo
 rm -f logfile
 mv -f $1.log.1 $1.log1.1
-mv -f $1.sch $1.sch1
 time ./nek5000 > $1.log.1 
 ln $1.log.1 logfile
-rm -f SESSION.NAME
-

bin/nek200steps

@@ -3,7 +3,5 @@ echo `pwd`'/' >>  SESSION.NAME
 rm -f ioinfo logfile
 echo -200 > ioinfo
 mv -f $1.log.$2 $1.log1.$2
-mv -f $1.sch $1.sch1
 mpiexec -np $2 ./nek5000 > $1.log.$2
 ln $1.log.$2 logfile
-rm -f SESSION.NAME

bin/nekb

@@ -3,8 +3,6 @@ echo `pwd`'/' >>  SESSION.NAME
 rm -f ioinfo
 rm -f logfile
 mv -f $1.log $1.log1 2>/dev/null
-mv -f $1.sch $1.sch1 2>/dev/null
 nohup time ./nek5000 > $1.log &
 sleep 2
 ln $1.log logfile
-rm -f SESSION.NAME

bin/nekbb

@@ -3,7 +3,5 @@ echo `pwd`'/' >>  SESSION.NAME
 rm -f ioinfo
 rm -f logfile
 mv -f $1.log.1 $1.log1.1
-mv -f $1.sch $1.sch1
 time ./nek5000 > $1.log.1
 ln $1.log.1 logfile
-rm -f SESSION.NAME

bin/nekbmpi

@@ -3,7 +3,6 @@ echo `pwd`'/' >>  SESSION.NAME
 rm -f logfile
 rm -f ioinfo
 mv $1.log.$2 $1.log1.$2 2>/dev/null
-mv $1.sch $1.sch1       2>/dev/null
 mpiexec -np $2 ./nek5000 > $1.log.$2 &
 sleep 2
 ln $1.log.$2 logfile

bin/nekl

@@ -4,7 +4,6 @@ rm ioinfo
 mv $1.log $1.log1 2>/dev/null
 mv $1.fld $1.fld1 2>/dev/null
 mv $1.his $1.his1 2>/dev/null
-mv $1.sch $1.sch1 2>/dev/null
 mv $1.out $1.out1 2>/dev/null
 mv $1.ore $1.ore1 2>/dev/null
 mv $1.nre $1.nre1 2>/dev/null

bin/neklmpi

@@ -2,7 +2,5 @@ echo $1        >  SESSION.NAME
 echo `pwd`'/' >>  SESSION.NAME
 rm -f ioinfo logfile
 mv -f $1.log.$2 $1.log1.$2 2>/dev/null
-mv -f $1.sch $1.sch1 2>/dev/null
 mpiexec -np $2 ./nek5000 > $1.log.$2
 ln $1.log.$2 logfile
-rm -f SESSION.NAME

bin/nekmpi

@@ -3,6 +3,4 @@ echo `pwd`'/' >>  SESSION.NAME
 rm -f logfile
 rm -f ioinfo
 mv $1.log.$2 $1.log1.$2 2>/dev/null
-mv $1.sch $1.sch1       2>/dev/null
 mpiexec -np $2 ./nek5000
-rm -f SESSION.NAME

bin/neknek

@@ -12,7 +12,6 @@ mv $1.his $1.his1 2>/dev/null
 mv $1.sch $1.sch1 2>/dev/null
 mv $2.log $2.log1 2>/dev/null
 mv $2.his $2.his1 2>/dev/null
-mv $2.sch $2.sch1 2>/dev/null
 NP1=$3
 NP2=$4
 NP=$(($NP1+$NP2))
@@ -21,4 +20,3 @@ mpiexec -np $NP ./nek5000 > $1.log
 sleep 1
 rm logfile
 ln $1.log logfile
-rm -f SESSION.NAME

core/HEADER

@@ -9,8 +9,8 @@
      &,'|----------------------------------------------------------|'
      &,'|                                                          |' 
      &,'| NEK5000:  Open Source Spectral Element Solver            |'
-     &,'| COPYRIGHT (c) 2008-2016 UCHICAGO ARGONNE, LLC            |'
-     &,'| Version:  16.0.0                                         |'
+     &,'| COPYRIGHT (c) 2008-2017 UCHICAGO ARGONNE, LLC            |'
+     &,'| Version:  17.0.0                                         |'
      &,'| Web:      http://nek5000.mcs.anl.gov                     |'
      &,'|                                                          |'
      &,'\\----------------------------------------------------------/'

core/TSTEP

@@ -22,14 +22,14 @@ c
 
       integer ifield,imesh,istep,nsteps,iostep,lastep,iocomm
      $       ,instep
-     $       ,nab,nbd,nbdinp,ntaubd 
+     $       ,nab,nabmsh,nbd,nbdinp,ntaubd 
      $       ,nmxh,nmxp,nmxe,nmxnl,ninter
      $       ,nelfld(0:ldimt1)
      $       ,nconv,nconv_max
      $       ,ioinfodmp
       common /istep2/ ifield,imesh,istep,nsteps,iostep,lastep,iocomm
      $               ,instep
-     $               ,nab,nbd,nbdinp,ntaubd 
+     $               ,nab,nabmsh,nbd,nbdinp,ntaubd 
      $               ,nmxh,nmxp,nmxe,nmxnl,ninter
      $               ,nelfld
      $               ,nconv,nconv_max

core/cvode_driver.f

@@ -481,14 +481,14 @@ subroutine cv_upd_coor
 
       ntot = nx1*ny1*nz1*nelv
 
-      call sumab(dtmp,wx_,wxlag,ntot,cv_abmsh,nab)
+      call sumab(dtmp,wx_,wxlag,ntot,cv_abmsh,nabmsh)
       call add3 (xm1,xm1_,dtmp,ntot)
 
-      call sumab(dtmp,wy_,wylag,ntot,cv_abmsh,nab)
+      call sumab(dtmp,wy_,wylag,ntot,cv_abmsh,nabmsh)
       call add3 (ym1,ym1_,dtmp,ntot)
 
       if(if3d) then
-        call sumab(dtmp,wz_,wzlag,ntot,cv_abmsh,nab)
+        call sumab(dtmp,wz_,wzlag,ntot,cv_abmsh,nabmsh)
         call add3 (zm1,zm1_,dtmp,ntot)
       endif
 
@@ -642,7 +642,7 @@ subroutine cv_settime
       cv_dtlag(3) = dtlag(3)
 
       call rzero(cv_abmsh,3)
-      call setabbd (cv_abmsh,cv_dtlag,nab,1) ! why is nabmsh wrong, use nab for now
+      call setabbd (cv_abmsh,cv_dtlag,nabmsh,1)
       do i = 1,3
          cv_abmsh(i) = cv_dtNek*cv_abmsh(i) 
       enddo

core/prepost.f

@@ -106,45 +106,27 @@ subroutine prepost(ifdoin,prefin)
       icalld=icalld+1
       nprep=icalld
 
+      if (ioinfodmp.eq.-2) return
+
 #ifdef TIMER
       etime1=dnekclock()
 #endif
 
 c     Trigger history output only if prefix = 'his'   pff 8/18/05
       ifhis  = .false.
       prefix = prefin
-      if (prefin.eq.'his') ifhis  = .true.
-      if (prefix.eq.'his') prefix = '   '
-
-      if(icalld.eq.1) then
-        ierr = 0
-        if (nid.eq.0) then
-           write(6,*) 'schfile:',schfle
-           if (ifschclob) then
-              open(unit=26,file=schfle,err=44,form='formatted')
-           else
-              open(unit=26,file=schfle,err=44,form='formatted',
-     &             status='new')
-           endif
-           goto 45
-  44       ierr = 1
- 45     endif 
-        call err_chk(ierr,'.sch file already exists. Use IFSCHCLOB=F to
-     $disable this check BUT BEWARE!!!!!!$')
+      if (prefin.eq.'his') then
+         ifhis  = .true.
+         prefix = '   '
       endif
 
       call prepost_map(0) ! map pr and axisymm. arrays
 
-      if (ioinfodmp.eq.-2) return
-
       if (ifdoin) call outfld(prefix)
-
       call outhis(ifhis)
 
       call prepost_map(1) ! map back axisymm. arrays
 
-      if (lastep.eq.1 .and. nid.eq.0) close(unit=26)
-
 #ifdef TIMER
       tprep=tprep+dnekclock()-etime1
 #endif