Move Exec dirs into WindFarmTests

erf-model · Nov 1, 2024 · 60c1773 · 60c1773
1 parent a93bf1b
commit 60c1773
Show file tree

Hide file tree

Showing 47 changed files with 4 additions and 21 deletions.
diff --git a/CMake/BuildERFExe.cmake b/CMake/BuildERFExe.cmake
@@ -203,10 +203,10 @@ function(build_erf_lib erf_lib_name)
        ${SRC_DIR}/Microphysics/Kessler/ERF_Init_Kessler.cpp
        ${SRC_DIR}/Microphysics/Kessler/ERF_Kessler.cpp
        ${SRC_DIR}/Microphysics/Kessler/ERF_Update_Kessler.cpp
-	   ${SRC_DIR}/WindFarmParametrization/Fitch/ERF_AdvanceFitch.cpp
-	   ${SRC_DIR}/WindFarmParametrization/EWP/ERF_AdvanceEWP.cpp
-	   ${SRC_DIR}/WindFarmParametrization/SimpleActuatorDisk/ERF_AdvanceSimpleAD.cpp
-	   ${SRC_DIR}/WindFarmParametrization/GeneralActuatorDisk/ERF_AdvanceGeneralAD.cpp
+       ${SRC_DIR}/WindFarmParametrization/Fitch/ERF_AdvanceFitch.cpp
+       ${SRC_DIR}/WindFarmParametrization/EWP/ERF_AdvanceEWP.cpp
+       ${SRC_DIR}/WindFarmParametrization/SimpleActuatorDisk/ERF_AdvanceSimpleAD.cpp
+       ${SRC_DIR}/WindFarmParametrization/GeneralActuatorDisk/ERF_AdvanceGeneralAD.cpp
        ${SRC_DIR}/LandSurfaceModel/SLM/ERF_SLM.cpp
        ${SRC_DIR}/LandSurfaceModel/MM5/ERF_MM5.cpp
   )

