Merge branch 'Nek5000:master' into master

3rd_party/parRSB/install

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-VER=0.9.1
+VER=0.9.2
 
 if [ "$1" == "clean" ]; then
   rm -rf parRSB/build lib include 2>/dev/null

bin/makenek

@@ -15,7 +15,7 @@ set -a
 #LD="$FC"
 
 # config options (set to "?" to get a list)
-#PPLIST="" 
+#PPLIST="PARRSB DPROCMAP HYPRE" 
 
 #-------------------------------------------------------------------------------
 # WHAT FOLLOWS ARE OPTIONAL SETTINGS

core/INPUT

@@ -31,10 +31,10 @@ c
      $       ,nktonv,nhis,lochis(4,lhis+maxobj)
      $       ,ipscal,npscal,ipsco, ifldmhd
      $       ,irstv,irstt,irstim,nmember(maxobj),nobj
-     $       ,ngeom,idpss(ldimt),meshPartitioner
+     $       ,ngeom,idpss(ldimt),fluid_partitioner,solid_partitioner
       common /input2/ matype,nktonv,nhis,lochis,ipscal,npscal,ipsco
      $               ,ifldmhd,irstv,irstt,irstim,nmember,nobj
-     $               ,ngeom,idpss,meshPartitioner
+     $               ,ngeom,idpss,fluid_partitioner,solid_partitioner
 
       logical         if3d,ifflow,ifheat,iftran,ifaxis,ifstrs,ifsplit
      $               ,ifmgrid

core/PARDICT

@@ -4,7 +4,7 @@ c     Note: Keys have to be in captial letters
 c
       integer PARDICT_NKEYS
 
-      parameter(PARDICT_NKEYS = 122)
+      parameter(PARDICT_NKEYS = 124)
 
       character*132 pardictkey(PARDICT_NKEYS)
       data
@@ -127,3 +127,5 @@ c
      &  pardictkey(120) / 'TEMPERATURE:BOUNDARYTYPEMAP' /
      &  pardictkey(121) / 'SCALAR%%:BOUNDARYTYPEMAP' /
      &  pardictkey(122) / 'MESH:BOUNDARYIDMAP' /
+     &  pardictkey(123) / 'MESH:FLUIDPARTITIONER' /
+     &  pardictkey(124) / 'MESH:SOLIDPARTITIONER' /

core/comm_mpi.f

@@ -63,7 +63,6 @@ subroutine setupcomm(comm,newcomm,newcommg,path_in,session_in)
  22        rewind(8)
            if (nlin.gt.2) then 
              read(8,*,err=24) nsessions
-             write(6,*) 'ERROR: nsessmax in SIZE too low!'
              if(nsessions.gt.nsessmax) goto 24
            endif
            if (nsessions.gt.1) read(8,*,err=24) ifneknekc

core/genxyz.f

@@ -1496,7 +1496,7 @@ subroutine mesh_metrics
       do ie = 1,nelt
          ddmin = min(ddmin,dxmin_e(ie)) 
          ddmax = max(ddmax,dxmax_e(ie))
-         dtmp  = vlsum(JACM1(1,1,1,ie),nxyz)**1./3
+         dtmp  = vlsum(bm1(1,1,1,ie),nxyz)**(1./ldim)
          ddavg = ddavg + dtmp/(lx1-1) 
       enddo 
       dxmin = glmin(ddmin,1)

core/makenek.inc

@@ -217,6 +217,10 @@ case $FCcomp in
                FR8="-r8"
                FF77="-Mfixed"
                ;;
+  *flang*)     FCPP="-Mpreprocess"
+               FR8="-r8"
+               FF77="-Mfixed"
+               ;;
   *nvfortran*) FCPP="-Mpreprocess"
                FR8="-r8"
                FF77="-Mfixed"

core/map2.f

@@ -191,6 +191,10 @@ subroutine get_vert_map(nlv)
           tol = tol / 10.0;
           call find_con(wk,size(wk),tol,ierr)
         endif
