From 14f7aa9f5e0803b68e8a0f41adeb79ccfbdeb10c Mon Sep 17 00:00:00 2001 From: Ron Rahaman Date: Tue, 30 Jan 2018 10:28:51 -0600 Subject: [PATCH 1/4] Testing shorter runs for CI --- examples/integration_example/coefficient_integration.i | 2 +- examples/integration_example/integration_example.rea | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/integration_example/coefficient_integration.i b/examples/integration_example/coefficient_integration.i index ab9bbe1..2c99367 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 16aea8a..507626e 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 -- GitLab From e115e61a681c8432e3f0dc552c3ab4c04c9a1003 Mon Sep 17 00:00:00 2001 From: Ron Rahaman Date: Tue, 30 Jan 2018 13:16:47 -0600 Subject: [PATCH 2/4] Fixes to .gitlab-ci.yml --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7419065..5ed7938 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 -- GitLab From 0660f704cc59c534f171ce511b55f39fcc2a8c99 Mon Sep 17 00:00:00 2001 From: Ron Rahaman Date: Fri, 2 Feb 2018 11:15:55 -0600 Subject: [PATCH 3/4] Nek ignores and clobbers existing *.sch file --- Nek5000/core/connect2.f | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Nek5000/core/connect2.f b/Nek5000/core/connect2.f index 1563ed8..4120b7f 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. -- GitLab From 3b56541c161d165262f132579f9ec18bc32b5766 Mon Sep 17 00:00:00 2001 From: Alex Lindsay Date: Tue, 20 Feb 2018 10:09:03 -0700 Subject: [PATCH 4/4] Updates to MooseVariableInterface and variable getter APIs to incorporate vector finite elements Needs to wait for https://github.com/idaholab/moose/pull/10238 --- include/userobjects/NekSideIntegralVariableUserObject.h | 4 ++-- src/userobjects/NekSideIntegralVariableUserObject.C | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/userobjects/NekSideIntegralVariableUserObject.h b/include/userobjects/NekSideIntegralVariableUserObject.h index bba1d2f..5c2e38c 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 98fabaf..9227b5a 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 -- GitLab