From a85f73fc867c87c9bc54b3d67046a7d5619ab599 Mon Sep 17 00:00:00 2001 From: Bruce Perry Date: Fri, 13 Oct 2023 11:09:52 -0600 Subject: [PATCH 1/3] fixes for Efield after renaming LM to LMeX --- Exec/Efield/FlameSheetIons/GNUmakefile | 2 +- Exec/Efield/FlameSheetIons/pelelmex_prob.H | 4 ++-- Exec/Efield/IonizedAirWave/GNUmakefile | 2 +- Source/Efield/PeleLMeX_EFDeriveFunc.cpp | 4 ++-- Source/Efield/PeleLMeX_EFIonDrift.cpp | 2 +- Source/Efield/PeleLMeX_EFNLSolve.cpp | 2 +- Source/Efield/PeleLMeX_EFPoisson.cpp | 2 +- Source/Efield/PeleLMeX_EFReactions.cpp | 2 +- Source/Efield/PeleLMeX_EFTransport.cpp | 2 +- Source/Efield/PeleLMeX_EFUtils.cpp | 2 +- Source/Efield/PeleLMeX_EF_K.H | 4 ++-- Source/PeleLMeX.H | 2 +- Source/PeleLMeX_DeriveFunc.H | 2 +- Source/PeleLMeX_Reactions.cpp | 2 +- Source/PeleLMeX_Setup.cpp | 2 +- Source/PeleLMeX_TransportProp.cpp | 2 +- Source/PeleLMeX_Utils.cpp | 2 +- 17 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Exec/Efield/FlameSheetIons/GNUmakefile b/Exec/Efield/FlameSheetIons/GNUmakefile index 38a9ef31..97de4f67 100644 --- a/Exec/Efield/FlameSheetIons/GNUmakefile +++ b/Exec/Efield/FlameSheetIons/GNUmakefile @@ -1,6 +1,6 @@ # AMReX DIM = 2 -COMP = clang +COMP = gnu PRECISION = DOUBLE USE_EB = FALSE USE_HYPRE = FALSE diff --git a/Exec/Efield/FlameSheetIons/pelelmex_prob.H b/Exec/Efield/FlameSheetIons/pelelmex_prob.H index 4a88fb4e..e570d603 100644 --- a/Exec/Efield/FlameSheetIons/pelelmex_prob.H +++ b/Exec/Efield/FlameSheetIons/pelelmex_prob.H @@ -10,8 +10,8 @@ #include #include #include -#include -#include +#include +#include AMREX_GPU_DEVICE AMREX_FORCE_INLINE diff --git a/Exec/Efield/IonizedAirWave/GNUmakefile b/Exec/Efield/IonizedAirWave/GNUmakefile index f729bcce..7314e254 100644 --- a/Exec/Efield/IonizedAirWave/GNUmakefile +++ b/Exec/Efield/IonizedAirWave/GNUmakefile @@ -1,6 +1,6 @@ # AMReX DIM = 2 -COMP = clang +COMP = gnu PRECISION = DOUBLE USE_EB = FALSE USE_HYPRE = FALSE diff --git a/Source/Efield/PeleLMeX_EFDeriveFunc.cpp b/Source/Efield/PeleLMeX_EFDeriveFunc.cpp index 41e398d8..1e98c10f 100644 --- a/Source/Efield/PeleLMeX_EFDeriveFunc.cpp +++ b/Source/Efield/PeleLMeX_EFDeriveFunc.cpp @@ -1,8 +1,8 @@ #include -#include +#include #include #include -#include +#include #include using namespace amrex; diff --git a/Source/Efield/PeleLMeX_EFIonDrift.cpp b/Source/Efield/PeleLMeX_EFIonDrift.cpp index 7cd26abd..2e805665 100644 --- a/Source/Efield/PeleLMeX_EFIonDrift.cpp +++ b/Source/Efield/PeleLMeX_EFIonDrift.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include diff --git a/Source/Efield/PeleLMeX_EFNLSolve.cpp b/Source/Efield/PeleLMeX_EFNLSolve.cpp index fae8930c..4b880d1d 100644 --- a/Source/Efield/PeleLMeX_EFNLSolve.cpp +++ b/Source/Efield/PeleLMeX_EFNLSolve.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include #include diff --git a/Source/Efield/PeleLMeX_EFPoisson.cpp b/Source/Efield/PeleLMeX_EFPoisson.cpp index 304de18e..f763f0da 100644 --- a/Source/Efield/PeleLMeX_EFPoisson.cpp +++ b/Source/Efield/PeleLMeX_EFPoisson.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include using namespace amrex; diff --git a/Source/Efield/PeleLMeX_EFReactions.cpp b/Source/Efield/PeleLMeX_EFReactions.cpp index da27b029..c0aa9e7a 100644 --- a/Source/Efield/PeleLMeX_EFReactions.cpp +++ b/Source/Efield/PeleLMeX_EFReactions.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace amrex; diff --git a/Source/Efield/PeleLMeX_EFTransport.cpp b/Source/Efield/PeleLMeX_EFTransport.cpp index 12f98c40..4a35479a 100644 --- a/Source/Efield/PeleLMeX_EFTransport.cpp +++ b/Source/Efield/PeleLMeX_EFTransport.cpp @@ -1,5 +1,5 @@ #include -#include +#include using namespace amrex; diff --git a/Source/Efield/PeleLMeX_EFUtils.cpp b/Source/Efield/PeleLMeX_EFUtils.cpp index 38ee0f35..3a7891a9 100644 --- a/Source/Efield/PeleLMeX_EFUtils.cpp +++ b/Source/Efield/PeleLMeX_EFUtils.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include diff --git a/Source/Efield/PeleLMeX_EF_K.H b/Source/Efield/PeleLMeX_EF_K.H index 0f709f9f..68ccac39 100644 --- a/Source/Efield/PeleLMeX_EF_K.H +++ b/Source/Efield/PeleLMeX_EF_K.H @@ -1,10 +1,10 @@ #ifndef PeleLMEF_K_H #define PeleLMEF_K_H -#include +#include #include #include -#include +#include #include AMREX_GPU_HOST_DEVICE diff --git a/Source/PeleLMeX.H b/Source/PeleLMeX.H index 2cc90cb8..8e19e323 100644 --- a/Source/PeleLMeX.H +++ b/Source/PeleLMeX.H @@ -1415,7 +1415,7 @@ public: //----------------------------------------------------------------------------- #ifdef PELE_USE_EFIELD -#include +#include //----------------------------------------------------------------------------- // EFIELD diff --git a/Source/PeleLMeX_DeriveFunc.H b/Source/PeleLMeX_DeriveFunc.H index d2a4d843..7d74421f 100644 --- a/Source/PeleLMeX_DeriveFunc.H +++ b/Source/PeleLMeX_DeriveFunc.H @@ -291,7 +291,7 @@ void pelelmex_deruserdef( int level); #ifdef PELE_USE_EFIELD -#include +#include #endif #endif diff --git a/Source/PeleLMeX_Reactions.cpp b/Source/PeleLMeX_Reactions.cpp index 1887f470..6ac639c6 100644 --- a/Source/PeleLMeX_Reactions.cpp +++ b/Source/PeleLMeX_Reactions.cpp @@ -1,7 +1,7 @@ #include #include #ifdef PELE_USE_EFIELD -#include +#include #endif using namespace amrex; diff --git a/Source/PeleLMeX_Setup.cpp b/Source/PeleLMeX_Setup.cpp index dc438aa1..2bfa31f6 100644 --- a/Source/PeleLMeX_Setup.cpp +++ b/Source/PeleLMeX_Setup.cpp @@ -4,7 +4,7 @@ #include "PelePhysics.H" #include #ifdef PELE_USE_EFIELD -#include "EOS_Extension.H" +#include "PeleLMeX_EOS_Extension.H" #endif #ifdef AMREX_USE_GPU diff --git a/Source/PeleLMeX_TransportProp.cpp b/Source/PeleLMeX_TransportProp.cpp index 5e328003..5cf4c5bc 100644 --- a/Source/PeleLMeX_TransportProp.cpp +++ b/Source/PeleLMeX_TransportProp.cpp @@ -3,7 +3,7 @@ #include #include #ifdef PELE_USE_EFIELD -#include +#include #endif using namespace amrex; diff --git a/Source/PeleLMeX_Utils.cpp b/Source/PeleLMeX_Utils.cpp index 106f1b16..24e4613f 100644 --- a/Source/PeleLMeX_Utils.cpp +++ b/Source/PeleLMeX_Utils.cpp @@ -4,7 +4,7 @@ #include #include #ifdef PELE_USE_EFIELD -#include +#include #endif using namespace amrex; From a411767d53f863a7819ca51cb4d7166527fdeb2b Mon Sep 17 00:00:00 2001 From: Bruce Perry Date: Mon, 16 Oct 2023 12:21:31 -0600 Subject: [PATCH 2/3] fix compiling with Efield+EB --- Source/Efield/PeleLMeX_EFNLSolve.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Source/Efield/PeleLMeX_EFNLSolve.cpp b/Source/Efield/PeleLMeX_EFNLSolve.cpp index 4b880d1d..7fffb018 100644 --- a/Source/Efield/PeleLMeX_EFNLSolve.cpp +++ b/Source/Efield/PeleLMeX_EFNLSolve.cpp @@ -700,8 +700,11 @@ PeleLM::getAdvectionFluxesMOL( bx, 1, mfi, nE_arr, AMREX_D_DECL(fx, fy, fz), AMREX_D_DECL(xstate, ystate, zstate), knownEdgeState, AMREX_D_DECL(ueff, veff, weff), divu_arr, force_arr, geom[lev], m_dt, - {bcrec}, bcRec_d.dataPtr(), AdvType_d.dataPtr(), 0, 0, is_velocity, - fluxes_are_area_weighted, mol); + {bcrec}, bcRec_d.dataPtr(), AdvType_d.dataPtr(), +#ifdef AMREX_USE_EB + EBFactory(lev), +#endif + 0, 0, is_velocity, fluxes_are_area_weighted, mol); } } } From 24c0275c89a684891bf70ff87d7d0c56b6dd610b Mon Sep 17 00:00:00 2001 From: Bruce Perry Date: Mon, 16 Oct 2023 12:22:41 -0600 Subject: [PATCH 3/3] don't allow Efield + EB compiling because it is not yet supported --- Source/Efield/PeleLMeX_EF.H | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Source/Efield/PeleLMeX_EF.H b/Source/Efield/PeleLMeX_EF.H index 1e217b5b..b6890601 100644 --- a/Source/Efield/PeleLMeX_EF.H +++ b/Source/Efield/PeleLMeX_EF.H @@ -1,5 +1,11 @@ // included in the PeleLM.H +// E-field with EB capability is not fully implemented +static_assert( + !(PELE_USE_EFIELD and AMREX_USE_EB), + "E-field with EB capability is not fully implemented; cannot compile with " + "both EFIELD and EB"); + // Algorithm int/real data holder int ef_verbose = 1; int ef_substep = 1; // number of sub time steps