+        if(ierr.ne.0) then
+          tol = tol / 100.0;
+          call find_con(wk,size(wk),tol,ierr)
+        endif
         call err_chk(ierr,'Connectivity calculation failed! '//
      &    'Try tightening mesh::connectivityTol$')
       endif
@@ -229,8 +233,8 @@ subroutine get_vert_map(nlv)
       neliv = j
 
       nel = neliv
-      call fpartMesh(eid8,vtx8,xyz,lelt,nel,nlv,nekcomm,
-     $  meshPartitioner,0,loglevel,ierr)
+      call fpartMesh(nel,eid8,vtx8,xyz,lelt,nlv,nekcomm,
+     $  fluid_partitioner,0,loglevel,ierr)
       call err_chk(ierr,'partMesh fluid failed!$')
 
       nelv = nel
@@ -282,8 +286,8 @@ subroutine get_vert_map(nlv)
          nelit = j
 
          nel = nelit
-         call fpartMesh(eid8,vtx8,xyz,lelt,nel,nlv,nekcomm,
-     $                  0,0,loglevel,ierr)
+         call fpartMesh(nel,eid8,vtx8,xyz,lelt,nlv,nekcomm,
+     $                  solid_partitioner,0,loglevel,ierr)
          call err_chk(ierr,'partMesh solid failed!$')
 
          nelt = nelv + nel
@@ -404,7 +408,7 @@ subroutine read_con(wk,nwk,nelr,nv,ierr)
 
            call blank(hdr,sizeof(hdr))
            offs = 0
-           call nek_file_read(co2_h,sizeof(hdr),offs,hdr,ierr)
+           call nek_file_read(co2_h,int(sizeof(hdr),8),offs,hdr,ierr)
            offs = offs + sizeof(hdr)
            if(ierr.ne.0) goto 100
 
@@ -417,7 +421,7 @@ subroutine read_con(wk,nwk,nelr,nv,ierr)
            endif
            write (6,'(a,a128)') ' hdr:', hdr
 
-           call nek_file_read(co2_h,sizeof(test),offs,test,ierr)
+           call nek_file_read(co2_h,int(sizeof(test),8),offs,test,ierr)
            if(ierr.ne.0) goto 100
            call nek_file_close(co2_h,ierr) 
            if(ierr.ne.0) goto 100
@@ -765,14 +769,16 @@ subroutine read_map(vertex,nlv,wk,mdw,ndw)
             if(ierr.ne.0) goto 100
 
             call blank(hdr,132)
-            call nek_file_read(ma2_h,sizeof(hdr),int(0,8),hdr,ierr)
+            call nek_file_read(ma2_h,int(sizeof(hdr),8),int(0,8),
+     $                         hdr,ierr)
             lma2off_b = sizeof(hdr)
             if(ierr.ne.0) goto 100
 
             read (hdr,1) version,neli,nnzi
     1       format(a5,2i12)
 
-            call nek_file_read(ma2_h,sizeof(test),lma2off_b,test,ierr)
+            call nek_file_read(ma2_h,int(sizeof(test),8),lma2off_b,
+     $                         test,ierr)
             if(ierr.ne.0) goto 100
 
             call nek_file_close(ma2_h,ierr)

core/mkuserfile

@@ -86,7 +86,14 @@ c automatically added by makenek
 _ACEOF
 fi
 
-if ! cat $CASENAME.f | grep -qi "subroutine.*usrdat" ; then
+notFound1=`cat $CASENAME.f | grep -qi "subroutine.*usrdat"'$'; echo $?`
+echo $notFound1 >.tmp1
+notFound2=`cat $CASENAME.f | grep -qi "subroutine.*usrdat .*"; echo $?`
+echo $notFound2 >.tmp2
+notFound3=`cat $CASENAME.f | grep -qi "subroutine.*usrdat().*"; echo $?`
+echo $notFound3 >.tmp3
+
+if [[ $notFound1 -gt 0 && $notFound2 -gt 0 && $notFound3 -gt 0 ]] ; then
 cat >> $CASENAME.f << _ACEOF
 
 c automatically added by makenek