diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/casoIH.foam b/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/casoIH.foam
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/controlDict b/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/controlDict
deleted file mode 100644
index 6800850f96a217079e05cdcd8c9f9d8d532dc651..0000000000000000000000000000000000000000
--- a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/controlDict
+++ /dev/null
@@ -1,157 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.1.0 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "system";
- object controlDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-application interFoam
-
-startFrom latestTime;
-
-startTime 0;
-
-stopAt endTime;
-
-endTime 50.0;
-
-deltaT 0.01;
-
-writeControl adjustableRunTime;
-
-writeInterval 0.033;
-
-purgeWrite 0;
-
-writeFormat ascii;
-
-writePrecision 6;
-
-writeCompression uncompressed;
-
-timeFormat general;
-
-timePrecision 6;
-
-runTimeModifiable yes;
-
-adjustTimeStep on;
-
-maxCo 0.65;
-maxAlphaCo 0.65;
-
-maxDeltaT 0.05;
-
-libs
-(
- "libIHwaveGenerationV2esi.so"
- "libIHwaveAbsorptionV2esi.so"
-);
-
-
-functions
-{
- line
- {
- type sets;
- functionObjectLibs ("libsampling.so");
- enabled true;
- outputControl outputTime;
- outputInterval 1;
-
- interpolationScheme cellPoint;
- setFormat raw;
- sets
- (
- line1
- {
-
- type uniform;
- axis distance;
- start ( 1.0 0.005 0.0 );
- end ( 1.0 0.005 0.8 );
- nPoints 1001;
- }
- line2
- {
-
- type uniform;
- axis distance;
- start ( 2.0 0.005 0.0 );
- end ( 2.0 0.005 0.8 );
- nPoints 1001;
- }
- line3
- {
-
- type uniform;
- axis distance;
- start ( 3.0 0.005 0.0 );
- end ( 3.0 0.005 0.8 );
- nPoints 1001;
- }
- line4
- {
-
- type uniform;
- axis distance;
- start ( 5.0 0.005 0.0 );
- end ( 5.0 0.005 0.8 );
- nPoints 1001;
- }
- line5
- {
-
- type uniform;
- axis distance;
- start ( 7.5 0.005 0.0 );
- end ( 7.5 0.005 0.8 );
- nPoints 1001;
- }
-
- line6
- {
-
- type uniform;
- axis distance;
- start ( 10.0 0.005 0.0 );
- end ( 10.0 0.005 0.8 );
- nPoints 1001;
- }
- line7
- {
-
- type uniform;
- axis distance;
- start ( 12.0 0.005 0.0 );
- end ( 12.0 0.005 0.8 );
- nPoints 1001;
- }
- line8
- {
-
- type uniform;
- axis distance;
- start ( 14.0 0.005 0.0 );
- end ( 14.0 0.005 0.8 );
- nPoints 1001;
- }
- );
- fixedLocations false;
- fields
- (
- U alpha.water
- );
- }
-
-// ************************************************************************* //
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/casoIH.foam b/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/casoIH.foam
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/controlDict b/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/controlDict
deleted file mode 100644
index 2b262a9a3c8f22af6fe15fb7aad55b1c9125238b..0000000000000000000000000000000000000000
--- a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/controlDict
+++ /dev/null
@@ -1,157 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| ========= | |
-| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.1.0 |
-| \\ / A nd | Web: www.OpenFOAM.org |
-| \\/ M anipulation | |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
- version 2.0;
- format ascii;
- class dictionary;
- location "system";
- object controlDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-application interFoam
-
-startFrom latestTime;
-
-startTime 0;
-
-stopAt endTime;
-
-endTime 30.0;
-
-deltaT 0.01;
-
-writeControl adjustableRunTime;
-
-writeInterval 0.033;
-
-purgeWrite 0;
-
-writeFormat ascii;
-
-writePrecision 6;
-
-writeCompression uncompressed;
-
-timeFormat general;
-
-timePrecision 6;
-
-runTimeModifiable yes;
-
-adjustTimeStep on;
-
-maxCo 0.65;
-maxAlphaCo 0.65;
-
-maxDeltaT 0.05;
-
-libs
-(
- "libIHwaveGenerationV2esi.so"
- "libIHwaveAbsorptionV2esi.so"
-);
-
-
-functions
-{
- line
- {
- type sets;
- functionObjectLibs ("libsampling.so");
- enabled true;
- outputControl outputTime;
- outputInterval 1;
-
- interpolationScheme cellPoint;
- setFormat raw;
- sets
- (
- line1
- {
-
- type uniform;
- axis distance;
- start ( 1.0 0.005 0.0 );
- end ( 1.0 0.005 0.8 );
- nPoints 1001;
- }
- line2
- {
-
- type uniform;
- axis distance;
- start ( 2.0 0.005 0.0 );
- end ( 2.0 0.005 0.8 );
- nPoints 1001;
- }
- line3
- {
-
- type uniform;
- axis distance;
- start ( 3.0 0.005 0.0 );
- end ( 3.0 0.005 0.8 );
- nPoints 1001;
- }
- line4
- {
-
- type uniform;
- axis distance;
- start ( 4.0 0.005 0.0 );
- end ( 4.0 0.005 0.8 );
- nPoints 1001;
- }
- line5
- {
-
- type uniform;
- axis distance;
- start ( 5 0.005 0.0 );
- end ( 5 0.005 0.8 );
- nPoints 1001;
- }
-
- line6
- {
-
- type uniform;
- axis distance;
- start ( 7.0 0.005 0.0 );
- end ( 7.0 0.005 0.8 );
- nPoints 1001;
- }
- line7
- {
-
- type uniform;
- axis distance;
- start ( 8.0 0.005 0.0 );
- end ( 8.0 0.005 0.8 );
- nPoints 1001;
- }
- line8
- {
-
- type uniform;
- axis distance;
- start ( 9.0 0.005 0.0 );
- end ( 9.0 0.005 0.8 );
- nPoints 1001;
- }
- );
- fixedLocations false;
- fields
- (
- U alpha.water
- );
- }
-
-// ************************************************************************* //
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/0.org/U b/integration/OpenCFD/testCases/waveExampleCnoidal/0.orig/U
similarity index 82%
rename from integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/0.org/U
rename to integration/OpenCFD/testCases/waveExampleCnoidal/0.orig/U
index 8d0d8b6a8e2392dc85a9b5d87df043564c5149fb..b215c9cd484061619762305269abfb76ca5d58f2 100644
--- a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/0.org/U
+++ b/integration/OpenCFD/testCases/waveExampleCnoidal/0.orig/U
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.7.x |
+| \\ / O peration | Version: plus |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -23,20 +23,14 @@ boundaryField
{
inlet
{
- type IH_Waves_InletVelocityV2;
- waveDict IHWavesDict;
+ type waveInletVelocity;
value uniform (0 0 0);
-
- leftORright 1.0;
}
outlet
{
- type IH_3D_3DAbsorption_InletVelocityV2;
- nPaddles 1;
+ type waveInletVelocity;
value uniform (0 0 0);
-
- leftORright -1.0;
}
sides
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/0.org/alpha.water b/integration/OpenCFD/testCases/waveExampleCnoidal/0.orig/alpha.water
similarity index 82%
rename from integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/0.org/alpha.water
rename to integration/OpenCFD/testCases/waveExampleCnoidal/0.orig/alpha.water
index cfddad37709e6d8f89fb032b6aa47c357a72e7fb..a99cef99e90c672d7ddd28436d7a66cb640e52f1 100644
--- a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/0.org/alpha.water
+++ b/integration/OpenCFD/testCases/waveExampleCnoidal/0.orig/alpha.water
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5-dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: plus |
+| \\ / A nd | Web: http://www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -22,8 +22,7 @@ boundaryField
{
inlet
{
- type IH_Waves_InletAlphaV2;
- waveDict IHWavesDict;
+ type waveInletAlpha;
value uniform 0;
}
@@ -36,10 +35,10 @@ boundaryField
{
type zeroGradient;
}
-
+
sides
{
- type empty;
+ type empty;
}
top
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/0.org/p_rgh b/integration/OpenCFD/testCases/waveExampleCnoidal/0.orig/p_rgh
similarity index 90%
rename from integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/0.org/p_rgh
rename to integration/OpenCFD/testCases/waveExampleCnoidal/0.orig/p_rgh
index fc5724d32bdd9000d22b54b65301e08e99676e6b..7ad5729cbfb902af1952dc5d9c949d8ed9967080 100644
--- a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/0.org/p_rgh
+++ b/integration/OpenCFD/testCases/waveExampleCnoidal/0.orig/p_rgh
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5-dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: plus |
+| \\ / A nd | Web: http://www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -20,13 +20,13 @@ internalField uniform 0;
boundaryField
{
- inlet
+ inlet
{
type fixedFluxPressure;
value uniform 0;
}
- outlet
+ outlet
{
type fixedFluxPressure;
value uniform 0;
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/Allclean b/integration/OpenCFD/testCases/waveExampleCnoidal/Allclean
new file mode 100755
index 0000000000000000000000000000000000000000..705f91474c4a86592eb4f9f16b842144f410492f
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleCnoidal/Allclean
@@ -0,0 +1,10 @@
+#!/bin/sh
+cd ${0%/*} || exit 1 # run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+rm -rf 0
+
+cleanCase
+
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/Allrun b/integration/OpenCFD/testCases/waveExampleCnoidal/Allrun
new file mode 100755
index 0000000000000000000000000000000000000000..9f0c668029a93fea007d22217c227f723d480abe
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleCnoidal/Allrun
@@ -0,0 +1,15 @@
+#!/bin/sh
+cd ${0%/*} || exit 1 # run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+restore0Dir
+
+runApplication blockMesh
+
+runApplication decomposePar
+
+runParallel setFields
+
+runParallel $(getApplication)
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/g b/integration/OpenCFD/testCases/waveExampleCnoidal/constant/g
similarity index 84%
rename from integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/g
rename to integration/OpenCFD/testCases/waveExampleCnoidal/constant/g
index 317bdd50defb2d1a2717ce5c7b4467cf9fd14264..3ec2141e5c9b5a8a78035c1d7906278b36600862 100644
--- a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/g
+++ b/integration/OpenCFD/testCases/waveExampleCnoidal/constant/g
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / O peration | Version: plus |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/transportProperties b/integration/OpenCFD/testCases/waveExampleCnoidal/constant/transportProperties
similarity index 89%
rename from integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/transportProperties
rename to integration/OpenCFD/testCases/waveExampleCnoidal/constant/transportProperties
index 3633e43efb93a3465f8dd8f82d7406b15a32b058..019225dd4f128332aeb280c0f517ff2f87dfa827 100644
--- a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/transportProperties
+++ b/integration/OpenCFD/testCases/waveExampleCnoidal/constant/transportProperties
@@ -1,8 +1,8 @@
/*---------------------------------------------------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.3 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: plus |
+| \\ / A nd | Web: http://www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/turbulenceProperties b/integration/OpenCFD/testCases/waveExampleCnoidal/constant/turbulenceProperties
similarity index 83%
rename from integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/turbulenceProperties
rename to integration/OpenCFD/testCases/waveExampleCnoidal/constant/turbulenceProperties
index 22f11ecab7ade8a69a3349000da8d304bdde6b61..115a9830c11098c87040784f3183691b1877caea 100644
--- a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/turbulenceProperties
+++ b/integration/OpenCFD/testCases/waveExampleCnoidal/constant/turbulenceProperties
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / O peration | Version: plus |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/IHWavesDict b/integration/OpenCFD/testCases/waveExampleCnoidal/constant/waveProperties
similarity index 58%
rename from integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/IHWavesDict
rename to integration/OpenCFD/testCases/waveExampleCnoidal/constant/waveProperties
index 7e72269bdafdca1478ca980c18e42e64a0853a6a..34a5dbc9da2cc0856f2f0548864f964dc2e4c835 100644
--- a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/IHWavesDict
+++ b/integration/OpenCFD/testCases/waveExampleCnoidal/constant/waveProperties
@@ -1,8 +1,8 @@
/*---------------------------------------------------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.3 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: plus |
+| \\ / A nd | Web: http://www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -11,24 +11,37 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object IHWavesDict;
+ object wavesProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-waveType regular;
+inlet
+{
+ alpha alpha.water;
+
+ waveModel cnoidal;
+
+ nPaddle 1;
+
+ waveHeight 0.1;
-waveTheory StokesV;
+ waveAngle 0.0;
-genAbs 1;
+ rampTime 6.0;
-nPaddles 1;
+ activeAbsorption yes;
-waveHeight 0.1;
+ wavePeriod 4.0;
+}
+
+outlet
+{
+ alpha alpha.water;
-wavePeriod 2.0;
+ waveModel shallowWaterAbsorption;
-waveDir 0.0;
+ nPaddle 1;
+}
-tSmooth 4.0;
// ************************************************************************* //
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/polyMesh/blockMeshDict b/integration/OpenCFD/testCases/waveExampleCnoidal/system/blockMeshDict
similarity index 91%
rename from integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/polyMesh/blockMeshDict
rename to integration/OpenCFD/testCases/waveExampleCnoidal/system/blockMeshDict
index bf8e28910c1b84e9314c5848045ad50d4e82c025..3b84f93af71a9a0b0bf06f2861e9ada3fe5308c1 100644
--- a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/polyMesh/blockMeshDict
+++ b/integration/OpenCFD/testCases/waveExampleCnoidal/system/blockMeshDict
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.1.0 |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / O peration | Version: plus |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -46,7 +46,7 @@ boundary
(
(0 4 7 3)
);
- }
+ }
outlet
{
type patch;
diff --git a/integration/OpenCFD/testCases/waveExampleCnoidal/system/controlDict b/integration/OpenCFD/testCases/waveExampleCnoidal/system/controlDict
new file mode 100644
index 0000000000000000000000000000000000000000..f65efdb4568fbc814a2704f38d60862113fdef9b
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleCnoidal/system/controlDict
@@ -0,0 +1,152 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: plus |
+| \\ / A nd | Web: www.OpenFOAM.com |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+libs
+(
+ "libwaveBCs.so"
+ "libwaveModels.so"
+);
+
+application interFoam;
+
+startFrom latestTime;
+
+startTime 0;
+
+stopAt endTime;
+
+endTime 50.0;
+
+deltaT 0.01;
+
+writeControl adjustableRunTime;
+
+writeInterval 0.033;
+
+purgeWrite 0;
+
+writeFormat ascii;
+
+writePrecision 6;
+
+writeCompression uncompressed;
+
+timeFormat general;
+
+timePrecision 6;
+
+runTimeModifiable yes;
+
+adjustTimeStep yes;
+
+maxCo 0.65;
+maxAlphaCo 0.65;
+
+maxDeltaT 0.05;
+
+
+functions
+{
+ line
+ {
+ type sets;
+ libs ("libsampling.so");
+ enabled true;
+ writeControl writeTime;
+ writeInterval 1;
+
+ interpolationScheme cellPoint;
+ setFormat raw;
+ sets
+ (
+ line1
+ {
+ type uniform;
+ axis distance;
+ start ( 1.0 0.005 0.0 );
+ end ( 1.0 0.005 0.8 );
+ nPoints 1001;
+ }
+ line2
+ {
+ type uniform;
+ axis distance;
+ start ( 2.0 0.005 0.0 );
+ end ( 2.0 0.005 0.8 );
+ nPoints 1001;
+ }
+ line3
+ {
+ type uniform;
+ axis distance;
+ start ( 3.0 0.005 0.0 );
+ end ( 3.0 0.005 0.8 );
+ nPoints 1001;
+ }
+ line4
+ {
+ type uniform;
+ axis distance;
+ start ( 5.0 0.005 0.0 );
+ end ( 5.0 0.005 0.8 );
+ nPoints 1001;
+ }
+ line5
+ {
+ type uniform;
+ axis distance;
+ start ( 7.5 0.005 0.0 );
+ end ( 7.5 0.005 0.8 );
+ nPoints 1001;
+ }
+
+ line6
+ {
+ type uniform;
+ axis distance;
+ start ( 10.0 0.005 0.0 );
+ end ( 10.0 0.005 0.8 );
+ nPoints 1001;
+ }
+ line7
+ {
+ type uniform;
+ axis distance;
+ start ( 12.0 0.005 0.0 );
+ end ( 12.0 0.005 0.8 );
+ nPoints 1001;
+ }
+ line8
+ {
+ type uniform;
+ axis distance;
+ start ( 14.0 0.005 0.0 );
+ end ( 14.0 0.005 0.8 );
+ nPoints 1001;
+ }
+ );
+
+ fixedLocations false;
+ fields
+ (
+ U alpha.water
+ );
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/decomposeParDict b/integration/OpenCFD/testCases/waveExampleCnoidal/system/decomposeParDict
similarity index 82%
rename from integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/decomposeParDict
rename to integration/OpenCFD/testCases/waveExampleCnoidal/system/decomposeParDict
index a4e660116ce72ed1d26c87d67922ca9cbd9cd6dd..28bcf3ad286df71730370f683b9dd1dcbdddc265 100644
--- a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/decomposeParDict
+++ b/integration/OpenCFD/testCases/waveExampleCnoidal/system/decomposeParDict
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.1.0 |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / O peration | Version: plus |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -15,13 +15,13 @@ FoamFile
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-numberOfSubdomains 2;
+numberOfSubdomains 8;
method hierarchical;
hierarchicalCoeffs
{
- n (2 1 1);
+ n (4 2 1);
delta 0.001;
order xyz;
}
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/fvSchemes b/integration/OpenCFD/testCases/waveExampleCnoidal/system/fvSchemes
similarity index 86%
rename from integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/fvSchemes
rename to integration/OpenCFD/testCases/waveExampleCnoidal/system/fvSchemes
index 391aa981dbeba74b56d456033d6d81105b61efdd..c0cddb6d0e0524e159b0a2e4adf0dfd993aa8e1e 100644
--- a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/fvSchemes
+++ b/integration/OpenCFD/testCases/waveExampleCnoidal/system/fvSchemes
@@ -2,8 +2,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.1.0 |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / O peration | Version: plus |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -28,10 +28,9 @@ gradSchemes
divSchemes
{
- //div(rho*phi,U) Gauss limitedLinearV 1;
div(rhoPhi,U) Gauss linearUpwind grad(U);
div(phi,alpha) Gauss vanLeer;
- div(phirb,alpha) Gauss interfaceCompression;
+ div(phirb,alpha) Gauss linear;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
div(phi,omega) Gauss upwind;
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/fvSolution b/integration/OpenCFD/testCases/waveExampleCnoidal/system/fvSolution
similarity index 91%
rename from integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/fvSolution
rename to integration/OpenCFD/testCases/waveExampleCnoidal/system/fvSolution
index 7f86a739eedd3cb133565881ee4a7c1cd4d295d8..bb74b12427b885890cc7d60dcaf4afaffe9391ea 100644
--- a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/fvSolution
+++ b/integration/OpenCFD/testCases/waveExampleCnoidal/system/fvSolution
@@ -2,8 +2,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.1.0 |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / O peration | Version: plus |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -95,9 +95,6 @@ PIMPLE
momentumPredictor no;
nCorrectors 3;
nNonOrthogonalCorrectors 0;
- nAlphaCorr 1;
- nAlphaSubCycles 4;
- cAlpha 2;
}
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/setFieldsDict b/integration/OpenCFD/testCases/waveExampleCnoidal/system/setFieldsDict
similarity index 88%
rename from integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/setFieldsDict
rename to integration/OpenCFD/testCases/waveExampleCnoidal/system/setFieldsDict
index 248ecb39e947c274e8495c0dac18c0d8b04061b2..9d2a8bcb80d5e2922b40f7c42d915bede3b1130f 100644
--- a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/setFieldsDict
+++ b/integration/OpenCFD/testCases/waveExampleCnoidal/system/setFieldsDict
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.1.0 |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / O peration | Version: plus |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/0.org/U b/integration/OpenCFD/testCases/waveExampleStokesV/0.orig/U
similarity index 80%
rename from integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/0.org/U
rename to integration/OpenCFD/testCases/waveExampleStokesV/0.orig/U
index 8d0d8b6a8e2392dc85a9b5d87df043564c5149fb..523da1ac2dd53bd00b834e57924027556f73285c 100644
--- a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/0.org/U
+++ b/integration/OpenCFD/testCases/waveExampleStokesV/0.orig/U
@@ -1,7 +1,7 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.7.x |
+| \\ / O peration | Version: plus |
| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
@@ -23,20 +23,14 @@ boundaryField
{
inlet
{
- type IH_Waves_InletVelocityV2;
- waveDict IHWavesDict;
+ type waveInletVelocity;
value uniform (0 0 0);
-
- leftORright 1.0;
}
outlet
{
- type IH_3D_3DAbsorption_InletVelocityV2;
- nPaddles 1;
+ type waveInletVelocity;
value uniform (0 0 0);
-
- leftORright -1.0;
}
sides
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/0.org/alpha.water b/integration/OpenCFD/testCases/waveExampleStokesV/0.orig/alpha.water
similarity index 84%
rename from integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/0.org/alpha.water
rename to integration/OpenCFD/testCases/waveExampleStokesV/0.orig/alpha.water
index cfddad37709e6d8f89fb032b6aa47c357a72e7fb..b309a9dfb8d9cf02c7e5aa17d11169825322e3bc 100644
--- a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/0.org/alpha.water
+++ b/integration/OpenCFD/testCases/waveExampleStokesV/0.orig/alpha.water
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5-dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: plus |
+| \\ / A nd | Web: http://www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -22,8 +22,7 @@ boundaryField
{
inlet
{
- type IH_Waves_InletAlphaV2;
- waveDict IHWavesDict;
+ type waveInletAlpha;
value uniform 0;
}
@@ -36,7 +35,7 @@ boundaryField
{
type zeroGradient;
}
-
+
sides
{
type empty;
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/0.org/p_rgh b/integration/OpenCFD/testCases/waveExampleStokesV/0.orig/p_rgh
similarity index 90%
rename from integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/0.org/p_rgh
rename to integration/OpenCFD/testCases/waveExampleStokesV/0.orig/p_rgh
index fc5724d32bdd9000d22b54b65301e08e99676e6b..7ad5729cbfb902af1952dc5d9c949d8ed9967080 100644
--- a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/0.org/p_rgh
+++ b/integration/OpenCFD/testCases/waveExampleStokesV/0.orig/p_rgh
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.5-dev |
-| \\ / A nd | Web: http://www.OpenFOAM.org |
+| \\ / O peration | Version: plus |
+| \\ / A nd | Web: http://www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -20,13 +20,13 @@ internalField uniform 0;
boundaryField
{
- inlet
+ inlet
{
type fixedFluxPressure;
value uniform 0;
}
- outlet
+ outlet
{
type fixedFluxPressure;
value uniform 0;
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/Allclean b/integration/OpenCFD/testCases/waveExampleStokesV/Allclean
new file mode 100755
index 0000000000000000000000000000000000000000..705f91474c4a86592eb4f9f16b842144f410492f
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesV/Allclean
@@ -0,0 +1,10 @@
+#!/bin/sh
+cd ${0%/*} || exit 1 # run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+rm -rf 0
+
+cleanCase
+
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/Allrun b/integration/OpenCFD/testCases/waveExampleStokesV/Allrun
new file mode 100755
index 0000000000000000000000000000000000000000..9f0c668029a93fea007d22217c227f723d480abe
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesV/Allrun
@@ -0,0 +1,15 @@
+#!/bin/sh
+cd ${0%/*} || exit 1 # run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+restore0Dir
+
+runApplication blockMesh
+
+runApplication decomposePar
+
+runParallel setFields
+
+runParallel $(getApplication)
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/g b/integration/OpenCFD/testCases/waveExampleStokesV/constant/g
similarity index 86%
rename from integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/g
rename to integration/OpenCFD/testCases/waveExampleStokesV/constant/g
index 317bdd50defb2d1a2717ce5c7b4467cf9fd14264..195dbea3f3cac083e26f182b8ae44f0074c8486c 100644
--- a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/g
+++ b/integration/OpenCFD/testCases/waveExampleStokesV/constant/g
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / O peration | Version: plus |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/transportProperties b/integration/OpenCFD/testCases/waveExampleStokesV/constant/transportProperties
similarity index 89%
rename from integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/transportProperties
rename to integration/OpenCFD/testCases/waveExampleStokesV/constant/transportProperties
index 3633e43efb93a3465f8dd8f82d7406b15a32b058..019225dd4f128332aeb280c0f517ff2f87dfa827 100644
--- a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/transportProperties
+++ b/integration/OpenCFD/testCases/waveExampleStokesV/constant/transportProperties
@@ -1,8 +1,8 @@
/*---------------------------------------------------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.3 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: plus |
+| \\ / A nd | Web: http://www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/turbulenceProperties b/integration/OpenCFD/testCases/waveExampleStokesV/constant/turbulenceProperties
similarity index 85%
rename from integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/turbulenceProperties
rename to integration/OpenCFD/testCases/waveExampleStokesV/constant/turbulenceProperties
index 22f11ecab7ade8a69a3349000da8d304bdde6b61..e4ad75d18c58796a41b783918420c965ae86fd6a 100644
--- a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/constant/turbulenceProperties
+++ b/integration/OpenCFD/testCases/waveExampleStokesV/constant/turbulenceProperties
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.6 |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / O peration | Version: plus |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/IHWavesDict b/integration/OpenCFD/testCases/waveExampleStokesV/constant/waveProperties
similarity index 58%
rename from integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/IHWavesDict
rename to integration/OpenCFD/testCases/waveExampleStokesV/constant/waveProperties
index b516fa1b24aa24465fcb33c2cd1f3dae670c05ec..9192fe116177fd6eccf05dcc12d0a313455ac1aa 100644
--- a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/IHWavesDict
+++ b/integration/OpenCFD/testCases/waveExampleStokesV/constant/waveProperties
@@ -1,8 +1,8 @@
/*---------------------------------------------------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 1.3 |
-| \\ / A nd | Web: http://www.openfoam.org |
+| \\ / O peration | Version: plus |
+| \\ / A nd | Web: http://www.openfoam.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -11,24 +11,37 @@ FoamFile
format ascii;
class dictionary;
location "constant";
- object IHWavesDict;
+ object wavesProperties;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-waveType regular;
+inlet
+{
+ alpha alpha.water;
+
+ waveModel StokesV;
+
+ nPaddle 1;
+
+ waveHeight 0.1;
-waveTheory Cnoidal;
+ waveAngle 0.0;
-genAbs 1;
+ rampTime 4.0;
-nPaddles 1;
+ activeAbsorption yes;
-waveHeight 0.1;
+ wavePeriod 2.0;
+}
+
+outlet
+{
+ alpha alpha.water;
-wavePeriod 4.0;
+ waveModel shallowWaterAbsorption;
-waveDir 0.0;
+ nPaddle 1;
+}
-tSmooth 6.0;
// ************************************************************************* //
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/polyMesh/blockMeshDict b/integration/OpenCFD/testCases/waveExampleStokesV/system/blockMeshDict
similarity index 90%
rename from integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/polyMesh/blockMeshDict
rename to integration/OpenCFD/testCases/waveExampleStokesV/system/blockMeshDict
index bf8e28910c1b84e9314c5848045ad50d4e82c025..6f5bedb3be5c14dffae1c7abd62f8f250f040973 100644
--- a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/constant/polyMesh/blockMeshDict
+++ b/integration/OpenCFD/testCases/waveExampleStokesV/system/blockMeshDict
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.1.0 |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / O peration | Version: plus |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -46,7 +46,7 @@ boundary
(
(0 4 7 3)
);
- }
+ }
outlet
{
type patch;
diff --git a/integration/OpenCFD/testCases/waveExampleStokesV/system/controlDict b/integration/OpenCFD/testCases/waveExampleStokesV/system/controlDict
new file mode 100644
index 0000000000000000000000000000000000000000..c45cdd924de0dfec19be1bfc1aa03e91247410e8
--- /dev/null
+++ b/integration/OpenCFD/testCases/waveExampleStokesV/system/controlDict
@@ -0,0 +1,150 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| ========= | |
+| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
+| \\ / O peration | Version: plus |
+| \\ / A nd | Web: www.OpenFOAM.com |
+| \\/ M anipulation | |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+ version 2.0;
+ format ascii;
+ class dictionary;
+ location "system";
+ object controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+libs
+(
+ "libwaveBCs.so"
+ "libwaveModels.so"
+);
+
+application interFoam;
+
+startFrom latestTime;
+
+startTime 0;
+
+stopAt endTime;
+
+endTime 30.0;
+
+deltaT 0.01;
+
+writeControl adjustableRunTime;
+
+writeInterval 0.033;
+
+purgeWrite 0;
+
+writeFormat ascii;
+
+writePrecision 6;
+
+writeCompression uncompressed;
+
+timeFormat general;
+
+timePrecision 6;
+
+runTimeModifiable yes;
+
+adjustTimeStep on;
+
+maxCo 0.65;
+maxAlphaCo 0.65;
+
+maxDeltaT 0.05;
+
+functions
+{
+ line
+ {
+ type sets;
+ libs ("libsampling.so");
+ enabled true;
+ writeControl writeTime;
+ writeInterval 1;
+
+ interpolationScheme cellPoint;
+ setFormat raw;
+ sets
+ (
+ line1
+ {
+ type uniform;
+ axis distance;
+ start ( 1.0 0.005 0.0 );
+ end ( 1.0 0.005 0.8 );
+ nPoints 1001;
+ }
+ line2
+ {
+ type uniform;
+ axis distance;
+ start ( 2.0 0.005 0.0 );
+ end ( 2.0 0.005 0.8 );
+ nPoints 1001;
+ }
+ line3
+ {
+ type uniform;
+ axis distance;
+ start ( 3.0 0.005 0.0 );
+ end ( 3.0 0.005 0.8 );
+ nPoints 1001;
+ }
+ line4
+ {
+ type uniform;
+ axis distance;
+ start ( 4.0 0.005 0.0 );
+ end ( 4.0 0.005 0.8 );
+ nPoints 1001;
+ }
+ line5
+ {
+ type uniform;
+ axis distance;
+ start ( 5 0.005 0.0 );
+ end ( 5 0.005 0.8 );
+ nPoints 1001;
+ }
+
+ line6
+ {
+ type uniform;
+ axis distance;
+ start ( 7.0 0.005 0.0 );
+ end ( 7.0 0.005 0.8 );
+ nPoints 1001;
+ }
+ line7
+ {
+ type uniform;
+ axis distance;
+ start ( 8.0 0.005 0.0 );
+ end ( 8.0 0.005 0.8 );
+ nPoints 1001;
+ }
+ line8
+ {
+ type uniform;
+ axis distance;
+ start ( 9.0 0.005 0.0 );
+ end ( 9.0 0.005 0.8 );
+ nPoints 1001;
+ }
+ );
+ fixedLocations false;
+ fields
+ (
+ U alpha.water
+ );
+ }
+}
+
+
+// ************************************************************************* //
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/decomposeParDict b/integration/OpenCFD/testCases/waveExampleStokesV/system/decomposeParDict
similarity index 85%
rename from integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/decomposeParDict
rename to integration/OpenCFD/testCases/waveExampleStokesV/system/decomposeParDict
index 12fa0de349bc862e0e68cf821f3e538c5fd979aa..e0b4d2df3ee9fc7d5351aa43500d99128e59bb8d 100644
--- a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/decomposeParDict
+++ b/integration/OpenCFD/testCases/waveExampleStokesV/system/decomposeParDict
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.1.0 |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / O peration | Version: plus |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/fvSchemes b/integration/OpenCFD/testCases/waveExampleStokesV/system/fvSchemes
similarity index 86%
rename from integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/fvSchemes
rename to integration/OpenCFD/testCases/waveExampleStokesV/system/fvSchemes
index 391aa981dbeba74b56d456033d6d81105b61efdd..c0cddb6d0e0524e159b0a2e4adf0dfd993aa8e1e 100644
--- a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/fvSchemes
+++ b/integration/OpenCFD/testCases/waveExampleStokesV/system/fvSchemes
@@ -2,8 +2,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.1.0 |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / O peration | Version: plus |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -28,10 +28,9 @@ gradSchemes
divSchemes
{
- //div(rho*phi,U) Gauss limitedLinearV 1;
div(rhoPhi,U) Gauss linearUpwind grad(U);
div(phi,alpha) Gauss vanLeer;
- div(phirb,alpha) Gauss interfaceCompression;
+ div(phirb,alpha) Gauss linear;
div(phi,k) Gauss upwind;
div(phi,epsilon) Gauss upwind;
div(phi,omega) Gauss upwind;
diff --git a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/fvSolution b/integration/OpenCFD/testCases/waveExampleStokesV/system/fvSolution
similarity index 91%
rename from integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/fvSolution
rename to integration/OpenCFD/testCases/waveExampleStokesV/system/fvSolution
index 7f86a739eedd3cb133565881ee4a7c1cd4d295d8..bb74b12427b885890cc7d60dcaf4afaffe9391ea 100644
--- a/integration/04-waveFlume_stokesV_h0.1m_4cmX1cm/system/fvSolution
+++ b/integration/OpenCFD/testCases/waveExampleStokesV/system/fvSolution
@@ -2,8 +2,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.1.0 |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / O peration | Version: plus |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
@@ -95,9 +95,6 @@ PIMPLE
momentumPredictor no;
nCorrectors 3;
nNonOrthogonalCorrectors 0;
- nAlphaCorr 1;
- nAlphaSubCycles 4;
- cAlpha 2;
}
diff --git a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/setFieldsDict b/integration/OpenCFD/testCases/waveExampleStokesV/system/setFieldsDict
similarity index 86%
rename from integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/setFieldsDict
rename to integration/OpenCFD/testCases/waveExampleStokesV/system/setFieldsDict
index 248ecb39e947c274e8495c0dac18c0d8b04061b2..ea8c0c2ee3d3cf7ae93d722c29636471c906a776 100644
--- a/integration/02-waveFlume_cnoidal_h0.1m_4cmX1cm/system/setFieldsDict
+++ b/integration/OpenCFD/testCases/waveExampleStokesV/system/setFieldsDict
@@ -1,8 +1,8 @@
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
-| \\ / O peration | Version: 2.1.0 |
-| \\ / A nd | Web: www.OpenFOAM.org |
+| \\ / O peration | Version: plus |
+| \\ / A nd | Web: www.OpenFOAM.com |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile