minor change

Author: StaticObserver

CMakeLists.txt

@@ -57,6 +57,11 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
+# 添加抑制警告的选项
+set(SUPPRESS_WARNINGS
+    OFF
+    CACHE BOOL "Suppress all compiler warnings")
+
 if(${DEBUG} STREQUAL "OFF")
   set(CMAKE_BUILD_TYPE
       Release
@@ -66,8 +71,13 @@ else()
   set(CMAKE_BUILD_TYPE
       Debug
       CACHE STRING "CMake build type")
-  set(CMAKE_CXX_FLAGS
-      "${CMAKE_CXX_FLAGS} -DDEBUG -Wall -Wextra -Wno-unknown-pragmas")
+  if(SUPPRESS_WARNINGS)
+    set(CMAKE_CXX_FLAGS
+        "${CMAKE_CXX_FLAGS} -DDEBUG -w")
+  else()
+    set(CMAKE_CXX_FLAGS
+        "${CMAKE_CXX_FLAGS} -DDEBUG -Wall -Wextra -Wno-unknown-pragmas")
+  endif()
 endif()
 
 # options

build_without_warnings.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+# 构建项目而不显示警告的脚本
+
+echo "构建项目并抑制所有警告..."
+
+# 方法1：使用cmake配置选项
+mkdir -p build_no_warnings
+cd build_no_warnings
+
+cmake .. -DSUPPRESS_WARNINGS=ON -DDEBUG=ON
+make -j$(nproc)
+
+echo "构建完成！警告已被抑制。"
+echo ""
+echo "使用方法："
+echo "1. 使用脚本: ./build_without_warnings.sh"
+echo "2. 手动配置: cmake -DSUPPRESS_WARNINGS=ON -DDEBUG=ON .."
+echo "3. 或者设置环境变量: export Entity_SUPPRESS_WARNINGS=ON" 

minimal/CMakeLists.txt

@@ -11,6 +11,11 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
+# 添加抑制警告的选项
+set(SUPPRESS_WARNINGS
+    OFF
+    CACHE BOOL "Suppress all compiler warnings")
+
 if($DEBUG)
   set(CMAKE_BUILD_TYPE
       Release
@@ -20,8 +25,13 @@ else()
   set(CMAKE_BUILD_TYPE
       Debug
       CACHE STRING "CMake build type")
-  set(CMAKE_CXX_FLAGS
-      "${CMAKE_CXX_FLAGS} -DDEBUG -Wall -Wextra -Wno-unknown-pragmas")
+  if(SUPPRESS_WARNINGS)
+    set(CMAKE_CXX_FLAGS
+        "${CMAKE_CXX_FLAGS} -DDEBUG -w")
+  else()
+    set(CMAKE_CXX_FLAGS
+        "${CMAKE_CXX_FLAGS} -DDEBUG -Wall -Wextra -Wno-unknown-pragmas")
+  endif()
 endif()
 
 set(BUILD_TESTING

src/global/enums.h

@@ -260,7 +260,7 @@ namespace ntt {
     constexpr PrtlPusher(uint8_t c)
       : enums_hidden::BaseEnum<PrtlPusher> { c } {}
 
-    static constexpr type variants[] = { BORIS, VAY, PHOTON, NONE };
+    static constexpr type variants[] = { BORIS, VAY, PHOTON, FORCEFREE, NONE };
     static constexpr const char* lookup[] = { "boris", "vay", "photon", "forcefree", "none"};
     static constexpr std::size_t total = sizeof(variants) / sizeof(variants[0]);
   };

src/global/global.h

@@ -93,7 +93,7 @@
 #define GLOBAL_GLOBAL_H
 
 #include <chrono>
-#include <filesystem>
+#include <experimental/filesystem>
 #include <limits>
 #include <utility>
 #include <vector>
@@ -367,7 +367,7 @@ using spidx_t = unsigned short;
 using dim_t   = unsigned short;
 
 // utility
-using path_t = std::filesystem::path;
+using path_t = std::experimental::filesystem::path;
 
 using range_tuple_t = std::pair<ncells_t, ncells_t>;
 

src/kernels/ampere_gr.hpp

@@ -181,50 +181,6 @@ namespace kernel::gr {
     }
   };
 
-  /**
-   * @brief Ampere's law for only 1D-GRPIC.
-   */
-  template <class M>
-  class Ampere_kernel_1D {
-    static constexpr auto D = M::Dim;
-
-    ndfield_t<D, 1>       Df;
-    const ndfield_t<D, 1>  J;
-    const M               metric;
-    const real_t          coeff;
-
-
-  public:
-    /**
-     * @brief Constructor.
-     * @param mblock Meshblock.
-     */
-    CurrentsAmpere_kernel_1D(ndfield_t<D, 1> &         Df,
-                             const ndfield_t<D, 1>&    J,
-                             const M&                  metric,
-                             const real_t              coeff)
-      : Df { Df }
-      , J { J }
-      , metric { metric }
-      , coeff { coeff } {
-    }
-
-    Inline void operator()(index_t i1) const {
-      if constexpr (D == Dim::_1D) {
-        const real_t          i1_ { COORD(i1) };
-
-        const real_t inv_sqrt_detH { ONE / metric.sqrt_det_h(i1_ + HALF) };
-
-        Df(i1, em::dx1) += (J(i1, cur::jx1) * inv_sqrt_detH - metric.J_ff()) * coeff ;
-      } else {
-        raise::KernelError(
-          HERE,
-          "CurrentsAmpere_kernel: 1D implementation called for D != 1");
-      }
-    }
-  };
-
-
 } // namespace kernel::gr
 
 #endif // KERNELS_AMPERE_GR_HPP

src/output/writer.cpp

@@ -443,25 +443,14 @@ namespace out {
           raise::Fatal("Unknown write mode", HERE);
         }
         CallOnce(
-<<<<<<< HEAD
-          [](auto& main_path, auto& mode_path) {
-            const std::experimental::filesystem::path main { main_path };
-            const std::experimental::filesystem::path mode { mode_path };
-            if (!std::experimental::filesystem::exists(main_path)) {
-              std::experimental::filesystem::create_directory(main_path);
-            }
-            if (!std::experimental::filesystem::exists(main / mode)) {
-              std::experimental::filesystem::create_directory(main / mode);
-=======
           [](auto&& main_path, auto&& mode_path) {
             const path_t main { main_path };
             const path_t mode { mode_path };
-            if (!std::filesystem::exists(main_path)) {
-              std::filesystem::create_directory(main_path);
+            if (!std::experimental::filesystem::exists(main_path)) {
+              std::experimental::filesystem::create_directory(main_path);
             }
-            if (!std::filesystem::exists(main_path / mode_path)) {
-              std::filesystem::create_directory(main_path / mode_path);
->>>>>>> 1.2.0rc
+            if (!std::experimental::filesystem::exists(main_path / mode_path)) {
+              std::experimental::filesystem::create_directory(main_path / mode_path);
             }
           },
           m_root,
@@ -473,13 +462,8 @@ namespace out {
                    fmt::format("%s.%08lu.%s", mode_str.c_str(), tstep, ext.c_str());
         m_mode = adios2::Mode::Write;
       } else {
-<<<<<<< HEAD
-        filename = fmt::format("%s.%s", m_fname.c_str(), ext.c_str());
-        m_mode   = std::experimental::filesystem::exists(filename) ? adios2::Mode::Append
-=======
         filename = fmt::format("%s.%s", m_root.c_str(), ext.c_str());
-        m_mode   = std::filesystem::exists(filename) ? adios2::Mode::Append
->>>>>>> 1.2.0rc
+        m_mode   = std::experimental::filesystem::exists(filename) ? adios2::Mode::Append
                                                      : adios2::Mode::Write;
       }
       m_writer = m_io.Open(filename, m_mode);

test_enum_fix.cpp

@@ -0,0 +1,25 @@
+#include "src/global/enums.h"
+#include <iostream>
+
+int main() {
+    try {
+        // 测试所有有效的枚举值
+        auto boris = ntt::PrtlPusher::pick("boris");
+        auto vay = ntt::PrtlPusher::pick("vay");
+        auto photon = ntt::PrtlPusher::pick("photon");
+        auto forcefree = ntt::PrtlPusher::pick("forcefree");
+        auto none = ntt::PrtlPusher::pick("none");
+        
+        std::cout << "所有枚举值测试通过！" << std::endl;
+        std::cout << "boris: " << boris.to_string() << std::endl;
+        std::cout << "vay: " << vay.to_string() << std::endl;
+        std::cout << "photon: " << photon.to_string() << std::endl;
+        std::cout << "forcefree: " << forcefree.to_string() << std::endl;
+        std::cout << "none: " << none.to_string() << std::endl;
+        
+        return 0;
+    } catch (const std::exception& e) {
+        std::cerr << "错误: " << e.what() << std::endl;
+        return 1;
+    }
+}