Add several tutorial problems

This commit modifies the Flexi source code
slightly to add several new tutorial problems.
These are the "123" problem, a second version
of "sod", the "implode" problem, "LeBlanc", and "Sedov."

Author: Glen Hansen

src/equations/navierstokes/idealgas/exactfunc.f90

@@ -87,6 +87,9 @@ SUBROUTINE DefineParametersExactFunc()
 #if PARABOLIC
 CALL addStrListEntry('IniExactFunc','blasius'  ,1338)
 #endif
+CALL addStrListEntry('IniExactFunc','sedov'    ,1342)
+CALL addStrListEntry('IniExactFunc','leblanc'  ,1344)
+CALL addStrListEntry('IniExactFunc','hui'      ,1346)
 CALL prms%CreateRealArrayOption(    'AdvVel',       "Advection velocity (v1,v2,v3) required for exactfunction CASE(2,21,4,8)")
 CALL prms%CreateRealOption(         'MachShock',    "Parameter required for CASE(10)", '1.5')
 CALL prms%CreateRealOption(         'PreShockDens', "Parameter required for CASE(10)", '1.0')
@@ -96,6 +99,9 @@ SUBROUTINE DefineParametersExactFunc()
 CALL prms%CreateRealOption(         'IniHalfwidth', "Shu Vortex CASE(7)", '0.2')
 CALL prms%CreateRealOption(         'P_Parameter', "Couette-Poiseuille flow CASE(8)", '0.0')
 CALL prms%CreateRealOption(         'U_Parameter', "Couette-Poiseuille flow CASE(8)", '0.01')
+CALL prms%CreateRealOption(         'eradius_in',   "Radius of high energy area CASE(1342)")
+CALL prms%CreateRealOption(         'leblanc_x0',   "Location of initial discontinity CASE(1344)")
+CALL prms%CreateRealArrayOption(    'Hui_Data',    "Orientation and axis intercept data for Hui problem CASE(1346)")
 #if PARABOLIC
 CALL prms%CreateRealOption(         'delta99_in',   "Blasius boundary layer CASE(1338)")
 CALL prms%CreateRealArrayOption(    'x_in',         "Blasius boundary layer CASE(1338)")
@@ -147,6 +153,18 @@ SUBROUTINE InitExactFunc()
   x_in            = GETREALARRAY('x_in',2,'(/0.,0./)')
   BlasiusInitDone = .TRUE. ! Mark Blasius init as done so we don't read the parameters again in BC init
 #endif
+CASE(1342) ! Energy radius in for Sedov
+  SWRITE(UNIT_stdOut,'(A)')' READING ERADIUS!'
+  eradius_in      = GETREAL('eradius_in')
+  SWRITE(UNIT_stdOut,'(A)')' INIT ERADIUS DONE!'
+CASE(1344) ! Discontinuity location for LeBlanc
+  SWRITE(UNIT_stdOut,'(A)')' READING LEBLANC_X0!'
+  leblanc_x0      = GETREAL('leblanc_x0')
+  SWRITE(UNIT_stdOut,'(A)')' INIT LEBLANC_X0 DONE!'
+CASE(1346) ! Axis angle (theta in rads) and Interface location (l) for Hui problem
+  SWRITE(UNIT_stdOut,'(A)')' READING HUI_INTERCEPT!'
+  Hui_Data    = GETREALARRAY('Hui_Data',2,'(/0.,1./)')
+  SWRITE(UNIT_stdOut,'(A)')' INIT HUI_INTERCEPT DONE!'
 CASE DEFAULT
 END SELECT ! IniExactFunc
 
@@ -184,6 +202,9 @@ SUBROUTINE ExactFunc(ExactFunction,tIn,x,resu,RefStateOpt)
 USE MOD_Timedisc_Vars  ,ONLY: fullBoundaryOrder,CurrentStage,dt,RKb,RKc,t
 USE MOD_TestCase       ,ONLY: ExactFuncTestcase
 USE MOD_EOS            ,ONLY: PrimToCons,ConsToPrim
