delete parameters from input-files that were set to the default value, update...

delete parameters from input-files that were set to the default value, update parameterlist, update list of copyright holders
reviewed by Johannes


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@14518 2fb0f335-1f38-0410-981e-8018bf24f1b0

COPYING

 Copyright holders:
 
 2010--2014  Katherina Baber
-2013--2014  Beatrix Becker
+2015        Martin Beck
+2013--2015  Beatrix Becker
 2014        Markus Blatt
 2010        Felix Bode
 2007--2011  Yufei Cao
@@ -10,29 +11,33 @@ Copyright holders:
 2008--2009  Onur Dogan
 2009--2011  Karin Erbertseder
 2009--2014  Benjamin Faigle
-2013--2014  Thomas Fetzer
-2007--2014  Bernd Flemisch
+2013--2015  Thomas Fetzer
+2007--2015  Bernd Flemisch
 2007--2010  Jochen Fritz
-2012--2014  Christoph Grüninger
-2012--2014  Vishal Jambhekar
+2012--2015  Christoph Grüninger
+2015        Johannes Hommel
+2012--2015  Vishal Jambhekar
 2013--2014  Muhammad Adil Javed
-2012--2014  Alexander Kissinger
-2013--2014  Timo Koch
+2012--2015  Alexander Kissinger
+2013--2015  Timo Koch
 2008--2012  Andreas Lauser
 2008--2014  Klaus Mosthaf
 2009--2014  Philipp Nuske
 2014        Mirka Papenheim 
 2013--2014  Dominik Riesterer
 2008        Irina Rybak
-2013--2014  Martin Schneider
+2013--2015  Martin Schneider
+2015        Simon Scholz
 2009        Anneli Schöniger
-2014	    Natalie Schröder
-2010--2014  Nicolas Schwenck
+2015	    Natalie Schröder
+2010--2015  Nicolas Schwenck
+2015        Gabriele Seitz
 2011        Michael Sinsbeck
 2010        Leopold Stadler
 2012-2014   Alexandru Tatomir
 2013        Katharina Türk
 2010--2014  Lena Walter
+2015        Kilian Weishaupt
 2010--2011  David Werner
 2015        Hao Wu
 2008--2013  Markus Wolff

test/decoupled/1p/test_diffusion3d.input

@@ -6,5 +6,8 @@ EnableGravity = 0 # Disable Gravity
 File = ./grids/test_diffusion3d_ug1.dgf
 #File = ./grids/test_diffusion3d_ug2.dgf
 
+[MPFA]
+TransmissibilityCriterion = 1 # 0 = default criterion, 1 = accumulative criterion
+
 RefinementRatio = 0
 

test/decoupled/1p/test_diffusionproblem3d.hh

@@ -99,7 +99,6 @@ NEW_TYPE_TAG(FVTestProblem, INHERITS_FROM(FVPressureTwoP, DiffusionTestProblem))
 
 // set the types for the MPFA-L FV method
 NEW_TYPE_TAG(FVMPFAL3DTestProblem, INHERITS_FROM(FvMpfaL3dPressureTwoP, DiffusionTestProblem));
-SET_INT_PROP(FVMPFAL3DTestProblem, MPFATransmissibilityCriterion, 1);
 
 // set the types for the mimetic FD method
 NEW_TYPE_TAG(MimeticTestProblem, INHERITS_FROM(MimeticPressureTwoP, DiffusionTestProblem));

test/decoupled/2p/test_3d2p.input

@@ -11,8 +11,6 @@ RefinementFactor = 2
 [MPFA]
 TransmissibilityCriterion = 1
 #EnableTPFA = true
-EnableSimpleLStencil = true
-EnableComplexLStencil =true
 
 [Problem]
 EnableGravity = 0 # Disable Gravity

test/multidomain/2cnistokes2p2cni/test_2cnistokes2p2cni.input

@@ -51,8 +51,6 @@ SinusConcentrationAmplitude = 0.0 # [-]
 SinusConcentrationPeriod = 3600 # [s]
 SinusTemperatureAmplitude = 0.0 # [K]
 SinusTemperaturePeriod = 3600 # [s]
