Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do includes/libraries based more off a traditional installation #56

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −19
Draft

Do includes/libraries based more off a traditional installation #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/equation_systems/equation_system.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include "../common/pfem_extras.hpp"
#include "mfem/miniapps/common/pfem_extras.hpp"
#include "boundary_conditions.h"
#include "MFEMContainers.h"
#include "MFEMKernel.h"
Expand Down
2 changes: 1 addition & 1 deletion include/integrators/ScaleIntegrator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once
#include "MFEMGeneralUserObject.h"
#include "../common/pfem_extras.hpp"
#include "mfem/miniapps/common/pfem_extras.hpp"

namespace platypus
{
Expand Down
8 changes: 4 additions & 4 deletions include/problem/MFEMProblem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once
#include <map>
#include "../common/pfem_extras.hpp"
#include "mfem/miniapps/common/pfem_extras.hpp"
#include "ExternalProblem.h"
#include "MFEMProblemData.h"
#include "MFEMMesh.h"
Expand All @@ -24,12 +24,12 @@ class MFEMProblem : public ExternalProblem
static InputParameters validParams();

MFEMProblem(const InputParameters & params);
virtual ~MFEMProblem(){};
virtual ~MFEMProblem() {};

virtual void initialSetup() override;
virtual void externalSolve() override{};
virtual void externalSolve() override {};
virtual bool nlConverged(const unsigned int nl_sys_num) override { return true; };
virtual void syncSolutions(Direction direction) override{};
virtual void syncSolutions(Direction direction) override {};

/**
* Overwritten mesh() method from base MooseMesh to retrieve the correct mesh type, in this case
Expand Down
4 changes: 2 additions & 2 deletions include/problem_operators/problem_operator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include "../common/pfem_extras.hpp"
#include "mfem/miniapps/common/pfem_extras.hpp"
#include "MFEMProblemData.h"
#include "problem_operator_interface.h"

Expand All @@ -18,4 +18,4 @@ class ProblemOperator : public mfem::Operator, public ProblemOperatorInterface
void Mult(const mfem::Vector & x, mfem::Vector & y) const override {}
};

} // namespace platypus
} // namespace platypus
4 changes: 2 additions & 2 deletions include/problem_operators/time_domain_equation_system_problem_operator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include "../common/pfem_extras.hpp"
#include "mfem/miniapps/common/pfem_extras.hpp"
#include "time_domain_problem_operator.h"
#include "problem_operator_interface.h"
#include "equation_system_interface.h"
Expand Down Expand Up @@ -42,4 +42,4 @@ class TimeDomainEquationSystemProblemOperator : public TimeDomainProblemOperator
std::shared_ptr<platypus::TimeDependentEquationSystem> _equation_system{nullptr};
};

} // namespace platypus
} // namespace platypus
4 changes: 2 additions & 2 deletions include/problem_operators/time_domain_problem_operator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include "../common/pfem_extras.hpp"
#include "mfem/miniapps/common/pfem_extras.hpp"
#include "MFEMProblemData.h"
#include "problem_operator_interface.h"

Expand All @@ -21,4 +21,4 @@ class TimeDomainProblemOperator : public mfem::TimeDependentOperator,
void ImplicitSolve(const double dt, const mfem::Vector & X, mfem::Vector & dX_dt) override {}
};

} // namespace platypus
} // namespace platypus
12 changes: 6 additions & 6 deletions platypus.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
MFEM_DIR :=$(APPLICATION_DIR)/../mfem/build
MFEM_DIR ?=$(APPLICATION_DIR)/../mfem/build
MFEM_INC_DIR ?=$(MFEM_DIR)/include

include $(MFEM_DIR)/config/config.mk
MFEM_INCLUDES := -I$(MFEM_INC_DIR)/config -I$(MFEM_DIR)/ -I$(MFEM_DIR)/../miniapps/common $(MFEM_INCFLAGS)
MFEM_LIBS := -L$(MFEM_DIR) -lmfem -lrt -L$(MFEM_DIR)/miniapps/common -lmfem-common $(MFEM_LIB)
MFEM_INCLUDES := -I$(MFEM_DIR)/include
MFEM_LIBS := -Wl,-rpath,$(MFEM_DIR)/lib -L$(MFEM_DIR)/lib -lmfem -lrt -lmfem-common

ADDITIONAL_INCLUDES += $(MFEM_INCLUDES)
ADDITIONAL_LIBS += -Wl, $(MFEM_LIBS) ${MFEM_EXT_LIBS}
ADDITIONAL_LIBS += $(MFEM_LIBS) ${MFEM_EXT_LIBS}

$(info ADDITIONAL_INCLUDES = $(ADDITIONAL_INCLUDES));
$(info ADDITIONAL_LIBS = $(ADDITIONAL_LIBS));
$(info ADDITIONAL_LIBS = $(ADDITIONAL_LIBS));
2 changes: 1 addition & 1 deletion src/bcs/MFEMBoundaryCondition.C
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include "MFEMBoundaryCondition.h"
#include "mesh_extras.hpp"
#include "mfem/miniapps/common/mesh_extras.hpp"

InputParameters
MFEMBoundaryCondition::validParams()
Expand Down
Loading