diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 74190653f3ff13b2338c9abd22c3d59a22e4b93f..5ed7938368c15eb39c2b08487ca8da3b831da34e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -56,8 +56,8 @@ run_giraffe_serial_job: script: - cd examples/integration_example - rm -f *sch integration_example_serial.stdout - - ../../giraffe-opt -i coefficient_integration.i > integration_example_serial.stdout - - tail -n1000 integration_example_serial.stdout + - ../../giraffe-opt -i coefficient_integration.i | tee integration_example_serial.stdout + - exit $? verify_giraffe_serial_job: stage: verify_giraffe_serial @@ -88,8 +88,8 @@ run_giraffe_parallel_job: script: - cd examples/integration_example - rm -f *sch integration_example_parallel.stdout - - mpirun -np 4 ../../giraffe-opt -i coefficient_integration.i > integration_example_parallel.stdout - - tail -n1000 integration_example_parallel.stdout + - mpirun -np 4 ../../giraffe-opt -i coefficient_integration.i | tee integration_example_parallel.stdout + - exit $? verify_giraffe_parallel_job: stage: verify_giraffe_parallel diff --git a/Nek5000/core/connect2.f b/Nek5000/core/connect2.f index 1563ed835e3e37c88114ca2eb28e60e00fea16c5..4120b7fa714bbdd75db087312c8c5830f3945f6b 100644 --- a/Nek5000/core/connect2.f +++ b/Nek5000/core/connect2.f @@ -320,7 +320,7 @@ C IFCYCLIC = .false. IFSYNC = .false. IFEXPLVIS = .false. - IFSCHCLOB = .false. + IFSCHCLOB = .true. c IFSPLIT = .false. IFCMT = .false. IFVISC = .false. diff --git a/examples/integration_example/coefficient_integration.i b/examples/integration_example/coefficient_integration.i index ab9bbe1d3d60bb7d5bb6e13455e3c9516cc979d7..2c99367ebccc5bc91bcdb52b5cd430bb43e036b3 100644 --- a/examples/integration_example/coefficient_integration.i +++ b/examples/integration_example/coefficient_integration.i @@ -818,7 +818,7 @@ scheme = 'Explicit-Euler' # Others available: backward Euler, Crank-Nicholson, etc. dt = 0.001 # Initial timestep size start_time = 0 # Starting time - num_steps = 1501 # Number of Steps + num_steps = 50 # Number of Steps nl_rel_tol = 1e-6 # Nonlinear relative tolerance l_tol = 1e-6 # Linear tolerance diff --git a/examples/integration_example/integration_example.rea b/examples/integration_example/integration_example.rea index 16aea8a169ea238a1256d1127a2037de65744637..507626ecf85f05a82b897d76a09452cf90552f89 100644 --- a/examples/integration_example/integration_example.rea +++ b/examples/integration_example/integration_example.rea @@ -12,7 +12,7 @@ 1.00000 p008 CONDUCT 0.00000 p009 0.00000 p010 FINTIME - 5000.000 p011 NSTEPS + 50.000 p011 NSTEPS -0.00100 p012 DT 0.00000 p013 IOCOMM 0.00000 p014 IOTIME diff --git a/include/userobjects/NekSideIntegralVariableUserObject.h b/include/userobjects/NekSideIntegralVariableUserObject.h index bba1d2fdb149c7a7dede98c1d95c66900f2365e4..5c2e38c4a63cccdfc0530154f3c07b4a05e1b063 100644 --- a/include/userobjects/NekSideIntegralVariableUserObject.h +++ b/include/userobjects/NekSideIntegralVariableUserObject.h @@ -31,7 +31,7 @@ InputParameters validParams(); */ class NekSideIntegralVariableUserObject : public SideIntegralUserObject, - public MooseVariableInterface + public MooseVariableInterface { public: NekSideIntegralVariableUserObject(const InputParameters & parameters); @@ -39,7 +39,7 @@ public: protected: virtual Real computeQpIntegral() override; virtual void finalize() override; - + /// Holds the solution at current quadrature points const VariableValue & _u; /// Legendre polynomial object. TODO address dynamic casting of this object diff --git a/src/userobjects/NekSideIntegralVariableUserObject.C b/src/userobjects/NekSideIntegralVariableUserObject.C index 98fabaf5eea45e9daba9c79c0acc8652fd225729..9227b5ad11311c405678838bb21fed2eb4b9455b 100644 --- a/src/userobjects/NekSideIntegralVariableUserObject.C +++ b/src/userobjects/NekSideIntegralVariableUserObject.C @@ -38,7 +38,7 @@ NekSideIntegralVariableUserObject::NekSideIntegralVariableUserObject(const Input // TODO we really shouldn't have to dynamic cast into FourierPolynomial and Legendre Polynomial here // but this was a quick example SideIntegralUserObject(parameters), - MooseVariableInterface(this, false), + MooseVariableInterface(this, false), _u(coupledValue("variable")), _legendre_poly_function(dynamic_cast(_mci_feproblem.getFunction(parameters.get("legendre_function_name")))), _fourier_poly_function(dynamic_cast(_mci_feproblem.getFunction(parameters.get("fourier_function_name")))), @@ -49,7 +49,7 @@ NekSideIntegralVariableUserObject::NekSideIntegralVariableUserObject(const Input _coupled_grad(coupledGradient("variable")), _diffusion_coefficient(getMaterialProperty("diffusion_coefficient_name")), _surface_area_pp(getPostprocessorValueByName(parameters.get("surface_area_pp"))) - + { addMooseVariableDependency(mooseVariable()); @@ -64,8 +64,8 @@ NekSideIntegralVariableUserObject::NekSideIntegralVariableUserObject(const Input { mooseError("Need to implement logic for l direction not equal to 2"); } - - + + } Real