modify global_function & its UT

Author: root

source/module_base/global_function.cpp

@@ -23,6 +23,7 @@ namespace GlobalFunc
 
 void NOTE(const std::string &words)
 {
+    return;
     if (GlobalV::ofs_running)
     {
         // GlobalV::ofs_running << " *********************************************************************************"
@@ -33,7 +34,6 @@ void NOTE(const std::string &words)
         GlobalV::ofs_running << " !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
                              << std::endl;
     }
-    return;
 }
 
 void NEW_PART(const std::string &words)
@@ -115,8 +115,7 @@ void DONE(std::ofstream &ofs, const std::string &description, const bool only_ra
 void TEST_LEVEL(const std::string &name)
 {
     bool disable = true;
-    if (disable)
-        return;
+    if (disable) return;
 
     if (name == "none")
     {
@@ -253,8 +252,7 @@ size_t MemAvailable()
             mem_sum += std::stol(size);
             ++i;
         }
-        if (i == 3)
-            return mem_sum;
+        if (i == 3) return mem_sum;
     }
     throw std::runtime_error("read /proc/meminfo error in " + TO_STRING(__FILE__) + " line " + TO_STRING(__LINE__));
 }

source/module_base/test/global_function_test.cpp

@@ -13,8 +13,6 @@
 
 /**
  * - Tested Function
- * - Note
- *   - print out warning info in running.log file
  * - NewPart
  *   - note the start of new calculation part
  * - OutV1
@@ -45,6 +43,8 @@
  *   - copy vector
  * - VectorToPointer
  *   - get the first pointer of (const) vector or valarray
+ * - Note
+ *   - print out warning info in running.log file
  */
 
 inline void EXPECT_COMPLEX_EQ(const std::complex<double>& a, const std::complex<double>& b)
@@ -76,18 +76,6 @@ class GlobalFunctionTest : public testing::Test
     }
 };
 
-TEST_F(GlobalFunctionTest, Note)
-{
-    ModuleBase::GlobalFunc::NOTE("Wrong Settings!");
-    GlobalV::ofs_running.close();
-    ifs.open("running.log");
-    getline(ifs, output);
-    getline(ifs, output);
-    // output in runnint.log file
-    EXPECT_THAT(output, testing::HasSubstr("Wrong Settings!"));
-    ifs.close();
-}
-
 TEST_F(GlobalFunctionTest, NewPart)
 {
     ModuleBase::GlobalFunc::NEW_PART("New Part Starts ...");
@@ -296,3 +284,17 @@ TEST_F(GlobalFunctionTest, VectorToPointer)
     const std::valarray<double> dd(1.0, size);
     EXPECT_EQ(ModuleBase::GlobalFunc::VECTOR_TO_PTR(dd), &dd[0]);
 }
+
+/*
+TEST_F(GlobalFunctionTest, Note)
+{
+    ModuleBase::GlobalFunc::NOTE("Wrong Settings!");
+    GlobalV::ofs_running.close();
+    ifs.open("running.log");
+    getline(ifs, output);
+    getline(ifs, output);
+    // output in runnint.log file
+    EXPECT_THAT(output, testing::HasSubstr("Wrong Settings!"));
+    ifs.close();
+}
+*/