-BoundaryLayerModel = 0    # 0 for none, 1 Blasius, 2 and 3 turbulent BL, 9 constant thickness
-MassTransferModel = 0     # 0 for none, 1 power law, 2 Schluender model
 ExponentMTC = 0.0         # 1./6., Mass transfer coefficient for S^MTC
 BoundaryLayerOffset = 0.0 # [m] virtual run-up distance for BL models
 ConstThickness = 0.0016   # [m] constant BL thickness (BL model 9)

test/multidomain/2cnistokes2p2cni/test_2cnistokes2p2cni_reference.input

@@ -51,8 +51,6 @@ SinusConcentrationAmplitude = 0.0 # [-]
 SinusConcentrationPeriod = 3600 # [s]
 SinusTemperatureAmplitude = 0.0 # [K]
 SinusTemperaturePeriod = 3600 # [s]
-BoundaryLayerModel = 0    # 0 for none, 1 Blasius, 2 and 3 turbulent BL, 9 constant thickness
-MassTransferModel = 0     # 0 for none, 1 power law, 2 Schluender model
 ExponentMTC = 0.0         # 1./6., Mass transfer coefficient for S^MTC
 BoundaryLayerOffset = 0.0 # [m] virtual run-up distance for BL models
 ConstThickness = 0.0016   # [m] constant BL thickness (BL model 9)

test/multidomain/2cnistokes2p2cni/test_references/storage.out

-Time;TotalMassChange;WaterMassChange;IntEnergyChange;WaterMass
-1.26042;0.00194425;0.000125224;343.421;1.27799
-2.41688;6.93533e-05;6.0366e-05;150.935;1.27797
-4.17568;5.83261e-05;5.85989e-05;146.068;1.27794
-7.03372;5.77062e-05;5.80129e-05;144.211;1.2779
-11.3803;5.71496e-05;5.74529e-05;142.361;1.27784
-17.9908;5.65117e-05;5.6811e-05;140.233;1.27775
-28.0442;5.57676e-05;5.60621e-05;137.748;1.2776
-43.3337;5.48956e-05;5.51846e-05;134.831;1.27739
-66.5866;5.38747e-05;5.41572e-05;131.409;1.27708
-101.95;5.26849e-05;5.29598e-05;127.41;1.27661
-155.733;5.13083e-05;5.15744e-05;122.77;1.27592
-237.527;4.9731e-05;4.99868e-05;117.434;1.27489
-361.922;4.79461e-05;4.81903e-05;111.371;1.2734
-551.106;4.5956e-05;4.61869e-05;104.58;1.27121
-838.823;4.37754e-05;4.39917e-05;97.0982;1.26805
-1198.82;4.1761e-05;4.19637e-05;90.147;1.26427
-1558.82;4.0124e-05;4.03158e-05;84.5297;1.26064
-1918.82;3.82262e-05;3.84062e-05;78.6577;1.25719
-2278.82;3.62187e-05;3.63869e-05;72.6885;1.25391
-2638.82;3.39949e-05;3.41501e-05;66.3784;1.25084
-2818.82;3.2375e-05;3.25218e-05;62.0324;1.24937
-2927.57;3.13008e-05;3.14418e-05;59.1959;1.24852
-2998.94;3.05621e-05;3.0699e-05;57.262;1.24797
-3092.61;2.95295e-05;2.96607e-05;54.5901;1.24728
-3154.08;2.87307e-05;2.88579e-05;52.5499;1.24683
-3247.57;2.75811e-05;2.77017e-05;49.6315;1.24619
-3304.05;2.66777e-05;2.67941e-05;47.3681;1.24581
-3389.95;2.53599e-05;2.54688e-05;44.0964;1.24526
-3493.74;2.35648e-05;2.36642e-05;39.7102;1.24465
-3600;2.10103e-05;2.10966e-05;33.764;1.24409

test/multidomain/2cnistokes2p2cni/test_references/test_2cnistokes2p2cni_reference.input

