[Stagging PR] solvergraph testing

exemples/ci_tests/sod_tube_godunov.py

@@ -112,7 +112,7 @@ def rhovel_map(rmin, rmax):
 ### Plot
 #################
 # do plot or not
-if False:
+if True:
 
     def convert_to_cell_coords(dic):
 

src/shammodels/ramses/CMakeLists.txt

@@ -31,7 +31,10 @@ set(Sources
     src/modules/GhostZones.cpp
     src/modules/AMRSortBlocks.cpp
     src/modules/ComputeCFL.cpp
-    src/modules/ConsToPrim.cpp
+    src/modules/ConsToPrimGas.cpp
+    src/modules/ConsToPrimDust.cpp
+    src/modules/ComputeCellAABB.cpp
+    src/modules/NodeBuildTrees.cpp
     src/modules/StencilGenerator.cpp
 )
 

src/shammodels/ramses/include/shammodels/ramses/Solver.hpp

@@ -115,6 +115,8 @@ namespace shammodels::basegodunov {
 
             return true;
         }
+
+        void init_solver_graph();
     };
 
 } // namespace shammodels::basegodunov

src/shammodels/ramses/include/shammodels/ramses/modules/ComputeCellAABB.hpp

@@ -0,0 +1,72 @@
+// -------------------------------------------------------//
+//
+// SHAMROCK code for hydrodynamics
+// Copyright (c) 2021-2024 Timothée David--Cléris <[email protected]>
+// SPDX-License-Identifier: CeCILL Free Software License Agreement v2.1
+// Shamrock is licensed under the CeCILL 2.1 License, see LICENSE for more information
+//
+// -------------------------------------------------------//
+
+#pragma once
+
+/**
+ * @file ComputeCellAABB.hpp
+ * @author Timothée David--Cléris ([email protected])
+ * @brief
+ *
+ */
+
+#include "shambackends/vec.hpp"
+#include "shamrock/solvergraph/FieldSpan.hpp"
+#include "shamrock/solvergraph/INode.hpp"
+#include "shamrock/solvergraph/Indexes.hpp"
+
+namespace shammodels::basegodunov::modules {
+
+    template<class Tvec, class TgridVec>
+    class NodeComputeCellAABB : public shamrock::solvergraph::INode {
+        using Tscal = shambase::VecComponent<Tvec>;
+        u32 block_nside;
+        Tscal grid_coord_to_pos_fact;
+
+        public:
+        NodeComputeCellAABB(u32 block_nside, Tscal grid_coord_to_pos_fact)
+            : block_nside(block_nside), grid_coord_to_pos_fact(grid_coord_to_pos_fact) {}
+
+        struct Edges {
+            const shamrock::solvergraph::Indexes<u32> &sizes;
+            const shamrock::solvergraph::FieldSpan<TgridVec> &spans_block_min;
+            const shamrock::solvergraph::FieldSpan<TgridVec> &spans_block_max;
+            shamrock::solvergraph::FieldSpan<Tscal> &spans_block_cell_sizes;
+            shamrock::solvergraph::FieldSpan<Tvec> &spans_cell0block_aabb_lower;
+        };
+
+        inline void set_edges(
+            std::shared_ptr<shamrock::solvergraph::Indexes<u32>> sizes,
+            std::shared_ptr<shamrock::solvergraph::FieldSpan<TgridVec>> spans_block_min,
+            std::shared_ptr<shamrock::solvergraph::FieldSpan<TgridVec>> spans_block_max,
+            std::shared_ptr<shamrock::solvergraph::FieldSpan<Tscal>> spans_block_cell_sizes,
+            std::shared_ptr<shamrock::solvergraph::FieldSpan<Tvec>> spans_cell0block_aabb_lower) {
+            __internal_set_ro_edges({sizes, spans_block_min, spans_block_max});
+            __internal_set_rw_edges({spans_block_cell_sizes, spans_cell0block_aabb_lower});
+        }
+
+        inline Edges get_edges() {
+            return Edges{
+                get_ro_edge<shamrock::solvergraph::Indexes<u32>>(0),
+                get_ro_edge<shamrock::solvergraph::FieldSpan<TgridVec>>(1),
+                get_ro_edge<shamrock::solvergraph::FieldSpan<TgridVec>>(2),
+                get_rw_edge<shamrock::solvergraph::FieldSpan<Tscal>>(0),
+                get_rw_edge<shamrock::solvergraph::FieldSpan<Tvec>>(1),
+            };
+        }
+
+        void _impl_evaluate_internal();
+
+        inline void _impl_reset_internal() {}
+
+        inline virtual std::string _impl_get_label() { return "ComputeCellAABB"; };
+
+        virtual std::string _impl_get_tex();
+    };
+} // namespace shammodels::basegodunov::modules

src/shammodels/ramses/include/shammodels/ramses/modules/ConsToPrimDust.hpp

