Merge CPC

mikaem · Feb 18, 2014 · 3be4705 · 3be4705
2 parents 8324334 + 1ac1f6c
commit 3be4705
Show file tree

Hide file tree

Showing 15 changed files with 72 additions and 614 deletions.
diff --git a/NSfracStep.py b/NSfracStep.py
@@ -328,8 +328,6 @@
     for ci in scalar_components:
         x_1[ci].zero(); x_1[ci].axpy(1., x_[ci])
 
-    x_1['p'].zero(); x_1['p'].axpy(1.0, x_ ['p'])
-
     # Print some information
     if tstep % print_intermediate_info == 0:
         info_green('Time = {0:2.4e}, timestep = {1:6d}, End time = {2:2.4e}'.format(t, tstep, T)) 

diff --git a/problems/Aneurysm.py b/problems/Aneurysm.py
diff --git a/problems/Channel.py b/problems/Channel.py
@@ -53,9 +53,9 @@ def mesh(Nx, Ny, Nz, Lx, Ly, Lz, **params):
     NS_parameters.update(
         update_statistics = 10,
         save_statistics = 100,
-        check_flux = 100,
+        check_flux = 10,
         checkpoint = 100,
-        save_step = 10,
+        save_step = 100,
         nu = nu,
         Re_tau = Re_tau,
         T = T,

diff --git a/problems/ChannelScalar.py b/problems/ChannelScalar.py