+USE MOD_Exactfunc_Vars ,ONLY: eradius_in
+USE MOD_Exactfunc_Vars ,ONLY: leblanc_x0
+USE MOD_Exactfunc_Vars ,ONLY: Hui_Data
 #if PARABOLIC
 USE MOD_Eos_Vars       ,ONLY: mu0
 USE MOD_Exactfunc_Vars ,ONLY: delta99_in,x_in
@@ -616,6 +637,24 @@ SUBROUTINE ExactFunc(ExactFunction,tIn,x,resu,RefStateOpt)
   END IF
   CALL PrimToCons(prim,resu)
 #endif
+CASE(1342) ! sedov
+  IF (X(1)**2.0 + X(2)**2.0.GE.eradius_in**2.0) THEN
+    Resu = RefStateCons(:,1)
+  ELSE
+    Resu = RefStateCons(:,2)
+  END IF
+CASE(1344) ! LeBlanc Shock Tube
+  IF (X(1).LE.leblanc_x0) THEN
+    Resu = RefStateCons(:,1)
+  ELSE
+    Resu = RefStateCons(:,2)
+  END IF
+CASE(1346) ! Hui Shock 2D
+  IF (X(2) - ((sin(Hui_Data(1)) + cos(Hui_Data(1)))*X(1) - Hui_Data(2))/(sin(Hui_Data(1)) - cos(Hui_Data(1))) .GT. 0 ) THEN
+    Resu = RefStateCons(:,1)
+  ELSE
+    Resu = RefStateCons(:,2)
+  END IF
 END SELECT ! ExactFunction
 #if PP_dim==2
 Resu(MOM3)=0.

src/equations/navierstokes/idealgas/exactfunc_vars.f90

@@ -34,6 +34,9 @@ MODULE MOD_Exactfunc_Vars
 REAL              :: IniHalfwidth      !< parameter used for Shu vortex
 REAL              :: P_Parameter       !< parameter for Couette-Poiseuille flow
 REAL              :: U_Parameter       !< parameter for Couette-Poiseuille flow
+REAL              :: eradius_in        !< radius of high energy area for Sedov
+REAL              :: leblanc_x0        !< Location of initial discontinuity for LeBlanc
+REAL              :: Hui_Data(2)       !< Orientation and Location of axis intercept for Hui problem
 #if PARABOLIC
 REAL              :: delta99_in        !< boundary layer thickness for Blasius solution
 REAL              :: x_in(2)           !< inflow position for Blasius solution

tools/userblock/generateuserblock_mac.sh

