make gnumake soot and spray work

.gitmodules

@@ -1,9 +1,6 @@
 [submodule "Submodules/PelePhysics"]
 	path = Submodules/PelePhysics
 	url = https://github.com/AMReX-Combustion/PelePhysics.git
-[submodule "Submodules/PeleMP"]
-	path = Submodules/PeleMP
-	url = https://github.com/AMReX-Combustion/PeleMP.git
 [submodule "Submodules/GoogleTest"]
 	path = Submodules/GoogleTest
 	url = https://github.com/google/googletest.git

Exec/Make.PeleC

@@ -2,7 +2,6 @@ PELEC_HOME        ?= ../
 PELE_PHYSICS_HOME ?= $(abspath $(lastword $(PELEC_HOME)/Submodules/PelePhysics))
 AMREX_HOME        ?= $(abspath $(lastword $(PELE_PHYSICS_HOME)/Submodules/amrex))
 SUNDIALS_HOME     ?= $(abspath $(lastword $(PELE_PHYSICS_HOME)/Submodules/sundials))
-PELEMP_HOME       ?= $(abspath $(lastword $(PELEC_HOME)/Submodules/PeleMP))
 
 EBASE = PeleC
 
@@ -121,26 +120,29 @@ Bdirs := $(PELEC_HOME)/Source $(PELEC_HOME)/Source/Params/param_includes
 
 Pdirs := Base Amr Boundary AmrCore EB
 
+# Spray
 ifeq ($(USE_PARTICLES), TRUE)
   Pdirs += Particle
   ifeq ($(shell test $(SPRAY_FUEL_NUM) -gt 0; echo $$?), 0)
     DEFINES+=-DPELEC_USE_SPRAY
     DEFINES+=-DSPRAY_FUEL_NUM=$(SPRAY_FUEL_NUM)
-    MPdirs := PP_Spray PP_Spray/Distribution
-    Bpack  += $(foreach dir, $(MPdirs), $(PELEMP_HOME)/Source/$(dir)/Make.package)
-    Blocs  += $(foreach dir, $(MPdirs), $(PELEMP_HOME)/Source/$(dir))
+    SPRAY_HOME = $(PELE_PHYSICS_HOME)/Source/Spray
+    Bpack += $(SPRAY_HOME)/Make.package $(SPRAY_HOME)/Distribution/Make.package $(SPRAY_HOME)/BreakupSplash/Make.package
+    Blocs += $(SPRAY_HOME) $(SPRAY_HOME)/Distribution $(SPRAY_HOME)/BreakupSplash
   endif
 endif
 
+# Soot
 ifeq ($(USE_SOOT), TRUE)
-# Ensure the number of soot moments is correct
-    ifeq (,$(filter $(NUM_SOOT_MOMENTS),3 6))
-        $(error NUM_SOOT_MOMENTS must be 3 or 6)
-    endif
+  # Ensure the number of soot moments is correct
+  ifeq (,$(filter $(NUM_SOOT_MOMENTS),3 6))
+    $(error NUM_SOOT_MOMENTS must be 3 or 6)
+  endif
+  SOOT_HOME = $(PELE_PHYSICS_HOME)/Source/Soot
   DEFINES+=-DPELEC_USE_SOOT
   DEFINES+=-DNUM_SOOT_MOMENTS=$(NUM_SOOT_MOMENTS)
-  Bpack   += $(PELEMP_HOME)/Source/Soot_Models/Make.package
-  Blocs   += $(PELEMP_HOME)/Source/Soot_Models
+  Bpack   += $(SOOT_HOME)/Make.package
+  Blocs   += $(SOOT_HOME)
 endif
 
 Bpack += $(foreach dir, $(Pdirs), $(AMREX_HOME)/Src/$(dir)/Make.package)
@@ -170,7 +172,7 @@ AMReX_buildInfo.cpp:
           --COMP "$(COMP)" --COMP_VERSION "$(COMP_VERSION)" \
           --FCOMP "$(FCOMP)" --FCOMP_VERSION "$(FCOMP_VERSION)" \
           --MODULES "$(MNAMES)" \
-          --GIT "$(PELEC_HOME) $(AMREX_HOME) $(PELE_PHYSICS_HOME) $(SUNDIALS_HOME) $(PELEMP_HOME)"
+          --GIT "$(PELEC_HOME) $(AMREX_HOME) $(PELE_PHYSICS_HOME) $(SUNDIALS_HOME)"
 
 include $(AMREX_HOME)/Tools/GNUMake/Make.rules
 

Exec/RegTests/Soot-Flame/GNUmakefile

@@ -30,7 +30,7 @@ Eos_Model := Fuego
 Chemistry_Model := SootReaction
 Transport_Model := Simple
 
-# PeleMP
+# Soot
 USE_SOOT = TRUE
 # If this is changed, must run a make clean and rerun make
 NUM_SOOT_MOMENTS = 3

Exec/RegTests/Spray-Conv/GNUmakefile

@@ -30,7 +30,7 @@ Eos_Model := Fuego
 Chemistry_Model := decane_3sp
 Transport_Model := Simple
 
-# PeleMP
+# Spray
 USE_PARTICLES = TRUE
 SPRAY_FUEL_NUM = 1
 

Exec/RegTests/Spray-Conv/multiRuns.py

@@ -23,7 +23,7 @@
 import argparse
 
 USAGE = """
-    A script for doing CI with PeleC coupled with PeleMP sprays
+    A script for doing CI with PeleC coupled with sprays
 """