diff --git a/Exec/AWAKEN/CMakeLists.txt → Exec/WindFarmTests/AWAKEN/CMakeLists.txt b/Exec/AWAKEN/CMakeLists.txt → Exec/WindFarmTests/AWAKEN/CMakeLists.txt
diff --git a/Exec/AWAKEN/ERF_prob.H → Exec/WindFarmTests/AWAKEN/ERF_prob.H b/Exec/AWAKEN/ERF_prob.H → Exec/WindFarmTests/AWAKEN/ERF_prob.H
diff --git a/Exec/AWAKEN/ERF_prob.cpp → Exec/WindFarmTests/AWAKEN/ERF_prob.cpp b/Exec/AWAKEN/ERF_prob.cpp → Exec/WindFarmTests/AWAKEN/ERF_prob.cpp
diff --git a/Exec/AWAKEN/GNUmakefile → Exec/WindFarmTests/AWAKEN/GNUmakefile b/Exec/AWAKEN/GNUmakefile → Exec/WindFarmTests/AWAKEN/GNUmakefile
diff --git a/Exec/AWAKEN/Make.package → Exec/WindFarmTests/AWAKEN/Make.package b/Exec/AWAKEN/Make.package → Exec/WindFarmTests/AWAKEN/Make.package
diff --git a/Exec/AWAKEN/README → Exec/WindFarmTests/AWAKEN/README b/Exec/AWAKEN/README → Exec/WindFarmTests/AWAKEN/README
diff --git a/Exec/AWAKEN/inputs_All_EWP → Exec/WindFarmTests/AWAKEN/inputs_All_EWP b/Exec/AWAKEN/inputs_All_EWP → Exec/WindFarmTests/AWAKEN/inputs_All_EWP
diff --git a/Exec/AWAKEN/inputs_KingPlains_EWP → ...indFarmTests/AWAKEN/inputs_KingPlains_EWP b/Exec/AWAKEN/inputs_KingPlains_EWP → ...indFarmTests/AWAKEN/inputs_KingPlains_EWP
diff --git a/Exec/AWAKEN/inputs_KingPlains_Fitch → ...dFarmTests/AWAKEN/inputs_KingPlains_Fitch b/Exec/AWAKEN/inputs_KingPlains_Fitch → ...dFarmTests/AWAKEN/inputs_KingPlains_Fitch
diff --git a/Exec/AWAKEN/inputs_KingPlains_SimpleAD → ...rmTests/AWAKEN/inputs_KingPlains_SimpleAD b/Exec/AWAKEN/inputs_KingPlains_SimpleAD → ...rmTests/AWAKEN/inputs_KingPlains_SimpleAD
diff --git a/Exec/AWAKEN/windturbines_All.txt → ...WindFarmTests/AWAKEN/windturbines_All.txt b/Exec/AWAKEN/windturbines_All.txt → ...WindFarmTests/AWAKEN/windturbines_All.txt
diff --git a/Exec/AWAKEN/windturbines_ArmadilloFlats.txt → ...ts/AWAKEN/windturbines_ArmadilloFlats.txt b/Exec/AWAKEN/windturbines_ArmadilloFlats.txt → ...ts/AWAKEN/windturbines_ArmadilloFlats.txt
diff --git a/Exec/AWAKEN/windturbines_KingPlains.txt → ...mTests/AWAKEN/windturbines_KingPlains.txt b/Exec/AWAKEN/windturbines_KingPlains.txt → ...mTests/AWAKEN/windturbines_KingPlains.txt
diff --git a/Exec/AWAKEN/windturbines_spec_AWAKEN.tbl → ...Tests/AWAKEN/windturbines_spec_AWAKEN.tbl b/Exec/AWAKEN/windturbines_spec_AWAKEN.tbl → ...Tests/AWAKEN/windturbines_spec_AWAKEN.tbl
diff --git a/Exec/EWP/CMakeLists.txt → Exec/WindFarmTests/EWP/CMakeLists.txt b/Exec/EWP/CMakeLists.txt → Exec/WindFarmTests/EWP/CMakeLists.txt
diff --git a/Exec/EWP/ERF_prob.H → Exec/WindFarmTests/EWP/ERF_prob.H b/Exec/EWP/ERF_prob.H → Exec/WindFarmTests/EWP/ERF_prob.H
diff --git a/Exec/EWP/ERF_prob.cpp → Exec/WindFarmTests/EWP/ERF_prob.cpp b/Exec/EWP/ERF_prob.cpp → Exec/WindFarmTests/EWP/ERF_prob.cpp
diff --git a/Exec/EWP/GNUmakefile → Exec/WindFarmTests/EWP/GNUmakefile b/Exec/EWP/GNUmakefile → Exec/WindFarmTests/EWP/GNUmakefile
diff --git a/Exec/EWP/Make.package → Exec/WindFarmTests/EWP/Make.package b/Exec/EWP/Make.package → Exec/WindFarmTests/EWP/Make.package
diff --git a/Exec/EWP/README → Exec/WindFarmTests/EWP/README b/Exec/EWP/README → Exec/WindFarmTests/EWP/README
diff --git a/Exec/EWP/inputs_1WT_lat_lon → Exec/WindFarmTests/EWP/inputs_1WT_lat_lon b/Exec/EWP/inputs_1WT_lat_lon → Exec/WindFarmTests/EWP/inputs_1WT_lat_lon
diff --git a/Exec/EWP/inputs_1WT_x_y → Exec/WindFarmTests/EWP/inputs_1WT_x_y b/Exec/EWP/inputs_1WT_x_y → Exec/WindFarmTests/EWP/inputs_1WT_x_y
diff --git a/Exec/EWP/inputs_WindFarm_lat_lon → ...WindFarmTests/EWP/inputs_WindFarm_lat_lon b/Exec/EWP/inputs_WindFarm_lat_lon → ...WindFarmTests/EWP/inputs_WindFarm_lat_lon
diff --git a/Exec/EWP/inputs_WindFarm_x_y → Exec/WindFarmTests/EWP/inputs_WindFarm_x_y b/Exec/EWP/inputs_WindFarm_x_y → Exec/WindFarmTests/EWP/inputs_WindFarm_x_y
diff --git a/Exec/EWP/windturbines_loc_lat_lon_1WT.txt → ...ests/EWP/windturbines_loc_lat_lon_1WT.txt b/Exec/EWP/windturbines_loc_lat_lon_1WT.txt → ...ests/EWP/windturbines_loc_lat_lon_1WT.txt
diff --git a/...EWP/windturbines_loc_lat_lon_WindFarm.txt → ...EWP/windturbines_loc_lat_lon_WindFarm.txt b/...EWP/windturbines_loc_lat_lon_WindFarm.txt → ...EWP/windturbines_loc_lat_lon_WindFarm.txt
diff --git a/Exec/EWP/windturbines_loc_x_y_1WT.txt → ...armTests/EWP/windturbines_loc_x_y_1WT.txt b/Exec/EWP/windturbines_loc_x_y_1WT.txt → ...armTests/EWP/windturbines_loc_x_y_1WT.txt
diff --git a/Exec/EWP/windturbines_loc_x_y_WindFarm.txt → ...sts/EWP/windturbines_loc_x_y_WindFarm.txt b/Exec/EWP/windturbines_loc_x_y_WindFarm.txt → ...sts/EWP/windturbines_loc_x_y_WindFarm.txt
diff --git a/Exec/EWP/windturbines_spec_1WT.tbl → ...ndFarmTests/EWP/windturbines_spec_1WT.tbl b/Exec/EWP/windturbines_spec_1WT.tbl → ...ndFarmTests/EWP/windturbines_spec_1WT.tbl
diff --git a/Exec/EWP/windturbines_spec_WindFarm.tbl → ...mTests/EWP/windturbines_spec_WindFarm.tbl b/Exec/EWP/windturbines_spec_WindFarm.tbl → ...mTests/EWP/windturbines_spec_WindFarm.tbl
diff --git a/Exec/GeneralActuatorDisk/ERF_prob.cpp → ...armTests/GeneralActuatorDisk/ERF_prob.cpp b/Exec/GeneralActuatorDisk/ERF_prob.cpp → ...armTests/GeneralActuatorDisk/ERF_prob.cpp
diff --git a/Exec/SimpleActuatorDisk/CMakeLists.txt → ...rmTests/SimpleActuatorDisk/CMakeLists.txt b/Exec/SimpleActuatorDisk/CMakeLists.txt → ...rmTests/SimpleActuatorDisk/CMakeLists.txt
diff --git a/Exec/SimpleActuatorDisk/ERF_prob.H → ...ndFarmTests/SimpleActuatorDisk/ERF_prob.H b/Exec/SimpleActuatorDisk/ERF_prob.H → ...ndFarmTests/SimpleActuatorDisk/ERF_prob.H
diff --git a/Exec/SimpleActuatorDisk/ERF_prob.cpp → ...FarmTests/SimpleActuatorDisk/ERF_prob.cpp b/Exec/SimpleActuatorDisk/ERF_prob.cpp → ...FarmTests/SimpleActuatorDisk/ERF_prob.cpp
diff --git a/Exec/SimpleActuatorDisk/GNUmakefile → ...dFarmTests/SimpleActuatorDisk/GNUmakefile b/Exec/SimpleActuatorDisk/GNUmakefile → ...dFarmTests/SimpleActuatorDisk/GNUmakefile
diff --git a/Exec/SimpleActuatorDisk/Make.package → ...FarmTests/SimpleActuatorDisk/Make.package b/Exec/SimpleActuatorDisk/Make.package → ...FarmTests/SimpleActuatorDisk/Make.package
diff --git a/Exec/SimpleActuatorDisk/README → Exec/WindFarmTests/SimpleActuatorDisk/README b/Exec/SimpleActuatorDisk/README → Exec/WindFarmTests/SimpleActuatorDisk/README
diff --git a/Exec/SimpleActuatorDisk/inputs_1WT_lat_lon → ...sts/SimpleActuatorDisk/inputs_1WT_lat_lon b/Exec/SimpleActuatorDisk/inputs_1WT_lat_lon → ...sts/SimpleActuatorDisk/inputs_1WT_lat_lon
diff --git a/Exec/SimpleActuatorDisk/inputs_1WT_x_y → ...rmTests/SimpleActuatorDisk/inputs_1WT_x_y b/Exec/SimpleActuatorDisk/inputs_1WT_x_y → ...rmTests/SimpleActuatorDisk/inputs_1WT_x_y
diff --git a/...impleActuatorDisk/inputs_WindFarm_lat_lon → ...impleActuatorDisk/inputs_WindFarm_lat_lon b/...impleActuatorDisk/inputs_WindFarm_lat_lon → ...impleActuatorDisk/inputs_WindFarm_lat_lon
diff --git a/Exec/SimpleActuatorDisk/inputs_WindFarm_x_y → ...ts/SimpleActuatorDisk/inputs_WindFarm_x_y b/Exec/SimpleActuatorDisk/inputs_WindFarm_x_y → ...ts/SimpleActuatorDisk/inputs_WindFarm_x_y
diff --git a/...atorDisk/windturbines_loc_lat_lon_1WT.txt → ...atorDisk/windturbines_loc_lat_lon_1WT.txt b/...atorDisk/windturbines_loc_lat_lon_1WT.txt → ...atorDisk/windturbines_loc_lat_lon_1WT.txt
diff --git a/...ActuatorDisk/windturbines_loc_x_y_1WT.txt → ...ActuatorDisk/windturbines_loc_x_y_1WT.txt b/...ActuatorDisk/windturbines_loc_x_y_1WT.txt → ...ActuatorDisk/windturbines_loc_x_y_1WT.txt
diff --git a/...pleActuatorDisk/windturbines_spec_1WT.tbl → ...pleActuatorDisk/windturbines_spec_1WT.tbl b/...pleActuatorDisk/windturbines_spec_1WT.tbl → ...pleActuatorDisk/windturbines_spec_1WT.tbl
diff --git a/Exec/inputs.mesh_refinement b/Exec/inputs.mesh_refinement
diff --git a/Source/BoundaryConditions/ERF_PhysBCFunct.cpp b/Source/BoundaryConditions/ERF_PhysBCFunct.cpp
@@ -250,8 +250,6 @@ void ERFPhysBCFunct_w::operator() (MultiFab& mf, MultiFab& xvel, MultiFab& yvel,
     //
     if (gdomainz.smallEnd(2) == 0) gdomainz.setSmall(2,1);
 
-    Box ndomain  = convert(domain,IntVect(1,1,1));
-
     //
     // We fill all of the interior and periodic ghost cells first, so we can fill
     //    those directly inside the lateral and vertical calls.