Move submodules into PeleLM. (#159)

AMReX-Combustion · Mar 2, 2021 · fe7f764 · fe7f764
1 parent 8f7747b
commit fe7f764
Show file tree

Hide file tree

Showing 19 changed files with 76 additions and 48 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,15 @@
+[submodule "Submodules/PelePhysics"]
+	path = Submodules/PelePhysics
+	url = https://github.com/AMReX-Combustion/PelePhysics.git
+[submodule "Submodules/amrex"]
+	path = Submodules/amrex
+	url = https://github.com/AMReX-Codes/amrex.git
+[submodule "Submodules/sundials"]
+	path = Submodules/sundials
+	url = https://github.com/LLNL/sundials.git
+[submodule "Submodules/IAMR"]
+	path = Submodules/IAMR
+	url = https://github.com/AMReX-Codes/IAMR.git
+[submodule "Submodules/googletest"]
+	path = Submodules/googletest
+	url = https://github.com/google/googletest.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -61,7 +61,7 @@ endif()
 ########################### AMReX #####################################
 
 message(STATUS "AMReX Configure Section")
-set(AMREX_SUBMOD_LOCATION "${CMAKE_SOURCE_DIR}/../amrex")
+set(AMREX_SUBMOD_LOCATION "${CMAKE_SOURCE_DIR}/Submodules/amrex")
 include(SetAmrexOptions)
 list(APPEND CMAKE_MODULE_PATH "${AMREX_SUBMOD_LOCATION}/Tools/CMake")
 if(PELELM_ENABLE_CUDA)
@@ -74,7 +74,7 @@ include(SetAmrexCompileFlags)
 
 if(PELELM_ENABLE_SUNDIALS)
   message(STATUS "SUNDIALS Configure Section")
-  set(SUNDIALS_SUBMOD_LOCATION "${CMAKE_SOURCE_DIR}/../sundials")
+  set(SUNDIALS_SUBMOD_LOCATION "${CMAKE_SOURCE_DIR}/Submodules/sundials")
   include(SetSundialsOptions)
   #BUILD_TESTING is an old CMake keyword so don't clear it in sundials configure
   set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
@@ -128,6 +128,6 @@ add_subdirectory(Exec)
 if(PELELM_ENABLE_TESTS)
   enable_testing()
   include(CTest)
-  add_subdirectory(${CMAKE_SOURCE_DIR}/../googletest ${CMAKE_BINARY_DIR}/Submodules/googletest)
+  add_subdirectory(${CMAKE_SOURCE_DIR}/Submodules/googletest)
   add_subdirectory(Testing)
 endif()
diff --git a/Exec/RegTests/ControlledInflow/GNUmakefile b/Exec/RegTests/ControlledInflow/GNUmakefile
@@ -1,7 +1,8 @@
-TOP = ../../../..
-AMREX_HOME ?= ${TOP}/amrex
-IAMR_HOME ?= ${TOP}/IAMR
-PELELM_HOME ?= ${TOP}/PeleLM
+PELELM_HOME = ../../..
+SUBMODS = ${PELELM_HOME}/Submodules
+AMREX_HOME         ?= ${SUBMODS}/amrex
+IAMR_HOME          ?= ${SUBMODS}/IAMR
+PELE_PHYSICS_HOME  ?= ${SUBMODS}/PelePhysics
 
 #
 # Build configuration

diff --git a/Exec/RegTests/EB_FlamePastCylinder/GNUmakefile b/Exec/RegTests/EB_FlamePastCylinder/GNUmakefile
@@ -1,8 +1,8 @@
-TOP = ../../../..
-AMREX_HOME         ?= ${TOP}/amrex
-IAMR_HOME          ?= ${TOP}/IAMR
-PELELM_HOME        ?= ${TOP}/PeleLM
-PELE_PHYSICS_HOME  ?= ${TOP}/PelePhysics
+PELELM_HOME = ../../..
+SUBMODS = ${PELELM_HOME}/Submodules
+AMREX_HOME         ?= ${SUBMODS}/amrex
+IAMR_HOME          ?= ${SUBMODS}/IAMR
+PELE_PHYSICS_HOME  ?= ${SUBMODS}/PelePhysics
 
 #
 # Build configuration

diff --git a/Exec/RegTests/EB_FlowPastCylinder/GNUmakefile b/Exec/RegTests/EB_FlowPastCylinder/GNUmakefile
@@ -1,8 +1,8 @@
-TOP = ../../../..
-AMREX_HOME         ?= ${TOP}/amrex
-IAMR_HOME          ?= ${TOP}/IAMR
-PELELM_HOME        ?= ${TOP}/PeleLM
-PELE_PHYSICS_HOME  ?= ${TOP}/PelePhysics
+PELELM_HOME = ../../..
+SUBMODS = ${PELELM_HOME}/Submodules
+AMREX_HOME         ?= ${SUBMODS}/amrex
+IAMR_HOME          ?= ${SUBMODS}/IAMR
+PELE_PHYSICS_HOME  ?= ${SUBMODS}/PelePhysics
 
 #
 # Build configuration

diff --git a/Exec/RegTests/FlameSheet/GNUmakefile b/Exec/RegTests/FlameSheet/GNUmakefile
@@ -1,8 +1,8 @@
-TOP = ../../../..
-AMREX_HOME         ?= ${TOP}/amrex
-IAMR_HOME          ?= ${TOP}/IAMR
-PELELM_HOME        ?= ${TOP}/PeleLM
-PELE_PHYSICS_HOME  ?= ${TOP}/PelePhysics
+PELELM_HOME = ../../..
+SUBMODS = ${PELELM_HOME}/Submodules
+AMREX_HOME         ?= ${SUBMODS}/amrex
+IAMR_HOME          ?= ${SUBMODS}/IAMR
+PELE_PHYSICS_HOME  ?= ${SUBMODS}/PelePhysics
 
 #
 # Build configuration

diff --git a/Exec/RegTests/ForcedHIT/GNUmakefile b/Exec/RegTests/ForcedHIT/GNUmakefile
@@ -1,7 +1,8 @@
-TOP = ../../../../
-AMREX_HOME ?= ${TOP}/amrex
-IAMR_HOME ?= ${TOP}/IAMR
-PELELM_HOME ?= ${TOP}/PeleLM
+PELELM_HOME = ../../..
+SUBMODS = ${PELELM_HOME}/Submodules
+AMREX_HOME         ?= ${SUBMODS}/amrex
+IAMR_HOME          ?= ${SUBMODS}/IAMR
+PELE_PHYSICS_HOME  ?= ${SUBMODS}/PelePhysics
 
 #
 # Build configuration

diff --git a/Exec/RegTests/HIT/GNUmakefile b/Exec/RegTests/HIT/GNUmakefile
@@ -1,7 +1,8 @@
-TOP = ../../../../
-AMREX_HOME ?= ${TOP}/amrex
-IAMR_HOME ?= ${TOP}/IAMR
-PELELM_HOME ?= ${TOP}/PeleLM
+PELELM_HOME = ../../..
+SUBMODS = ${PELELM_HOME}/Submodules
+AMREX_HOME         ?= ${SUBMODS}/amrex
+IAMR_HOME          ?= ${SUBMODS}/IAMR
+PELE_PHYSICS_HOME  ?= ${SUBMODS}/PelePhysics
 
 #
 # Build configuration

diff --git a/Exec/RegTests/NaturalConvection/GNUmakefile b/Exec/RegTests/NaturalConvection/GNUmakefile
@@ -1,7 +1,8 @@
-TOP = ../../../../
-AMREX_HOME ?= ${TOP}/amrex
-IAMR_HOME ?= ${TOP}/IAMR
-PELELM_HOME ?= ${TOP}/PeleLM
+PELELM_HOME = ../../..
+SUBMODS = ${PELELM_HOME}/Submodules
+AMREX_HOME         ?= ${SUBMODS}/amrex
+IAMR_HOME          ?= ${SUBMODS}/IAMR
+PELE_PHYSICS_HOME  ?= ${SUBMODS}/PelePhysics
 
 #
 # Build configuration

diff --git a/Exec/RegTests/PeriodicCases/GNUmakefile b/Exec/RegTests/PeriodicCases/GNUmakefile
@@ -1,8 +1,8 @@
-TOP = ../../../..
-AMREX_HOME         ?= ${TOP}/amrex
-IAMR_HOME          ?= ${TOP}/IAMR
-PELELM_HOME        ?= ${TOP}/PeleLM
-PELE_PHYSICS_HOME  ?= ${TOP}/PelePhysics
+PELELM_HOME = ../../..
+SUBMODS = ${PELELM_HOME}/Submodules
+AMREX_HOME         ?= ${SUBMODS}/amrex
+IAMR_HOME          ?= ${SUBMODS}/IAMR
+PELE_PHYSICS_HOME  ?= ${SUBMODS}/PelePhysics
 
 #
 # Build configuration

diff --git a/Exec/RegTests/TaylorGreen/GNUmakefile b/Exec/RegTests/TaylorGreen/GNUmakefile
@@ -1,7 +1,8 @@
-TOP = ../../../../
-AMREX_HOME ?= ${TOP}/amrex
-IAMR_HOME ?= ${TOP}/IAMR
-PELELM_HOME ?= ${TOP}/PeleLM
+PELELM_HOME = ../../..
+SUBMODS = ${PELELM_HOME}/Submodules
+AMREX_HOME         ?= ${SUBMODS}/amrex
+IAMR_HOME          ?= ${SUBMODS}/IAMR
+PELE_PHYSICS_HOME  ?= ${SUBMODS}/PelePhysics
 
 #
 # Build configuration

diff --git a/Exec/RegTests/TurbInflow/GNUmakefile b/Exec/RegTests/TurbInflow/GNUmakefile
@@ -1,5 +1,8 @@
-AMREX_HOME ?= ../../../../amrex
-IAMR_HOME ?= ../../../../IAMR
+PELELM_HOME = ../../..
+SUBMODS = ${PELELM_HOME}/Submodules
+AMREX_HOME         ?= ${SUBMODS}/amrex
+IAMR_HOME          ?= ${SUBMODS}/IAMR
+PELE_PHYSICS_HOME  ?= ${SUBMODS}/PelePhysics
 
 DEBUG	= FALSE
 #DEBUG	= TRUE

diff --git a/Submodules/IAMR b/Submodules/IAMR
diff --git a/Submodules/PelePhysics b/Submodules/PelePhysics
diff --git a/Submodules/amrex b/Submodules/amrex
diff --git a/Submodules/googletest b/Submodules/googletest
diff --git a/Submodules/sundials b/Submodules/sundials
diff --git a/Tools/CMake/BuildPeleLMExe.cmake b/Tools/CMake/BuildPeleLMExe.cmake
@@ -15,10 +15,10 @@ function(build_pelelm_exe pelelm_exe_name)
 
   target_include_directories(${pelelm_exe_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
-  set(PELE_PHYSICS_SRC_DIR ${CMAKE_SOURCE_DIR}/../PelePhysics)
+  set(PELE_PHYSICS_SRC_DIR ${CMAKE_SOURCE_DIR}/Submodules/PelePhysics)
   set(PELE_PHYSICS_BIN_DIR ${CMAKE_BINARY_DIR}/Submodules/PelePhysics/${pelelm_exe_name})
 
-  set(IAMR_SRC_DIR ${CMAKE_SOURCE_DIR}/../IAMR/Source)
+  set(IAMR_SRC_DIR ${CMAKE_SOURCE_DIR}/Submodules/IAMR/Source)
   set(IAMR_BIN_DIR ${CMAKE_BINARY_DIR}/Submodules/IAMR/Source/${pelelm_exe_name})
 
   set(SRC_DIR ${CMAKE_SOURCE_DIR}/Source)

diff --git a/Tools/Make/Make.PeleLM b/Tools/Make/Make.PeleLM
@@ -1,5 +1,5 @@
 EBASE = PeleLM
-PELE_PHYSICS_HOME ?= $(TOP)/PelePhysics
+PELE_PHYSICS_HOME ?= $(SUBMODS)/PelePhysics
 
 ifeq ($(USE_SUNDIALS_PP),TRUE) 
   include $(PELE_PHYSICS_HOME)/ThirdParty/Make.ThirdParty