1. add global functions in class Input_Process

Author: PeizeLin

source/Makefile.Objects

@@ -250,6 +250,7 @@ read_txt_stru.o\
 read_txt_input_value.o\
 read_txt_input_list.o\
 read_txt_input_process.o\
+read_txt_input_process_global.o\
 read_txt_input-general.o\
 read_txt_input-pw.o\
 write_pot.o\

source/src_io/CMakeLists.txt

@@ -27,6 +27,7 @@ add_library(
     read_txt_input_value.cpp
 	read_txt_input_list.cpp
 	read_txt_input_process.cpp
+	read_txt_input_process_global.cpp
 	read_txt_input-general.cpp
 	read_txt_input-pw.cpp
     read_txt_stru.cpp

source/src_io/read_txt_input_item.h

@@ -27,14 +27,14 @@ namespace Read_Txt_Input
 		template<typename T>
 		void default_1(const T &value);
 		template <typename T_head, typename... T_tail>
-		void default_1( const T_head &value_head, const T_tail... values_tail);
+		void default_1(const T_head &value_head, const T_tail... values_tail);
 
 		// set these variables and functions
 		std::string annotation;
 		std::function<void(Input_Item&)> check_transform
 			= [](Input_Item&self){};
-		std::function<void(const std::map<std::string, Input_Item>&)> default2
-			= [](const std::map<std::string, Input_Item>&list){};
+		std::function<void(Input_Item&, const std::map<std::string, Input_Item>&)> default_2
+			= [](Input_Item&self, const std::map<std::string, Input_Item>&list){};
 		std::function<void(const Input_Item&)> convert
 			= [](const Input_Item&item){};
 

source/src_io/read_txt_input_process.cpp

@@ -24,7 +24,7 @@ namespace Read_Txt_Input
 		{
 			this->read(file_name);
 			this->check_transform();
-			this->default2();
+			this->default_2();
 			this->out(GlobalV::global_out_dir + file_name);
 		}
 		this->bcast();
@@ -37,8 +37,8 @@ namespace Read_Txt_Input
 			= Read_Txt_Tools::read_file_to_map(file_name, {"#","\\"}, true);
 		for(const auto & input_read : inputs_read)
 		{
-			const auto ptr = input.list.find(input_read.first);
-			if(ptr==input.list.end())
+			const auto ptr = this->input.list.find(input_read.first);
+			if(ptr==this->input.list.end())
 				throw std::out_of_range("input_read.first");
 
 			//if(input_read.second.size() > ptr->second.values.size())
@@ -55,7 +55,7 @@ namespace Read_Txt_Input
 
 	void Input_Process::check_transform()
 	{
-		for(auto &item : input.list)
+		for(auto &item : this->input.list)
 		{
 			item.second.check_transform(item.second);
 
@@ -68,21 +68,23 @@ namespace Read_Txt_Input
 				}
 			}
 		}
+		this->check_transform_global(this->input.list);
 	}
 
-	void Input_Process::default2()
+	void Input_Process::default_2()
 	{
-		for(auto &item : input.list)
-			item.second.default2(input.list);
+		for(auto &item : this->input.list)
+			item.second.default_2(item.second, this->input.list);
+		this->default_2_global(this->input.list);
 	}
 
 	void Input_Process::out(const std::string &file_name) const
 	{
 		std::ofstream ofs(file_name);
-		for(const std::string &label : input.output_labels)
+		for(const std::string &label : this->input.output_labels)
 		{
-			const auto ptr = input.list.find(label);
-			if(ptr==input.list.end())
+			const auto ptr = this->input.list.find(label);
+			if(ptr==this->input.list.end())
 			{
 				ofs<<std::endl<<"# "<<label<<std::endl;
 			}
@@ -121,7 +123,7 @@ namespace Read_Txt_Input
 			std::stringstream ss;
 			{
 				cereal::BinaryOutputArchive ar(ss);
-				ar(input.list);
+				ar(this->input.list);
 			}
 			const int size = ss.str().size();
 			MPI_Bcast( const_cast<int*>(&size), 1, MPI_INT, 0, MPI_COMM_WORLD );
@@ -137,7 +139,7 @@ namespace Read_Txt_Input
 			ss.rdbuf()->pubsetbuf(c.data(),size);
 			{
 				cereal::BinaryInputArchive ar(ss);
-				ar(input.list);
+				ar(this->input.list);
 			}
 		}
 #else
@@ -147,7 +149,8 @@ namespace Read_Txt_Input
 
 	void Input_Process::convert()
 	{
-		for(auto &item : input.list)
+		for(auto &item : this->input.list)
 			item.second.convert(item.second);
+		this->convert_global(this->input.list);
 	}
 }

source/src_io/read_txt_input_process.h

@@ -18,12 +18,17 @@ namespace Read_Txt_Input
 
 	private:
 		Input_List &input;
+
 		void read(const std::string &file_name);
 		void check_transform();
-		void default2();
+		void default_2();
 		void out(const std::string &file_name) const;
 		void bcast();
-		void convert();		
+		void convert();
+
+		void check_transform_global(std::map<std::string, Input_Item> &list);
+		void default_2_global(std::map<std::string, Input_Item> &list);
+		void convert_global(const std::map<std::string, Input_Item> &list);
 	};
 }
 

source/src_io/read_txt_input_process_global.cpp

@@ -0,0 +1,19 @@
+#include "read_txt_input_process.h"
+
+namespace Read_Txt_Input
+{
+	void Input_Process::check_transform_global(std::map<std::string, Input_Item> &list)
+	{
+
+	}
+
+	void Input_Process::default_2_global(std::map<std::string, Input_Item> &list)
+	{
+
+	}
+
+	void Input_Process::convert_global(const std::map<std::string, Input_Item> &list)
+	{
+
+	}
+}