wip

chengcli · Jul 8, 2024 · 9c90b53 · 9c90b53
1 parent 0c267d1
commit 9c90b53
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 6 deletions.
diff --git a/examples/2023-Li-saturn-vla/saturn_radio.cpp b/examples/2023-Li-saturn-vla/saturn_radio.cpp
@@ -14,7 +14,6 @@
 #include <athena/outputs/outputs.hpp>
 #include <athena/parameter_input.hpp>
 #include <athena/scalars/scalars.hpp>
-#include <athena/stride_iterator.hpp>
 
 // application
 #include <application/application.hpp>
@@ -32,6 +31,7 @@
 #include <climath/interpolation.h>
 
 // snap
+#include <snap/stride_iterator.hpp>
 #include <snap/thermodynamics/molecules.hpp>
 #include <snap/thermodynamics/thermodynamics.hpp>
 #include <snap/thermodynamics/vapors/sodium_vapors.hpp>

diff --git a/examples/2023-Li-uranus/uranus_mwr.cpp b/examples/2023-Li-uranus/uranus_mwr.cpp
@@ -14,7 +14,6 @@
 #include <athena/outputs/outputs.hpp>
 #include <athena/parameter_input.hpp>
 #include <athena/scalars/scalars.hpp>
-#include <athena/stride_iterator.hpp>
 
 // application
 #include <application/application.hpp>
@@ -32,6 +31,7 @@
 #include <climath/interpolation.h>
 
 // snap
+#include <snap/stride_iterator.hpp>
 #include <snap/thermodynamics/molecules.hpp>
 #include <snap/thermodynamics/thermodynamics.hpp>
 #include <snap/thermodynamics/vapors/sodium_vapors.hpp>

diff --git a/examples/2024-JHu-juno-mwr/juno_mwr.cpp b/examples/2024-JHu-juno-mwr/juno_mwr.cpp
@@ -14,7 +14,6 @@
 #include <athena/outputs/outputs.hpp>
 #include <athena/parameter_input.hpp>
 #include <athena/scalars/scalars.hpp>
-#include <athena/stride_iterator.hpp>
 
 // application
 #include <application/application.hpp>
@@ -32,6 +31,7 @@
 #include <climath/interpolation.h>
 
 // snap
+#include <snap/stride_iterator.hpp>
 #include <snap/thermodynamics/atm_thermodynamics.hpp>
 #include <snap/thermodynamics/vapors/sodium_vapors.hpp>
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -68,6 +68,10 @@ if (${Torch_FOUND})
 endif()
 #add_subdirectory(nbody)
 
+if(UNIX AND NOT APPLE)
+  set(EXTRA_LIBS dl stdc++fs)
+endif()
+
 set(CANOE_LIBRARY_${buildu}
   "canoe_${buildl}"
   "athenapp_${buildl}"
@@ -103,6 +107,7 @@ set(CANOE_LIBRARY_${buildu}
   ${TORCH_LIBRARY}
   ${TORCH_CPU_LIBRARY}
   ${C10_LIBRARY}
+  ${EXTRA_LIBS}
   CACHE INTERNAL "canoe library")
 
 set(CANOE_INCLUDE_DIR

diff --git a/src/diagnostics/todo/convective_heat_flx.cpp b/src/diagnostics/todo/convective_heat_flx.cpp
@@ -8,9 +8,9 @@
 #include <athena/athena_arrays.hpp>
 #include <athena/coordinates/coordinates.hpp>
 #include <athena/reconstruct/interpolation.hpp>
-#include <athena/stride_iterator.hpp>
 
 // snap
+#include <snap/stride_iterator.hpp>
 #include <snap/thermodynamics/thermodynamics.hpp>
 
 // canoe

diff --git a/src/snap/eos/shallow_yz_hydro.cpp b/src/snap/eos/shallow_yz_hydro.cpp
@@ -12,10 +12,10 @@
 #include <athena/hydro/hydro.hpp>
 #include <athena/mesh/mesh.hpp>
 #include <athena/parameter_input.hpp>
-#include <athena/stride_iterator.hpp>
 
 // canoe
 #include <configure.hpp>
+#include <snap/stride_iterator.hpp>
 
 // exo3
 #include <exo3/cubed_sphere_utility.hpp>

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -14,6 +14,7 @@ if (${Torch_FOUND})
   setup_test(test_reconstruct)
   setup_test(test_riemann)
   setup_test(test_hydro)
+  setup_test(test_thermodynamics)
 endif()
 
 # athena tests
@@ -49,7 +50,6 @@ if (${NVAPOR} EQUAL 2)
     setup_test(test_air_parcel)
     setup_test(test_radiation)
     setup_test(test_microwave_opacity)
-    setup_test(test_thermodynamics)
     setup_test(test_microphysics)
   elseif (${NCLOUD} EQUAL 5)
     setup_test(test_ammonium_hydrosulfide)