@@ -0,0 +1,67 @@
+// -------------------------------------------------------//
+//
+// SHAMROCK code for hydrodynamics
+// Copyright (c) 2021-2024 Timothée David--Cléris <[email protected]>
+// SPDX-License-Identifier: CeCILL Free Software License Agreement v2.1
+// Shamrock is licensed under the CeCILL 2.1 License, see LICENSE for more information
+//
+// -------------------------------------------------------//
+
+#pragma once
+
+/**
+ * @file ConsToPrimDust.hpp
+ * @author Timothée David--Cléris ([email protected])
+ * @brief Field variant object to instanciate a variant on the patch types
+ * @date 2023-07-31
+ */
+
+#include "shambackends/vec.hpp"
+#include "shamrock/solvergraph/FieldSpan.hpp"
+#include "shamrock/solvergraph/INode.hpp"
+#include "shamrock/solvergraph/Indexes.hpp"
+
+namespace shammodels::basegodunov::modules {
+    template<class Tvec>
+    class NodeConsToPrimDust : public shamrock::solvergraph::INode {
+        using Tscal = shambase::VecComponent<Tvec>;
+        u32 block_size;
+        u32 ndust;
+
+        public:
+        NodeConsToPrimDust(u32 block_size, u32 ndust) : block_size(block_size), ndust(ndust) {}
+
+        struct Edges {
+            const shamrock::solvergraph::Indexes<u32> &sizes;
+            const shamrock::solvergraph::FieldSpan<Tscal> &spans_rho_dust;
+            const shamrock::solvergraph::FieldSpan<Tvec> &spans_rhov_dust;
+            shamrock::solvergraph::FieldSpan<Tvec> &spans_vel_dust;
+        };
+
+        inline void set_edges(
+            std::shared_ptr<shamrock::solvergraph::Indexes<u32>> sizes,
+            std::shared_ptr<shamrock::solvergraph::FieldSpan<Tscal>> spans_rho_dust,
+            std::shared_ptr<shamrock::solvergraph::FieldSpan<Tvec>> spans_rhov_dust,
+            std::shared_ptr<shamrock::solvergraph::FieldSpan<Tvec>> spans_vel_dust) {
+            __internal_set_ro_edges({sizes, spans_rho_dust, spans_rhov_dust});
+            __internal_set_rw_edges({spans_vel_dust});
+        }
+
+        inline Edges get_edges() {
+            return Edges{
+                get_ro_edge<shamrock::solvergraph::Indexes<u32>>(0),
+                get_ro_edge<shamrock::solvergraph::FieldSpan<Tscal>>(1),
+                get_ro_edge<shamrock::solvergraph::FieldSpan<Tvec>>(2),
+                get_rw_edge<shamrock::solvergraph::FieldSpan<Tvec>>(0),
+            };
+        }
+
+        void _impl_evaluate_internal();
+
+        inline void _impl_reset_internal() {}
+
+        inline virtual std::string _impl_get_label() { return "ConsToPrimDust"; };
+
+        virtual std::string _impl_get_tex();
+    };
+} // namespace shammodels::basegodunov::modules

src/shammodels/ramses/include/shammodels/ramses/modules/ConsToPrimGas.hpp