-
-[Problem]
-RunUpDistanceX = 0.0
-NoDarcyX = 0.0
-UseDirichletFF = true
-
-[TimeManager]
-DtInitial = 5e-1 
-MaxTimeStepSize = 360
-
-InitTime = 0 
-
-TEnd = 3600
-
-EpisodeLength = 43200
-
-[Vtk]
-NameFF = stokes2cni
-NamePM = 2p2cni
-AddVelocity = 1 
-
-[Grid]
-UseInterfaceMeshCreator = true
-
-File = grids/interfacedomain.dgf
-Refinement = 0
-
-CellsX = 15
-CellsY = 45
-CellsZ = 1
-Grading = 1.13
-
-XMin = 0.0
-XMax = 0.25
-YMin = 0.0
-YMax = 0.5
-
-InterfacePos = 0.25
-
-[Output]
-FreqRestart = 1000      # how often restart files are written out 
-FreqOutput = 1          # frequency of VTK output
-FreqMassOutput = 1      # frequency of mass and evaporation rate output (Darcy)
-FreqFluxOutput = 5      # frequency of detailed flux output
-FreqVaporFluxOutput = 1 # frequency of summarized flux output
-
-[Stokes]
-StabilizationAlpha = -1.0
-
-[FreeFlow]
-RefVelocity = 3.5
-RefPressure = 1e5
-RefMassfrac = 0.008          # 0.01
-RefTemperature = 298.15
-SinusVelAmplitude = 0.0           # 0.1
-SinusVelPeriod = 3600             # in seconds
-SinusPressureAmplitude = 0.0      # 0.5
-SinusPressurePeriod = 3600        # in seconds
-SinusConcentrationAmplitude = 0.0 # 0.5
-SinusConcentrationPeriod = 3600   # in seconds
-SinusTemperatureAmplitude = 0.0   # 0.5
-SinusTemperaturePeriod = 3600     # in seconds
-BeaversJosephSlipVel = 0.00134
-ExponentMTC = 0.0           # 1./6., Mass transfer coefficient for S^MTC
-UseBoundaryLayerModel = 0   # 0 for no boundary layer model, 1 for Blasius, 2 and 3 for turbulent BL, 9 for constant thickness
-BoundaryLayerOffset = 0.0   # for BL model like Blasius, determines a virtual run-up distance for the flow
-ConstThickness = 0.0016     # for a constant BL thickness, use BL model 9
-MassTransferModel = 0       # 0 for none, 1 for power law, 2 for Schluender model
-
-[PorousMedium]
-RefPressurePM = 1e5
-RefTemperaturePM = 298.15
-InitialSw1 = 0.05
-InitialSw2 = 0.05
-CharPoreRadius = 1e-4       # for Schluender mass-transfer model
-PlotFluidProperties = false
-
-[SpatialParams]
-MaterialInterfaceX = -100.0
-AlphaBJ = 1.0
-
-SoilType = 2
-RegularizationThreshold = 1e-2 # linearization threshold for pc-Sw
-
-GenerateNewPermeability = true
-GStatControlFileName = gstatControl_2D.txt
-GStatInputFileName = gstatInput.txt
-PermeabilityInputFileName = permeab.dat
-
-[SpatialParams.Coarse]
-Permeability1 = 7.0e-10 #Kozeny-Carman; 1.387e-11 measured?
-Porosity1 = 0.44
-Swr1 = 0.005
-Snr1 = 0.01
-VgAlpha1 = 8.74e-4 
-VgN1 = 3.35
-PlotMaterialLaw1 = false
-LambdaSolid1 = 5.26
-
-Pentry1 = 1012
-BCLambda1 = 3.277
-
-[SpatialParams.Medium]
-Permeability2 = 2.65e-10
-Porosity2 = 0.41
-Swr2 = 0.005
-Snr2 = 0.01
-VgAlpha2 = 6.371e-4
-VgN2 = 8.0 # before: 6.9
-PlotMaterialLaw2 = false
-LambdaSolid2 = 5.26
-
-Pentry2 = 1357
-BCLambda2 = 6.960
-
-[SpatialParams.LeverettJ]
-PermeabilityJ = 1.0e-09
-PorosityJ = 0.41
-PlotMaterialLawJ = false
-
-[SpatialParams.Fine]
-Permeability3 = 1.06e-10
-Porosity3 = 0.334
-Swr3 = 0.028
-Snr3 = 0.01
-VgAlpha3 = 5.81e-4
-VgN3 = 17.8
-PlotMaterialLaw3 = false
-LambdaSolid3 = 5.26
-
-Pentry3 = 1012
-BCLambda3 = 3.277
-
-[Newton]
-MaxRelativeShift = 1e-5
-TargetSteps = 8
-MaxSteps = 12
-WriteConvergence = false 
-MaxTimeStepDivisions = 20
-
-[LinearSolver]
-ResidualReduction = 1e-9
-Verbosity = 0
-MaxIterations = 200

