Add TaskListFactory (#118)

- update yaml file - update main - add TaskListFactory
chengcli · Jan 19, 2024 · e76d893 · e76d893
1 parent 10e81c6
commit e76d893
Show file tree

Hide file tree

Showing 23 changed files with 64 additions and 39 deletions.
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
@@ -137,7 +137,7 @@ jobs:
       - name: create build directory
         # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
         # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-        run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DTASK=robert3d
+        run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DTASK=robert
 
       - name: Build
         # Build your program with the given configuration

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -439,7 +439,7 @@ jobs:
       - name: create build directory
         # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
         # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-        run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DTASK=robert3d
+        run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DTASK=robert
 
       - name: Build
         # Build your program with the given configuration

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -65,7 +65,6 @@ include(${CMAKE_SOURCE_DIR}/cmake/pybind11.cmake)
 ## 4. set up project configure file and library ##
 message(STATUS "4. Set up project libraries")
 configure_file(${CMAKE_SOURCE_DIR}/configure.hpp.in configure.hpp @ONLY)
-configure_file(${CMAKE_SOURCE_DIR}/main.cpp.in main_${TASK}.cpp @ONLY)
 add_subdirectory(src)
 add_subdirectory(tools)
 add_subdirectory(data)

diff --git a/cmake/bryan.cmake b/cmake/bryan.cmake
@@ -16,5 +16,4 @@ set(NPHASE_LEGACY 2)
 set(NETCDF ON)
 set(PNETCDF ON)
 set(MPI ON)
-set(TASKLIST ImplicitHydroTasks)
 set(RSOLVER lmars)
diff --git a/cmake/disort.cmake b/cmake/disort.cmake
@@ -18,7 +18,7 @@ if(DISORT)
   FetchContent_Declare(
     pydisort
     DOWNLOAD_EXTRACT_TIMESTAMP TRUE
-    URL https://${ACCOUNT}:${TOKEN}@github.com/zoeyzyhu/pydisort/archive/refs/tags/v0.6.3b1.tar.gz
+    URL https://${ACCOUNT}:${TOKEN}@github.com/zoeyzyhu/pydisort/archive/refs/tags/v0.8.0.tar.gz
   )
 
   FetchContent_MakeAvailable(pydisort)

diff --git a/cmake/hywater.cmake b/cmake/hywater.cmake
@@ -18,5 +18,4 @@ set(PNETCDF ON)
 set(MPI ON)
 set(DISORT ON)
 set(PYTHON_BINDINGS ON)
-set(TASKLIST ImplicitHydroTasks)
 set(RSOLVER lmars)
diff --git a/cmake/macros/macro_setup_problem.cmake b/cmake/macros/macro_setup_problem.cmake
@@ -6,8 +6,7 @@ string(TOLOWER ${CMAKE_BUILD_TYPE} buildl)
 string(TOUPPER ${CMAKE_BUILD_TYPE} buildu)
 
 macro(setup_problem namel)
-  add_executable(${namel}.${buildl} ${namel}.cpp
-                                    ${CMAKE_BINARY_DIR}/main_${TASK}.cpp)
+  add_executable(${namel}.${buildl} ${namel}.cpp ${CMAKE_SOURCE_DIR}/main.cpp)
 
   set_target_properties(
     ${namel}.${buildl}

diff --git a/cmake/parameters.cmake b/cmake/parameters.cmake
@@ -27,8 +27,6 @@ set_if_empty(NINT_PARTICLE_DATA 0)
 
 set_if_empty(NREAL_PARTICLE_DATA 0)
 
-# set_if_empty(TASKLIST ImplicitHydroTasks)
-
 # set_if_empty(RSOLVER lmars)
 
 # set_if_empty(NUMBER_GHOST_CELLS 3)
@@ -50,8 +48,6 @@ else()
 endif()
 set(EQUATION_OF_STATE ${EOS})
 
-set_if_empty(TASKLIST TimeIntegratorTaskList)
-
 if(NOT AFFINE OR NOT DEFINED AFFINE)
   set(AFFINE_OPTION "NOT_AFFINE")
 else()

diff --git a/cmake/robert.cmake b/cmake/robert.cmake
@@ -12,4 +12,3 @@ set_if_empty(NUMBER_GHOST_CELLS 3)
 # canoe configure
 set(MPI ON)
 set(PNETCDF ON)
-set(TASKLIST ImplicitHydroTasks)
diff --git a/cmake/robert3d.cmake b/cmake/robert3d.cmake
diff --git a/examples/2019-Li-snap/bryan.inp b/examples/2019-Li-snap/bryan.inp
@@ -5,6 +5,7 @@ configure = --prob=bryan --flux=lmars --nvapor=1 --nphase=2 --nghost=3 -pnetcdf
 
 <job>
 problem_id  = bryan         # problem ID: basename of output filenames
+tasklist    = ImplicitHydroTasks
 
 <output1>
 file_type   = hst           # History data dump

diff --git a/examples/2019-Li-snap/robert2d.inp b/examples/2019-Li-snap/robert2d.inp
@@ -5,6 +5,7 @@ configure = --prob=robert --nghost=3 -mpi -pnetcdf --pnetcdf_path=${HOME}/opt/
 
 <job>
 problem_id = robert # problem ID: basename of output filenames
+tasklist   = ImplicitHydroTasks
 
 <output1>
 file_type  = hst         # History data dump

diff --git a/examples/2019-Li-snap/robert3d.inp b/examples/2019-Li-snap/robert3d.inp
@@ -5,6 +5,7 @@ configure = --prob=robert --nghost=3 -mpi -pnetcdf --pnetcdf_path=${HOME}/opt/
 
 <job>
 problem_id = robert # problem ID: basename of output filenames
+tasklist   = ImplicitHydroTasks
 
 <output1>
 file_type  = hst         # History data dump

diff --git a/examples/2019-Li-snap/straka.inp b/examples/2019-Li-snap/straka.inp
@@ -5,6 +5,7 @@ configure = --prob=straka --nghost=3 -netcdf
 
 <job>
 problem_id = straka       # problem ID: basename of output filenames
+tasklist   = TimeIntegratorTaskList
 
 <output1>
 file_type  = hst          # History data dump

diff --git a/examples/2020-Li-polar-vortex/fig_g_intruder.inp b/examples/2020-Li-polar-vortex/fig_g_intruder.inp
@@ -5,6 +5,7 @@ configure = --prob=polar_vortex --eos=shallow_water --nghost=3 -mpi -pnetcdf --p
 
 <job>
 problem_id = intruder # problem ID: basename of output filenames
+tasklist   = TimeIntegratorTaskList
 
 <output0>
 file_type  = hst          # History data dump

diff --git a/examples/2020-Li-polar-vortex/shallow_water.inp b/examples/2020-Li-polar-vortex/shallow_water.inp
@@ -5,6 +5,7 @@ configure = --prob=shallow_water --eos=shallow_water --nghost=3 -netcdf -mpi
 
 <job>
 problem_id = sw        # problem ID: basename of output filenames
+tasklist   = TimeIntegratorTaskList
 
 <output1>
 file_type  = hst       # History data dump

diff --git a/examples/2023-jupiter-mwr-eq/juno_mwr.inp b/examples/2023-jupiter-mwr-eq/juno_mwr.inp
@@ -4,6 +4,7 @@ configure = mkdir build-juno && cmake .. -DTASK=Juno
 
 <job>
 problem_id  = juno_mwr    # problem ID: basename of output filenames
+tasklist    = TimeIntegratorTaskList
 
 #<output1>
 #file_type   = fits        # Binary data dump

diff --git a/examples/2024-XZhang-cloud-rt/hywater.inp b/examples/2024-XZhang-cloud-rt/hywater.inp
@@ -4,6 +4,7 @@ configure = -Dpnetcdf_path=/home3/xzhang11/pnetcdf
 
 <job>
 problem_id  = hywater2d   # problem ID: basename of output filenames
+tasklist    = ImplicitHydroTasks
 
 <output0>
 file_type   = rst

diff --git a/examples/2024-XZhang-cloud-rt/hywater.yaml b/examples/2024-XZhang-cloud-rt/hywater.yaml
@@ -39,6 +39,8 @@ vis:
 
 Disort-flags:
   ibcnd: false
+  usrtau: false
+  usrang: false
   lamber: true
   onlyfl: true
   spher: false

diff --git a/main.cpp.in → main.cpp b/main.cpp.in → main.cpp
@@ -19,7 +19,7 @@
 #include <athena/task_list/task_list.hpp>
 
 // tasklist
-#include <tasklist/extra_tasks.hpp>
+#include <tasklist/task_list_factory.hpp>
 
 // application
 #include <application/command_line.hpp>
@@ -43,7 +43,6 @@ void mesh_setup(ParameterInput* &pin, Mesh* &mesh);
 void mesh_destroy(ParameterInput* &pin, Mesh* &mesh, int mbcnt);
 
 using OutputsPtr = std::unique_ptr<Outputs>;
-using TaskListPtr = std::unique_ptr<@TASKLIST@>;
 
 int main(int argc, char **argv)  {
   Application::Start(argc, argv);
@@ -83,13 +82,7 @@ int main(int argc, char **argv)  {
   mesh_setup(pinput, pmesh);
 
   // CONSTRUCT AND INITIALIZE TASKlIST
-  TaskListPtr ptlist;
-  try {
-    ptlist = std::make_unique<@TASKLIST@>(pinput, pmesh);
-  }
-  catch(std::bad_alloc& ba) {
-    throw RuntimeError("main", "TaskList memory allocation failed");
-  }
+  auto ptlist = TaskListFactory::CreateFrom(pinput, pmesh);
 
 #ifdef ENABLE_GLOG
   FLAGS_log_dir = log_dir_name;

diff --git a/src/harp/rt_solver_disort.cpp b/src/harp/rt_solver_disort.cpp
@@ -66,13 +66,14 @@ void RadiationBand::RTSolverDisort::Resize(int nlyr, int nstr) {
   auto &rayout = pmy_band_->rayOutput_;
   auto &&uphi_umu = RadiationHelper::get_direction_grids(rayout);
 
-  SetAtmosphereDimension(nlyr, nstr, nstr, nstr);
+  SetAtmosphereDimension(nlyr, nstr, nstr);
 
   dir_dim_[0] = uphi_umu.second.size();  // umu
   dir_dim_[1] = uphi_umu.first.size();   // uphi
   dir_axis_.resize(dir_dim_[0] + dir_dim_[1]);
 
-  SetIntensityDimension(dir_dim_[1], 1, dir_dim_[0]);
+  SetIntensityDimension(std::max(dir_dim_[1], 1lu), 1,
+                        std::max(dir_dim_[0], 1lu));
   Seal();
 }
 

diff --git a/src/tasklist/extra_tasks.hpp b/src/tasklist/extra_tasks.hpp
@@ -3,6 +3,7 @@
 
 // athena
 #include <athena/globals.hpp>
+#include <athena/task_list/task_list.hpp>
 
 // forward declarations
 class Mesh;

diff --git a/src/tasklist/task_list_factory.hpp b/src/tasklist/task_list_factory.hpp
@@ -0,0 +1,44 @@
+#ifndef SRC_TASKLIST_TASK_LIST_FACTORY_HPP_
+#define SRC_TASKLIST_TASK_LIST_FACTORY_HPP_
+
+// C/C++
+#include <memory>
+
+// application
+#include <application/exceptions.hpp>
+
+#include "extra_tasks.hpp"
+
+using TaskListPtr = std::unique_ptr<TaskList>;
+
+class TaskListFactory {
+ public:
+  static TaskListPtr CreateFrom(ParameterInput* pin, Mesh* mesh) {
+    std::string tasklist_name;
+    TaskListPtr ptlist;
+
+    if (pin->DoesParameterExist("job", "tasklist")) {
+      tasklist_name = pin->GetString("job", "tasklist");
+    } else {
+      tasklist_name = "ImplicitHydroTasks";
+    }
+
+    try {
+      if (tasklist_name == "TimeIntegratorTaskList") {
+        ptlist = std::make_unique<TimeIntegratorTaskList>(pin, mesh);
+      } else if (tasklist_name == "ImplicitHydroTasks") {
+        ptlist = std::make_unique<ImplicitHydroTasks>(pin, mesh);
+      } else if (tasklist_name == "InversionTasks") {
+        ptlist = std::make_unique<InversionTasks>(pin, mesh);
+      } else {
+        throw RuntimeError("main", "Unknown tasklist name: " + tasklist_name);
+      }
+    } catch (std::bad_alloc& ba) {
+      throw RuntimeError("main", "TaskList memory allocation failed");
+    }
+
+    return ptlist;
+  }
+};
+
+#endif  // SRC_TASKLIST_TASK_LIST_FACTORY_HPP_