Fixing CLI for lbm unitoform.

Autodesk · Oct 10, 2023 · 2e533ab · 2e533ab
1 parent 4e690c6
commit 2e533ab
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/benchmarks/lbm/src/Config.h b/benchmarks/lbm/src/Config.h
@@ -36,7 +36,7 @@ struct Config
 
     Neon::skeleton::OccUtils::Cli                         occCli{Neon::skeleton::Occ::none};              // Neon OCC type
     Neon::set::TransferModeUtils::Cli                     transferModeCli{Neon::set::TransferMode::get};  // Neon transfer mode for halo update
-    Neon::set::StencilSemanticUtils::Cli                  stencilSemanticCli{Neon::set::StencilSemantic::streaming};
+    Neon::set::StencilSemanticUtils::Cli                  stencilSemanticCli{Neon::set::StencilSemantic::lattice};
     Neon::domain::tool::spaceCurves::EncoderTypeUtil::Cli spaceCurveCli{Neon::domain::tool::spaceCurves::EncoderType::sweep};
     CollisionUtils::Cli                                   collisionCli{Collision::bgk};
     int                                                   vti = 0;  // Export vti file

diff --git a/libNeonSet/include/Neon/set/StencilSemantic.h b/libNeonSet/include/Neon/set/StencilSemantic.h
@@ -10,7 +10,7 @@ namespace Neon::set {
 enum struct StencilSemantic
 {
     standard = 0 /*<  Transfer for halo update on grid structure    */,
-    streaming = 1 /*< Transfer for halo update on lattice structure */
+    lattice = 1 /*< Transfer for halo update on lattice structure */
 };
 
 

diff --git a/libNeonSet/include/Neon/set/container/Loader_imp.h b/libNeonSet/include/Neon/set/container/Loader_imp.h
@@ -115,7 +115,7 @@ auto Loader::
 
             if (compute == Neon::Pattern::STENCIL &&
                 (stencilSemantic == StencilSemantic::standard ||
-                 stencilSemantic == StencilSemantic::streaming)) {
+                 stencilSemantic == StencilSemantic::lattice)) {
                 Neon::NeonException exp("Loader");
                 exp << "Loading a non const field for a stencil operation is not supported in Neon";
                 NEON_THROW(exp);

diff --git a/libNeonSet/src/set/StencilSemantic.cpp b/libNeonSet/src/set/StencilSemantic.cpp
@@ -5,19 +5,19 @@ namespace Neon::set {
 auto StencilSemanticUtils::toString(StencilSemantic option) -> std::string
 {
     switch (option) {
-        case StencilSemantic::streaming: {
-            return "streaming";
+        case StencilSemantic::lattice: {
+            return "lattice";
         }
         case StencilSemantic::standard: {
-            return "grid";
+            return "standard";
         }
     }
     NEON_THROW_UNSUPPORTED_OPTION("");
 }
 
 auto StencilSemanticUtils::fromString(const std::string& occ) -> StencilSemantic
 {
-    std::array<StencilSemantic, 2> opts{StencilSemantic::standard, StencilSemantic::streaming};
+    std::array<StencilSemantic, 2> opts{StencilSemantic::standard, StencilSemantic::lattice};
     for (auto a : opts) {
         if (toString(a) == occ) {
             return a;
@@ -28,7 +28,7 @@ auto StencilSemanticUtils::fromString(const std::string& occ) -> StencilSemantic
 
 auto StencilSemanticUtils::getOptions() -> std::array<StencilSemantic, nOptions>
 {
-    std::array<StencilSemantic, nOptions> opts = {StencilSemantic::standard, StencilSemantic::streaming};
+    std::array<StencilSemantic, nOptions> opts = {StencilSemantic::standard, StencilSemantic::lattice};
     return opts;
 }