@@ -0,0 +1,73 @@
+// -------------------------------------------------------//
+//
+// SHAMROCK code for hydrodynamics
+// Copyright (c) 2021-2024 Timothée David--Cléris <[email protected]>
+// SPDX-License-Identifier: CeCILL Free Software License Agreement v2.1
+// Shamrock is licensed under the CeCILL 2.1 License, see LICENSE for more information
+//
+// -------------------------------------------------------//
+
+#pragma once
+
+/**
+ * @file ConsToPrimGas.hpp
+ * @author Timothée David--Cléris ([email protected])
+ * @brief Field variant object to instanciate a variant on the patch types
+ * @date 2023-07-31
+ */
+
+#include "shambackends/vec.hpp"
+#include "shamrock/solvergraph/FieldSpan.hpp"
+#include "shamrock/solvergraph/INode.hpp"
+#include "shamrock/solvergraph/Indexes.hpp"
+
+namespace shammodels::basegodunov::modules {
+    template<class Tvec>
+    class NodeConsToPrimGas : public shamrock::solvergraph::INode {
+        using Tscal = shambase::VecComponent<Tvec>;
+        u32 block_size;
+        Tscal gamma;
+
+        public:
+        NodeConsToPrimGas(u32 block_size, Tscal gamma) : block_size(block_size), gamma(gamma) {}
+
+        struct Edges {
+            const shamrock::solvergraph::Indexes<u32> &sizes;
+            const shamrock::solvergraph::FieldSpan<Tscal> &spans_rho;
+            const shamrock::solvergraph::FieldSpan<Tvec> &spans_rhov;
+            const shamrock::solvergraph::FieldSpan<Tscal> &spans_rhoe;
+            shamrock::solvergraph::FieldSpan<Tvec> &spans_vel;
+            shamrock::solvergraph::FieldSpan<Tscal> &spans_P;
+        };
+
+        inline void set_edges(
+            std::shared_ptr<shamrock::solvergraph::Indexes<u32>> sizes,
+            std::shared_ptr<shamrock::solvergraph::FieldSpan<Tscal>> spans_rho,
+            std::shared_ptr<shamrock::solvergraph::FieldSpan<Tvec>> spans_rhov,
+            std::shared_ptr<shamrock::solvergraph::FieldSpan<Tscal>> spans_rhoe,
+            std::shared_ptr<shamrock::solvergraph::FieldSpan<Tvec>> spans_vel,
+            std::shared_ptr<shamrock::solvergraph::FieldSpan<Tscal>> spans_P) {
+            __internal_set_ro_edges({sizes, spans_rho, spans_rhov, spans_rhoe});
+            __internal_set_rw_edges({spans_vel, spans_P});
+        }
+
+        inline Edges get_edges() {
+            return Edges{
+                get_ro_edge<shamrock::solvergraph::Indexes<u32>>(0),
+                get_ro_edge<shamrock::solvergraph::FieldSpan<Tscal>>(1),
+                get_ro_edge<shamrock::solvergraph::FieldSpan<Tvec>>(2),
+                get_ro_edge<shamrock::solvergraph::FieldSpan<Tscal>>(3),
+                get_rw_edge<shamrock::solvergraph::FieldSpan<Tvec>>(0),
+                get_rw_edge<shamrock::solvergraph::FieldSpan<Tscal>>(1),
+            };
+        }
+
+        void _impl_evaluate_internal();
+
+        inline void _impl_reset_internal() {}
+
+        inline virtual std::string _impl_get_label() { return "ConsToPrimGas"; };
+
+        virtual std::string _impl_get_tex();
+    };
+} // namespace shammodels::basegodunov::modules

src/shammodels/ramses/include/shammodels/ramses/modules/NodeBuildTrees.hpp

@@ -0,0 +1,70 @@
+// -------------------------------------------------------//
+//
+// SHAMROCK code for hydrodynamics
+// Copyright (c) 2021-2024 Timothée David--Cléris <[email protected]>
+// SPDX-License-Identifier: CeCILL Free Software License Agreement v2.1
+// Shamrock is licensed under the CeCILL 2.1 License, see LICENSE for more information
+//
+// -------------------------------------------------------//
+
+#pragma once
+
+/**
+ * @file NodeBuildTrees.hpp
+ * @author Timothée David--Cléris ([email protected])
+ * @brief
+ *
+ */
+
+#include "shammodels/ramses/solvegraph/TreeEdge.hpp"
+#include "shamrock/solvergraph/FieldRefs.hpp"
+#include "shamrock/solvergraph/INode.hpp"
+#include "shamrock/solvergraph/Indexes.hpp"
+#include "shamtree/RadixTree.hpp"
+
+namespace shammodels::basegodunov::modules {
+
+    template<class Umorton, class TgridVec>
+    class NodeBuildTrees : public shamrock::solvergraph::INode {
+
+        u32 reduction_level = 0;
+
+        using RTree = RadixTree<Umorton, TgridVec>;
+
+        public:
+        NodeBuildTrees() {}
+
+        struct Edges {
+            const shamrock::solvergraph::Indexes<u32> &sizes;
+            const shamrock::solvergraph::FieldRefs<TgridVec> &block_min;
+            const shamrock::solvergraph::FieldRefs<TgridVec> &block_max;
+            solvergraph::TreeEdge<Umorton, TgridVec> &trees;
+        };
+
+        inline void set_edges(
+            std::shared_ptr<shamrock::solvergraph::Indexes<u32>> sizes,
+            std::shared_ptr<shamrock::solvergraph::FieldRefs<TgridVec>> block_min,
+            std::shared_ptr<shamrock::solvergraph::FieldRefs<TgridVec>> block_max,
+            std::shared_ptr<solvergraph::TreeEdge<Umorton, TgridVec>> trees) {
+            __internal_set_ro_edges({sizes, block_min, block_max});
+            __internal_set_rw_edges({trees});
+        }
+
+        inline Edges get_edges() {
+            return Edges{
+                get_ro_edge<shamrock::solvergraph::Indexes<u32>>(0),
+                get_ro_edge<shamrock::solvergraph::FieldRefs<TgridVec>>(1),
+                get_ro_edge<shamrock::solvergraph::FieldRefs<TgridVec>>(2),
+                get_rw_edge<solvergraph::TreeEdge<Umorton, TgridVec>>(0)};
+        }
+
+        void _impl_evaluate_internal();
+
+        void _impl_reset_internal() {};
+
+        inline virtual std::string _impl_get_label() { return "BuildTrees"; };
+
+        virtual std::string _impl_get_tex();
+    };
+
+} // namespace shammodels::basegodunov::modules