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

fixes for Efield after renaming LM to LMeX #283

Merged
merged 3 commits into from
Oct 16, 2023
Merged

fixes for Efield after renaming LM to LMeX #283

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a85f73f
fixes for Efield after renaming LM to LMeX
baperry2 Oct 13, 2023
a411767
fix compiling with Efield+EB
baperry2 Oct 16, 2023
24c0275
don't allow Efield + EB compiling because it is not yet supported
baperry2 Oct 16, 2023
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 Exec/Efield/FlameSheetIons/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# AMReX
DIM = 2
COMP = clang
COMP = gnu
PRECISION = DOUBLE
USE_EB = FALSE
USE_HYPRE = FALSE
Expand Down
4 changes: 2 additions & 2 deletions Exec/Efield/FlameSheetIons/pelelmex_prob.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
#include <PMF.H>
#include <PMFData.H>
#include <PelePhysics.H>
#include <EOS_Extension.H>
#include <PeleLMEF_Constants.H>
#include <PeleLMeX_EOS_Extension.H>
#include <PeleLMeX_EF_Constants.H>

AMREX_GPU_DEVICE
AMREX_FORCE_INLINE
Expand Down
2 changes: 1 addition & 1 deletion Exec/Efield/IonizedAirWave/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# AMReX
DIM = 2
COMP = clang
COMP = gnu
PRECISION = DOUBLE
USE_EB = FALSE
USE_HYPRE = FALSE
Expand Down
4 changes: 2 additions & 2 deletions Source/Efield/PeleLMeX_EFDeriveFunc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <PeleLMeX_DeriveFunc.H>
#include <PeleLMEF_Constants.H>
#include <PeleLMeX_EF_Constants.H>
#include <PeleLMeX_Index.H>
#include <PelePhysics.H>
#include <EOS_Extension.H>
#include <PeleLMeX_EOS_Extension.H>
#include <mechanism.H>

using namespace amrex;
Expand Down
2 changes: 1 addition & 1 deletion Source/Efield/PeleLMeX_EFIonDrift.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <PeleLMeX.H>
#include <PeleLMeX_K.H>
#include <PeleLMEF_Constants.H>
#include <PeleLMeX_EF_Constants.H>
#include <AMReX_FillPatchUtil.H>
#include <PeleLMeX_BCfill.H>

Expand Down
2 changes: 1 addition & 1 deletion Source/Efield/PeleLMeX_EFNLSolve.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <PeleLMeX.H>
#include <PeleLMeX_K.H>
#include <PeleLMEF_K.H>
#include <PeleLMeX_EF_K.H>
#include <MLGMRES.H>
#include <PeleLMeX_DiffusionOp.H>
#include <PeleLMeX_Utils.H>
Expand Down
2 changes: 1 addition & 1 deletion Source/Efield/PeleLMeX_EFPoisson.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <PeleLMeX.H>
#include <PeleLMeX_K.H>
#include <PeleLMEF_Constants.H>
#include <PeleLMeX_EF_Constants.H>
#include <PeleLMeX_DiffusionOp.H>

using namespace amrex;
Expand Down
2 changes: 1 addition & 1 deletion Source/Efield/PeleLMeX_EFReactions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <PeleLMeX.H>
#include <PeleLMEF_K.H>
#include <PeleLMeX_EF_K.H>

using namespace amrex;

Expand Down
2 changes: 1 addition & 1 deletion Source/Efield/PeleLMeX_EFTransport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <PeleLMeX.H>
#include <PeleLMEF_K.H>
#include <PeleLMeX_EF_K.H>

using namespace amrex;

Expand Down
2 changes: 1 addition & 1 deletion Source/Efield/PeleLMeX_EFUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <PeleLMeX.H>
#include <PeleLMeX_K.H>
#include <PeleLMEF_K.H>
#include <PeleLMeX_EF_K.H>
#include <PeleLMeX_BCfill.H>
#include <AMReX_FillPatchUtil.H>

Expand Down
4 changes: 2 additions & 2 deletions Source/Efield/PeleLMeX_EF_K.H
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#ifndef PeleLMEF_K_H
#define PeleLMEF_K_H

#include <PeleLMEF_Constants.H>
#include <PeleLMeX_EF_Constants.H>
#include <PelePhysics.H>
#include <AMReX_Slopes_K.H>
#include <EOS_Extension.H>
#include <PeleLMeX_EOS_Extension.H>
#include <mechanism.H>

AMREX_GPU_HOST_DEVICE
Expand Down
2 changes: 1 addition & 1 deletion Source/PeleLMeX.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1415,7 +1415,7 @@ public:
//-----------------------------------------------------------------------------

#ifdef PELE_USE_EFIELD
#include <PeleLMEF.H>
#include <PeleLMeX_EF.H>
//-----------------------------------------------------------------------------
// EFIELD

Expand Down
2 changes: 1 addition & 1 deletion Source/PeleLMeX_DeriveFunc.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ void pelelmex_deruserdef(
int level);

#ifdef PELE_USE_EFIELD
#include <PeleLMEFDeriveFunc.H>
#include <PeleLMeX_EFDeriveFunc.H>
#endif

#endif
2 changes: 1 addition & 1 deletion Source/PeleLMeX_Reactions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include <PeleLMeX.H>
#include <PeleLMeX_K.H>
#ifdef PELE_USE_EFIELD
#include <PeleLMEF_Constants.H>
#include <PeleLMeX_EF_Constants.H>
#endif

using namespace amrex;
Expand Down
2 changes: 1 addition & 1 deletion Source/PeleLMeX_Setup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "PelePhysics.H"
#include <AMReX_buildInfo.H>
#ifdef PELE_USE_EFIELD
#include "EOS_Extension.H"
#include "PeleLMeX_EOS_Extension.H"
#endif

#ifdef AMREX_USE_GPU
Expand Down
2 changes: 1 addition & 1 deletion Source/PeleLMeX_TransportProp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <pelelmex_prob.H>
#include <PeleLMeX_DiffusionOp.H>
#ifdef PELE_USE_EFIELD
#include <PeleLMEF_K.H>
#include <PeleLMeX_EF_K.H>
#endif

using namespace amrex;
Expand Down
2 changes: 1 addition & 1 deletion Source/PeleLMeX_Utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <hydro_utils.H>
#include <memory>
#ifdef PELE_USE_EFIELD
#include <PeleLMEF_Constants.H>
#include <PeleLMeX_EF_Constants.H>
#endif

using namespace amrex;
Expand Down
Loading