From 7adcf1f70115efd23e476fa075bce3966928dd4c Mon Sep 17 00:00:00 2001
From: Robert Kloefkorn <robertk@ucar.edu>
Date: Fri, 6 Dec 2013 12:32:37 +0100
Subject: [PATCH] only one parameter file.

---
 .../test/navierstokes/paramFiles/paramNSWaves | 12 ++-
 dune/fem-dg/test/navierstokes/parameter       | 75 +++++++++++++++++++
 2 files changed, 85 insertions(+), 2 deletions(-)
 create mode 100644 dune/fem-dg/test/navierstokes/parameter

diff --git a/dune/fem-dg/test/navierstokes/paramFiles/paramNSWaves b/dune/fem-dg/test/navierstokes/paramFiles/paramNSWaves
index abbaf7bd..4cf1e38f 100644
--- a/dune/fem-dg/test/navierstokes/paramFiles/paramNSWaves
+++ b/dune/fem-dg/test/navierstokes/paramFiles/paramNSWaves
@@ -14,6 +14,8 @@ fem.io.datafileprefix: NS
 fem.io.savestep: 0.01 # SaveStep (write data every `saveStep' time period, <=0 deactivates)
 fem.io.savecount: -1 # SaveCount (write data every saveCount time steps, <=0 deactivates)
 
+femhowto.printCount: 10
+
 femhowto.additionalvariables: false
 
 
@@ -45,7 +47,9 @@ g: 9.81 # m/ss
 Re: 1. #(Reynold's number)
 Pr: 0.72 # 0.72 #(Prandtl's number)
 femhowto.startTime: 0. # s
-femhowto.endTime: 0.04
+femhowto.endTime: 0.0
+femhowto.eocSteps: 5
+
 gammaGNS: 0.5
 omegaGNS: 1.
 kGNS: 3.1415926535897932385
@@ -55,9 +59,13 @@ kGNS: 3.1415926535897932385
 #---------------------
 
 fem.io.macroGridFile_1d: ../grids/nswaves_1d.dgf
-fem.io.macroGridFile_2d: ../grids/nswaves_2d.dgf
+#fem.io.macroGridFile_2d: ../grids/nswaves_2d.dgf
+#fem.io.macroGridFile_2d: ../grids/mesh4_1_2.typ1.dgf
+fem.io.macroGridFile_2d: ../grids/mesh4_1_1.typ1.dgf
 #fem.io.macroGridFile_2d: ../grids/nswaves_2d_unstr.dgf
 fem.io.macroGridFile_3d: ../grids/nswaves_3d.dgf
+#fem.io.macroGridFile_3d: ../grids/dkershaw08.msh.dgf
+#fem.io.macroGridFile_3d: ../grids/RandMesh4.msh.dgf
 
 
 # SOLVER CONFIGURATION
diff --git a/dune/fem-dg/test/navierstokes/parameter b/dune/fem-dg/test/navierstokes/parameter
new file mode 100644
index 00000000..4cf1e38f
--- /dev/null
+++ b/dune/fem-dg/test/navierstokes/parameter
@@ -0,0 +1,75 @@
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 
+# This file precribes parameters for the testcase found in   
+#
+# Gregor Gassner,
+# PhD thesis
+#
+# ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 
+
+# DATA WRITER
+#------------
+
+fem.prefix: data
+fem.io.datafileprefix: NS
+fem.io.savestep: 0.01 # SaveStep (write data every `saveStep' time period, <=0 deactivates)
+fem.io.savecount: -1 # SaveCount (write data every saveCount time steps, <=0 deactivates)
+
+femhowto.printCount: 10
+
+femhowto.additionalvariables: false
+
+
+# GENERAL
+#--------
+
+paramfile: ../parameter/paramBase
+
+
+# GRID SOLUTION 
+#--------------
+
+gridsol.savestep: 0.5
+gridsol.firstwrite: 0.5
+gridsol.filename: nseq-checkpoint
+
+
+# PROBLEM SETUP
+#--------------
+
+paramfile: ../parameter/paramPhysicalConstants
+
+# WBPROBLEM
+# g: 0.7 # m/(ss)
+# p0: 10. # surface pressure Pa=kg/(mss)
+# diffusion coefficients
+mu: 0.0001 #00001 #  kg/(ms)
+g: 9.81 # m/ss
+Re: 1. #(Reynold's number)
+Pr: 0.72 # 0.72 #(Prandtl's number)
+femhowto.startTime: 0. # s
+femhowto.endTime: 0.0
+femhowto.eocSteps: 5
+
+gammaGNS: 0.5
+omegaGNS: 1.
+kGNS: 3.1415926535897932385
+
+
+# DOMAIN CONFIGURATION
+#---------------------
+
+fem.io.macroGridFile_1d: ../grids/nswaves_1d.dgf
+#fem.io.macroGridFile_2d: ../grids/nswaves_2d.dgf
+#fem.io.macroGridFile_2d: ../grids/mesh4_1_2.typ1.dgf
+fem.io.macroGridFile_2d: ../grids/mesh4_1_1.typ1.dgf
+#fem.io.macroGridFile_2d: ../grids/nswaves_2d_unstr.dgf
+fem.io.macroGridFile_3d: ../grids/nswaves_3d.dgf
+#fem.io.macroGridFile_3d: ../grids/dkershaw08.msh.dgf
+#fem.io.macroGridFile_3d: ../grids/RandMesh4.msh.dgf
+
+
+# SOLVER CONFIGURATION
+#---------------------
+
+paramfile: ../parameter/paramSolver
+
-- 
GitLab