Merge with CPC and removing conflicts

problems/DrivenCavity.py

@@ -25,16 +25,6 @@ def mesh(Nx, Ny, **params):
     print_intermediate_info = 100,
     use_krylov_solvers = True)
 
-<<<<<<< HEAD
-def pre_solve_hook(mesh, velocity_degree, constrained_domain, **NS_namespace):    
-    # Declare a Function used for plotting in temporal_hook
-    Vv = VectorFunctionSpace(mesh, 'CG', velocity_degree, constrained_domain=constrained_domain)
-    return dict(uv=Function(Vv), Vv=Vv)
-
-noslip = "std::abs(x[0]*x[1]*(1-x[0]))<1e-8"
-lid    = "std::abs(x[1]-1) < 1e-8"
-=======
->>>>>>> CPC
 # Specify boundary conditions
 noslip = "std::abs(x[0]*x[1]*(1-x[0]))<1e-8"
 top    = "std::abs(x[1]-1) < 1e-8"
@@ -67,11 +57,7 @@ def theend_hook(u_, p_, uv, Vv, **NS_namespace):
     plot(p_, title='Pressure')
 
     try:
-<<<<<<< HEAD
         from fenicstools import StreamFunction
-=======
-        from fenicstools.Streamfunctions import StreamFunction
->>>>>>> CPC
         psi = StreamFunction(u_, [], use_strong_bc=True)
         plot(psi, title='Streamfunction', interactive=True)
     except:

problems/TaylorGreen2D.py

@@ -12,11 +12,6 @@
     dt = 0.001,
     Nx = 20, Ny = 20,
     folder = "taylorgreen2D_results",
-<<<<<<< HEAD
-=======
-    max_iter = 1,
-    iters_on_first_timestep = 2,
->>>>>>> CPC
     plot_interval = 1000,
     save_step = 10000,
     checkpoint = 10000,
@@ -106,12 +101,8 @@ def temporal_hook(q_, t, nu, VV, dt, plot_interval, initial_fields, tstep, sys_c
             error = norm(ue.vector())/uen
             err[ui] = "{0:2.6e}".format(norm(ue.vector()))
             total_error[i] += error*dt     
-<<<<<<< HEAD
         if MPI.process_number() == 0:
             print "Error is ", err, " at time = ", t 
-=======
-        print "Error is ", err, " at time = ", t 
->>>>>>> CPC
 
 def theend_hook(mesh, q_, t, dt, nu, VV, sys_comp, initial_fields, **NS_namespace):
     final_error = zeros(len(sys_comp))