1. Remove Input_Item::value_read_size and Input_List::check_value_size() temporarily.

Author: PeizeLin

source/src_io/CMakeLists.txt

@@ -24,6 +24,11 @@ add_library(
     read_dm.cpp
     read_rho.cpp
     read_txt_tools.cpp
+    read_txt_input_value.cpp
+	read_txt_input_list.cpp
+	read_txt_input_process.cpp
+	read_txt_input-general.cpp
+	read_txt_input-pw.cpp
     read_txt_stru.cpp
     restart.cpp
     rwstream.cpp

source/src_io/read_txt_input-general.cpp

@@ -1,3 +1,8 @@
+//=======================
+// AUTHOR : Peize Lin
+// DATE :   2021-12-13
+//=======================
+
 #include "read_txt_input_list.h"
 
 #include "src_io/read_txt_tools.h"
@@ -17,7 +22,6 @@ namespace Read_Txt_Input
 			item.annotation = "1: single spin; 2: up and down spin; 4: noncollinear spin";
 			item.check_transform = [](Input_Item &self)
 			{
-				Input_List::check_value_size(self, 1);
 				if(!Read_Txt_Tools::in_set(self.values[0].geti(), {1,2,4}))
 					throw std::invalid_argument("nspin must be 1,2,4");
 			};
@@ -34,7 +38,6 @@ namespace Read_Txt_Input
 			item.annotation = "atom species number";
 			item.check_transform = [](Input_Item &self)
 			{
-				Input_List::check_value_size(self, 1);
 				if(self.values[0].geti()<=0)
 					throw std::invalid_argument("ntype must > 0");
 			};
@@ -51,7 +54,6 @@ namespace Read_Txt_Input
 			item.annotation = "turn symmetry on or off";
 			item.check_transform = [](Input_Item &self)
 			{
-				Input_List::check_value_size(self, 1);
 				if(!Read_Txt_Tools::in_set( self.values[0].gets(), Read_Txt_Tools::Preset::Bool))
 					throw std::invalid_argument("symmetry must be bool");
 			};

source/src_io/read_txt_input-pw.cpp

@@ -1,3 +1,8 @@
+//=======================
+// AUTHOR : Peize Lin
+// DATE :   2021-12-13
+//=======================
+
 #include "read_txt_input_list.h"
 
 #include "module_base/constants.h"
@@ -16,7 +21,6 @@ namespace Read_Txt_Input
 			item.annotation = "energy cutoff for wave functions";
 			item.check_transform = [](Input_Item &self)
 			{
-				Input_List::check_value_size(self, 1, 2);
 				if(self.values[1].gets()=="eV"){}
 				else if(self.values[1].gets()=="Ry")
 					self.values[0].setd( self.values[0].getd() / ModuleBase::Ry_to_eV );

source/src_io/read_txt_input_item-template.h

@@ -1,3 +1,8 @@
+//=======================
+// AUTHOR : Peize Lin
+// DATE :   2021-12-13
+//=======================
+
 #ifndef READ_TXT_INPUT_ITEM_TEMPLATE_H
 #define READ_TXT_INPUT_ITEM_TEMPLATE_H
 

source/src_io/read_txt_input_item.h

@@ -1,3 +1,8 @@
+//=======================
+// AUTHOR : Peize Lin
+// DATE :   2021-12-13
+//=======================
+
 #ifndef READ_TXT_INPUT_ITEM_H
 #define READ_TXT_INPUT_ITEM_H
 
@@ -37,7 +42,7 @@ namespace Read_Txt_Input
 
 	private:
 		std::string label;
-		int value_read_size = -1;
+		//int value_read_size = -1;
 
 		friend class Input_List;
 		friend class Input_Process;

source/src_io/read_txt_input_list.cpp

@@ -1,5 +1,9 @@
-#include "read_txt_input_list.h"
+//=======================
+// AUTHOR : Peize Lin
+// DATE :   2021-12-13
+//=======================
 
+#include "read_txt_input_list.h"
 
 namespace Read_Txt_Input
 {
@@ -9,6 +13,7 @@ namespace Read_Txt_Input
 		add_order.push_back(input_item.label);
 	}
 
+	/*
 	void Input_List::check_value_size(const Input_Item& input_item, const int size)
 	{
 		if(input_item.value_read_size==-1)
@@ -24,6 +29,7 @@ namespace Read_Txt_Input
 		if(input_item.value_read_size<size_low || input_item.value_read_size>size_up)
 			throw std::out_of_range(std::to_string(input_item.value_read_size)+std::to_string(size_low)+std::to_string(size_up));
 	}
+	*/
 
 	void Input_List::set_items()
 	{

source/src_io/read_txt_input_list.h

@@ -1,3 +1,8 @@
+//=======================
+// AUTHOR : Peize Lin
+// DATE :   2021-12-13
+//=======================
+
 #ifndef READ_TXT_INIPUT_LIST_H
 #define READ_TXT_INIPUT_LIST_H
 
@@ -16,8 +21,8 @@ namespace Read_Txt_Input
 
 	private:	
 		void add_item(const Input_Item &input_item);
-		static void check_value_size(const Input_Item& input_item, const int size);
-		static void check_value_size(const Input_Item& input_item, const int size_low, const int size_up);
+		//static void check_value_size(const Input_Item& input_item, const int size);
+		//static void check_value_size(const Input_Item& input_item, const int size_low, const int size_up);
 
 		std::map<std::string, Input_Item> list;
 		std::vector<std::string> add_order;

source/src_io/read_txt_input_process.cpp

@@ -1,3 +1,8 @@
+//=======================
+// AUTHOR : Peize Lin
+// DATE :   2021-12-13
+//=======================
+
 #include "read_txt_input_process.h"
 
 #include "src_io/read_txt_tools.h"
@@ -35,11 +40,16 @@ namespace Read_Txt_Input
 			const auto ptr = input.list.find(input_read.first);
 			if(ptr==input.list.end())
 				throw std::out_of_range("input_read.first");
-			if(input_read.second.size() > ptr->second.values.size())
-				throw std::out_of_range("size error");
+
+			//if(input_read.second.size() > ptr->second.values.size())
+			if(input_read.second.size() != ptr->second.values.size())
+				throw std::out_of_range(
+					"size of INPUT "+ptr->second.label+" needs "+std::to_string(ptr->second.values.size())
+					+" but reads "+std::to_string(input_read.second.size()));
+
 			for(size_t i=0; i<input_read.second.size(); ++i)
 				ptr->second.values[i].sets(input_read.second[i]);
-			ptr->second.value_read_size = input_read.second.size();
+			//ptr->second.value_read_size = input_read.second.size();
 		}
 	}
 

source/src_io/read_txt_input_process.h

@@ -1,3 +1,8 @@
+//=======================
+// AUTHOR : Peize Lin
+// DATE :   2021-12-13
+//=======================
+
 #ifndef READ_TXT_INIPUT_PROCESS_H
 #define READ_TXT_INIPUT_PROCESS_H
 

source/src_io/read_txt_input_value.cpp

@@ -1,3 +1,8 @@
+//=======================
+// AUTHOR : Peize Lin
+// DATE :   2021-12-13
+//=======================
+
 #include "read_txt_input_value.h"
 
 #include "src_io/read_txt_tools.h"