@@ -0,0 +1,129 @@
+#!/bin/bash
+#************************************************************************************
+#
+# Author:       Thomas Bolemann
+# Institution:  Inst. of Aero- and Gasdynamics, University of Stuttgart
+# Date:         07.07.2016
+#
+# Description:  This script will generate a userblock file to be appended to
+#               executables or simulation results enabling the exact rebuilding of
+#               of the simulation code, which was used to generate those results.
+#               A patch to the remote Git branch of the current code is generated
+#               or to the master, if the branch does not exist on the remote.
+# 
+#************************************************************************************
+
+# $1: CMAKE_RUNTIME_OUTPUT_DIRECTORY
+# $2: CMAKE_CACHEFILE_DIR
+# $3: CMAKE_CACHE_MAJOR_VERSION.CMAKE_CACHE_MINOR_VERSION.CMAKE_CACHE_PATCH_VERSION
+
+if [ ! -d "$1" ]; then
+  exit 1;
+fi
+if [ ! -d "$2" ]; then
+  exit 1;
+fi
+
+# GAH: this approach does not work on Mac as we do not have "objcopy"
+# Lets make this file a "no-op" on Macs for now.
+
+unamestr=`uname`
+echo $unamestr
+if [ "$unamestr" = "Darwin" ]; then
+
+   cd "$1"
+   echo "Macs do not have 'objcopy', bypassing 'generateuserblock'"
+   echo "void userblock_start(){}" > userblock.c
+   echo "void userblock_end(){}" >> userblock.c
+   gcc userblock.c -c
+
+   exit 0;
+
+fi
+
+# get branch name (only info)
+BRANCHNAME=$(git rev-parse --abbrev-ref HEAD)
+PARENTNAME=$BRANCHNAME
+PARENTCOMMIT=$(git show-ref | grep "origin/$BRANCHNAME$" | cut -b -40)
+
+if [ -z "$PARENTCOMMIT" ]; then
+  LOCBRANCHNAME=$BRANCHNAME
+  # recursively search for parent branch
+  FOUND=0
+  while [ $FOUND -eq 0 ]; do
+    # get commit on server, where branch started
+    COLUMN=$((    $(git show-branch | grep '^[^\[]*\*'  | head -1 | cut -d* -f1 | wc -c) - 1 )) 
+    START_ROW=$(( $(git show-branch | grep -n "^[\-]*$" | cut -d: -f1) + 1 )) 
+    PARENTNAME=$(   git show-branch | tail -n +$START_ROW | grep -v "^[^\[]*\[$LOCBRANCHNAME" | grep "^.\{$COLUMN\}[^ ]" | head -n1 | sed 's/.*\[\(.*\)\].*/\1/' | sed 's/[\^~].*//')
+    if [ -z "$PARENTNAME" ]; then
+      break
+    fi
+  
+    PARENTCOMMIT=$(git show-ref | grep "origin/$PARENTNAME$" | cut -b -40)
+    if [ -z "$PARENTCOMMIT" ]; then
+      LOCBRANCHNAME=$PARENTNAME 
+    else
+      FOUND=1
+      break
+    fi
+  done
+
+  if [ $FOUND -eq 0 ]; then
+    PARENTNAME='master'
+    PARENTCOMMIT=$(git rev-parse origin/master)
+    echo "WARNING: Could not find parent commit, creating userblock diff to master."
+  fi
+fi
+
+cd "$1"
+echo "{[( CMAKE )]}"               >  userblock.txt
+cat configuration.cmake            >> userblock.txt
+echo "{[( GIT BRANCH )]}"          >> userblock.txt
+echo "$BRANCHNAME"                 >> userblock.txt
+echo $(git rev-parse HEAD)         >> userblock.txt
+
+# Reference is the start commit, which is either identical to
+# the branch, if it exists on the remote or points to the first
+# real parent in branch history available on remote.
+echo "{[( GIT REFERENCE )]}"       >> userblock.txt
+echo "$PARENTNAME"                 >> userblock.txt
+echo $PARENTCOMMIT                 >> userblock.txt
+
+#echo "{[( GIT FORMAT-PATCH )]}"    >> userblock.txt
+## create format patch containing log info for commit changes
+## PARENT should be identical to origin
+#git format-patch $PARENTCOMMIT..HEAD --minimal --stdout >> $1/userblock.txt
+
+# Also store binary changes in diff
+echo "{[( GIT DIFF )]}"            >> userblock.txt
+# commited changes
+git diff -p $PARENTCOMMIT..HEAD    >> userblock.txt
+# uncommited changes
+git diff -p                        >> userblock.txt
+
+echo "{[( GIT URL )]}"             >> userblock.txt
+git config --get remote.origin.url >> userblock.txt
+
+# change directory to cmake chache dir
+cd "$2/CMakeFiles"
+# copy compile flags of the flexi(lib) to userblock
+echo "{[( libflexistatic.dir/flags.make )]}" >> $1/userblock.txt
+cat libflexistatic.dir/flags.make            >> $1/userblock.txt
+echo "{[( libflexishared.dir/flags.make )]}" >> $1/userblock.txt
+cat libflexishared.dir/flags.make            >> $1/userblock.txt
+echo "{[( flexi.dir/flags.make )]}"          >> $1/userblock.txt
+cat flexi.dir/flags.make                     >> $1/userblock.txt
+
+# change directory to actual cmake version
+cd "$3"
+# copy detection of compiler to userblock
+echo "{[( COMPILER VERSIONS )]}"           >> $1/userblock.txt
+cat CMakeFortranCompiler.cmake             >> $1/userblock.txt
+
+cd "$1" # go back to the runtime output directory
+# Compress the userblock
+tar cJf userblock.tar.xz userblock.txt
+
+# Build the module
+objcopy -I binary -O elf64-x86-64 -B i386 --redefine-sym _binary_userblock_tar_xz_start=userblock_start --redefine-sym _binary_userblock_tar_xz_end=userblock_end --redefine-sym _binary_userblock_tar_xz_size=userblock_size userblock.tar.xz userblock.o
+rm userblock.tar.xz