test/multidomain/2cstokes2p2c/test_2cstokes2p2c.input

@@ -49,8 +49,6 @@ SinusConcentrationAmplitude = 0.0 # [-]
 SinusConcentrationPeriod = 3600 # [s]
 SinusTemperatureAmplitude = 0.0 # [K]
 SinusTemperaturePeriod = 3600 # [s]
-BoundaryLayerModel = 0    # 0 for none, 1 Blasius, 2 and 3 turbulent BL, 9 constant thickness
-MassTransferModel = 0     # 0 for none, 1 power law, 2 Schluender model
 ExponentMTC = 0.0         # 1./6., Mass transfer coefficient for S^MTC
 BoundaryLayerOffset = 0.0 # [m] virtual run-up distance for BL models
 ConstThickness = 0.0016   # [m] constant BL thickness (BL model 9)

test/multidomain/2cstokes2p2c/test_2cstokes2p2c_reference.input

@@ -49,8 +49,6 @@ SinusConcentrationAmplitude = 0.0 # [-]
 SinusConcentrationPeriod = 3600 # [s]
 SinusTemperatureAmplitude = 0.0 # [K]
 SinusTemperaturePeriod = 3600 # [s]
-BoundaryLayerModel = 0    # 0 for none, 1 Blasius, 2 and 3 turbulent BL, 9 constant thickness
-MassTransferModel = 0     # 0 for none, 1 power law, 2 Schluender model
 ExponentMTC = 0.0         # 1./6., Mass transfer coefficient for S^MTC
 BoundaryLayerOffset = 0.0 # [m] virtual run-up distance for BL models
 ConstThickness = 0.0016   # [m] constant BL thickness (BL model 9)

test/multidomain/2cstokes2p2c/test_references/test_2cstokes2p2c_reference.input

