Merge branch 'morphLBM' of github.com:JamesEMcClure/LBPM-WIA into morphLBM

example/Bubble/input.db

@@ -7,15 +7,7 @@ Color {
     beta  = 0.95;
     F = 0, 0, 0
     Restart = false
-    pBC = 0
-    din = 1.0
-    dout = 1.0
-    flux = 1.0e-3
     timestepMax = 200
-    interval = 1000
-    tol = 1e-5;
-    das = 0.1
-    dbs = 0.9
     ComponentLabels = 0, 1, 2
     ComponentAffinity = -1.0, 1.0, -1.0
 }

example/Piston/Color.in

@@ -1,6 +0,0 @@
-1.0 1.0
-1.0 1.0
-1.0e-3 0.95
-0.0 0.0 0.0
-0 4 10.0 1.0
-10000 2000 1e-5

example/Piston/ComponentLabels.csv

@@ -1,3 +0,0 @@
-0 -0.5
-1 1.0
-2 -1.0

example/Piston/Domain.in

@@ -1,4 +0,0 @@
-1 1 10
-40 40 40
-229
-1.0 1.0 1.0

example/Piston/input.db

@@ -7,14 +7,7 @@ Color {
     beta  = 0.95;
     F = 0, 0, 0
     Restart = false
-    pBC = 0
-    din = 1.0
-    dout = 1.0
     timestepMax = 3000
-    interval = 1000
-    tol = 1e-5;
-    das = 0.1
-    dbs = 0.9
     flux = 2.0
     ComponentLabels = 0
     ComponentAffinity = -1.0;
@@ -25,7 +18,6 @@ Domain {
     nproc = 1, 1, 4     // Number of processors (Npx,Npy,Npz)
     n = 24, 24, 24      // Size of local domain (Nx,Ny,Nz)
     N = 24, 24, 96      // size of the input image
-    n_spheres = 1       // Number of spheres
     L = 1, 1, 1         // Length of domain (x,y,z)
     BC = 4              // Boundary condition type
     ReadType = "8bit"   

example/Plates/input.db

@@ -7,14 +7,7 @@ Color {
     beta  = 0.95;
     F = 0, 0, 0
     Restart = false
-    pBC = 0
-    din = 1.0
-    dout = 1.0
     timestepMax = 3000
-    interval = 1000
-    tol = 1e-5;
-    das = 0.1
-    dbs = 0.9
     flux = 0.0
     ComponentLabels = -2, -1
     ComponentAffinity = -1.0, -0.5;
@@ -25,7 +18,6 @@ Domain {
     nproc = 1, 1, 4     // Number of processors (Npx,Npy,Npz)
     n = 24, 24, 24      // Size of local domain (Nx,Ny,Nz)
     N = 24, 24, 96      // size of the input image
-    n_spheres = 1       // Number of spheres
     L = 1, 1, 1         // Length of domain (x,y,z)
     BC = 0              // Boundary condition type
     ReadType = "8bit"

example/Poiseuille/Domain.in

@@ -1,3 +0,0 @@
-1 1 1
-100 100 100
-1.0 1.0 1.0

example/Poiseuille/Permeability.in

@@ -1,4 +0,0 @@
-1.0
-0.0 0.0 1.0e-5
-0 0 1.0 1.0
-1000 1000 1.0e-5

example/Sph125/Domain.in

@@ -1,3 +0,0 @@
-2 2 2
-100 100 100
-1.0 1.0 1.0