diff --git a/ProcessLib/GroundwaterFlow/CreateGroundwaterFlowProcess.cpp b/ProcessLib/GroundwaterFlow/CreateGroundwaterFlowProcess.cpp index fa16d1ac0e7ef0195a6c71ac8ff5bcca4299aba0..f862ea3e98336693850b734eb4a4de1a89707f56 100644 --- a/ProcessLib/GroundwaterFlow/CreateGroundwaterFlowProcess.cpp +++ b/ProcessLib/GroundwaterFlow/CreateGroundwaterFlowProcess.cpp @@ -57,9 +57,9 @@ std::unique_ptr<Process> createGroundwaterFlowProcess( named_function_caller); return std::unique_ptr<Process>{new GroundwaterFlowProcess{ - mesh, parameters, std::move(jacobian_assembler), std::move(process_variables), - std::move(process_data), std::move(secondary_variables), - std::move(named_function_caller)}}; + mesh, std::move(jacobian_assembler), parameters, + std::move(process_variables), std::move(process_data), + std::move(secondary_variables), std::move(named_function_caller)}}; } } // namespace GroundwaterFlow diff --git a/ProcessLib/GroundwaterFlow/GroundwaterFlowFEM.h b/ProcessLib/GroundwaterFlow/GroundwaterFlowFEM.h index f253ac48409d336bec34df9df1577a420b0568ce..329dcd34d37ff0f17c00da39a84a295fb16ab3ed 100644 --- a/ProcessLib/GroundwaterFlow/GroundwaterFlowFEM.h +++ b/ProcessLib/GroundwaterFlow/GroundwaterFlowFEM.h @@ -68,12 +68,12 @@ public: std::size_t const /*local_matrix_size*/, unsigned const integration_order, GroundwaterFlowProcessData const& process_data) - : _element(element) - , _shape_matrices( - initShapeMatrices<ShapeFunction, ShapeMatricesType, IntegrationMethod, GlobalDim>( - element, integration_order)) - , _process_data(process_data) + : _element(element), + _process_data(process_data), _integration_method(integration_order), + _shape_matrices(initShapeMatrices<ShapeFunction, ShapeMatricesType, + IntegrationMethod, GlobalDim>( + element, _integration_method)) { } diff --git a/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.cpp b/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.cpp index 6df4065d2f4b09c45a92379215521b2f247af788..0583b89c2133f2353b429dea22fff740ee194d4d 100644 --- a/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.cpp +++ b/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.cpp @@ -24,11 +24,10 @@ GroundwaterFlowProcess::GroundwaterFlowProcess( std::vector<std::reference_wrapper<ProcessVariable>>&& process_variables, GroundwaterFlowProcessData&& process_data, SecondaryVariableCollection&& secondary_variables, - ProcessOutput&& process_output, NumLib::NamedFunctionCaller&& named_function_caller) : Process(mesh, std::move(jacobian_assembler), parameters, std::move(process_variables), std::move(secondary_variables), - std::move(process_output), std::move(named_function_caller)), + std::move(named_function_caller)), _process_data(std::move(process_data)) { } @@ -83,6 +82,9 @@ void GroundwaterFlowProcess::assembleWithJacobianConcreteProcess( const double dxdot_dx, const double dx_dx, GlobalMatrix& M, GlobalMatrix& K, GlobalVector& b, GlobalMatrix& Jac) { + DBUG("AssembleWithJacobian GroundwaterFlowProcess."); + + // Call global assembler for each local assembly item. GlobalExecutor::executeMemberDereferenced( _global_assembler, &VectorMatrixAssembler::assembleWithJacobian, _local_assemblers, *_local_to_global_index_map, t, x, xdot, dxdot_dx,