-#############################################################
-#Configuration file for test_2cstokes2p2c
-#############################################################
-
-#############################################################
-[Problem]
-#############################################################
-#First part of the interface, where it is not coupled;
-#set to zero or negative if not desired
-RunUpDistanceX = 0.0
-NoDarcyX = 0.0
-
-#############################################################
-[TimeManager]
-#############################################################
-#Initial and maximum time-step size
-DtInitial = 5e-1
-MaxTimeStepSize = 360
-
-#Initialization time without coupling
-#set to zero or negative if not desired
-InitTime = 0
-
-#Simulation end
-TEnd= 7200
-
-#Define the length of an episode (for output)
-EpisodeLength = 43200
-
-#############################################################
-[Vtk]
-#############################################################
-#Names for VTK output
-NameFF = stokes2c
-NamePM = 2p2c
-AddVelocity = 1
-
-#############################################################
-[Grid]
-#############################################################
-UseInterfaceMeshCreator = true
-
-#Name of the dgf file (grid)
-File = grids/interfacedomain.dgf
-Refinement = 0
-
-#Number of elements in x-, y-, z-direction
-CellsX = 15
-CellsY = 45
-CellsZ = 1
-#Grading and refinement of the mesh in y direction
-Grading = 1.13
-
-#Extend of the entire domain
-XMin = 0.0
-XMax = 0.25
-YMin = 0.0
-YMax = 0.5
-
-#Vertical position of coupling interface
-InterfacePos = 0.25
-
-#############################################################
-[Output]
-#############################################################
-#Frequency of restart file, flux and VTK output
-FreqRestart = 1000      # how often restart files are written out 
-FreqOutput = 1          # frequency of VTK output
-FreqMassOutput = 1      # frequency of mass and evaporation rate output (Darcy)
-FreqFluxOutput = 5      # frequency of detailed flux output
-FreqVaporFluxOutput = 1 # frequency of summarized flux output
-
-#############################################################
-[Stokes]
-#############################################################
-StabilizationAlpha = -1.0
-
-#############################################################
-[FreeFlow]
-#############################################################
-RefVelocity = 3.5
-RefPressure = 1e5
-RefMassfrac = 0.008          # 0.01
-RefTemperature = 298.15
-SinusVelAmplitude = 0.0           # 0.1
-SinusVelPeriod = 3600             # in seconds
-SinusPressureAmplitude = 0.0      # 0.5
-SinusPressurePeriod = 3600        # in seconds
-SinusConcentrationAmplitude = 0.0 # 0.5
-SinusConcentrationPeriod = 3600   # in seconds
-SinusTemperatureAmplitude = 0.0   # 0.5
-SinusTemperaturePeriod = 3600     # in seconds
-BeaversJosephSlipVel = 0.00134
-ExponentMTC = 0.0           # 1./6., Mass transfer coefficient for S^MTC
-UseBoundaryLayerModel = 0   # 0 for no boundary layer model, 1 for Blasius, 2 and 3 for turbulent BL, 9 for constant thickness
-BoundaryLayerOffset = 0.0   # for BL model like Blasius, determines a virtual run-up distance for the flow
-ConstThickness = 0.0016     # for a constant BL thickness, use BL model 9
-MassTransferModel = 0       # 0 for none, 1 for power law, 2 for Schluender model
-
-#############################################################
-[PorousMedium]
-#############################################################
-RefPressurePM = 1e5
-RefTemperaturePM = 298.15
-InitialSw1 = 0.05
-InitialSw2 = 0.05
-CharPoreDiameter = 1e-4     # for Schluender mass-transfer model
-
-#############################################################
-[SpatialParams]
-#############################################################
-MaterialInterfaceX = 100.0
-AlphaBJ = 1.0
-
-# for homogeneous setups (0 for heterogeneous):
-SoilType = 2
-RegularizationThreshold = 1e-2 # linearization threshold for pc-Sw
-
-# GStat stuff, only required for SoilType=0
-GenerateNewPermeability = true
-GStatControlFileName = gstatControl_2D.txt
-GStatInputFileName = gstatInput.txt
-PermeabilityInputFileName = permeab.dat
-
-### SoilType = 1 ### 
-[SpatialParams.Coarse]
-Permeability1 = 7.0e-10
-Porosity1 = 0.44
-Swr1 = 0.005
-Snr1 = 0.01
-VgAlpha1 = 8.74e-4
-VgN1 = 3.35
-PlotMaterialLaw1 = false
-LambdaSolid1 = 5.3
-
-### SoilType = 2 ###
-[SpatialParams.Medium]
-Permeability2 = 2.65e-10
-Porosity2 = 0.41
-Swr2 = 0.005
-Snr2 = 0.01
-VgAlpha2 = 6.371e-4
-VgN2 = 6.9
-PlotMaterialLaw2 = false 
-LambdaSolid2 = 5.3
-
-### SoilType = 3 ###
-[SpatialParams.Fine]
-Permeability3 = 1.06e-10
-Porosity3 = 0.334
-Swr3 = 0.028
-Snr3 = 0.01
-VgAlpha3 = 5.81e-4
-VgN3 = 17.8
-PlotMaterialLaw3 = false
-LambdaSolid3 = 5.3
-
-#############################################################
-[Newton]
-#############################################################
-MaxRelativeShift = 1e-5
-TargetSteps = 8
-MaxSteps = 12
-WriteConvergence = false
-MaxTimeStepDivisions = 20
-
-#############################################################
-[LinearSolver]
-#############################################################
-ResidualReduction = 1e-10
-Verbosity = 0
-MaxIterations = 200