remove some extra semicolons (1888b616) · Commits · 郑智淋 / lammps

lib/atc/InterscaleOperators.h

+19 −19

Original line number	Diff line number	Diff line
		@@ -279,7 +279,7 @@ namespace ATC {
		typename std::map<std::string,data * >::iterator it = list.find(tag);
		if (it==list.end()) return NULL;
		return it->second;
		};
		}

		/** helper function to add a data entry to a list */
		template <typename data>
		@@ -290,7 +290,7 @@ namespace ATC {
		throw ATC_Error("Tried to add another Quantity with tag "+tag+" in InterscaleManager::add_quantity");
		typename std::template pair<std::string,data * > myPair(tag,quantity);
		list.insert(myPair);
		};
		}

		/** helper function to add a data entry to a list when it requires neighbor communication*/
		template <typename data>
		@@ -302,7 +302,7 @@ namespace ATC {
		if (quantity->atom_type() == PROC_GHOST) {
		commList.push_back(quantity);
		}
		};
		}

		/** helper function to fina a data entry in a list */
		template <typename data>
		@@ -311,7 +311,7 @@ namespace ATC {
		typename std::map<std::string,data * >::iterator it = list.find(tag);
		if (it!=list.end()) return it->second;
		return NULL;
		};
		}

		/** helper function to force the reset of all data in a list */
		template <typename data>
		@@ -319,7 +319,7 @@ namespace ATC {
		{
		for (typename std::map<std::string,data* >::iterator it = list.begin(); it != list.end(); ++it)
		(it->second)->force_reset();
		};
		}

		/** helper function to set the memory type to temporary of a list */
		template <typename data>
		@@ -327,7 +327,7 @@ namespace ATC {
		{
		for (typename std::map<std::string,data* >::iterator it = list.begin(); it != list.end(); ++it)
		(it->second)->set_memory_type(TEMPORARY);
		};
		}

		/** helper function to perform intialization for dfs of a list */
		template <typename data>
		@@ -336,7 +336,7 @@ namespace ATC {
		for (typename std::map<std::string,data* >::iterator it = list.begin(); it != list.end(); ++it) {
		(it->second)->dfsFound_ = false;
		}
		};
		}

		/** helper function to start the dfs visit for list */
		template <typename data>
		@@ -349,7 +349,7 @@ namespace ATC {
		if ((it->second)->memory_type()==TEMPORARY) list.erase(it++);
		else ++it;
		}
		};
		}

		// PAQ helper functions
		/** helper function to adjust local atom count for all data in a list before exchange, only valid with quantities that do that are aware of atom counts */
		@@ -359,7 +359,7 @@ namespace ATC {
		for (typename std::map<std::string,data* >::iterator it = list.begin(); it != list.end(); ++it) {
		(it->second)->reset_nlocal();
		}
		};
		}

		/** helper function to indicate lammps data is stale for all data in a list before exchange, only valid with PAQs */
		template <typename data>
		@@ -367,7 +367,7 @@ namespace ATC {
		{
		for (typename std::map<std::string,data* >::iterator it = list.begin(); it != list.end(); ++it)
		(it->second)->lammps_force_reset();
		};
		}

		/** helper function to size all data in a list, only valid with comm lists */
		template <typename data>
		@@ -375,7 +375,7 @@ namespace ATC {
		{
		for (typename std::vector<data* >::iterator it = list.begin(); it != list.end(); ++it)
		(*it)->quantity();
		};
		}

		/** helper function to pack all data in a list before exchange, only valid with quantities that do work before parallel communication */
		template <typename data>
		@@ -384,7 +384,7 @@ namespace ATC {
		for (typename std::map<std::string,data* >::iterator it = list.begin(); it != list.end(); ++it) {
		(it->second)->prepare_exchange();
		}
		};
		}

		/** helper function to extract all data in a list after exchange, only valid with quantities that do work after parallel communication */
		template <typename data>
		@@ -393,7 +393,7 @@ namespace ATC {
		for (typename std::map<std::string,data* >::iterator it = list.begin(); it != list.end(); ++it) {
		(it->second)->post_exchange();
		}
		};
		}

		/** helper function to determine memory usage of all data in a list, only valid with PAQs */
		template <typename data>
		@@ -401,7 +401,7 @@ namespace ATC {
		{
		for (typename std::map<std::string,data* >::const_iterator it = list.begin(); it != list.end(); ++it)
		usage += (it->second)->memory_usage();
		};
		}

		/** helper function to pack arrays of all data before exchange in a list, only valid with PAQs */
		template <typename data>
		@@ -410,7 +410,7 @@ namespace ATC {
		for (typename std::map<std::string,data* >::iterator it = list.begin(); it != list.end(); ++it) {
		index += (it->second)->pack_exchange(i,&buffer[index]);
		}
		};
		}

		/** helper function to unpack arrays of all data after exchange in a list, only valid with PAQs */
		template <typename data>
		@@ -418,7 +418,7 @@ namespace ATC {
		{
		for (typename std::map<std::string,data* >::iterator it = list.begin(); it != list.end(); ++it)
		index += (it->second)->unpack_exchange(i,&buffer[index]);
		};
		}

		/** helper function to pack arrays of all data in a list, only valid with comm lists */
		template <typename data>
		@@ -427,7 +427,7 @@ namespace ATC {
		{
		for (typename std::vector<data* >::iterator it = list.begin(); it != list.end(); ++it)
		size += (*it)->pack_comm(index,&buf[size],pbc_flag,pbc);
		};
		}

		/** helper function to unpack arrays of all data in a list, only valid with comm lists */
		template <typename data>
		@@ -435,7 +435,7 @@ namespace ATC {
		{
		for (typename std::vector<data* >::iterator it = list.begin(); it != list.end(); ++it)
		size += (*it)->unpack_comm(index,&buf[size]);
		};
		}

		/** helper function to grow arrays of all data in a list, only valid with PAQs */
		template <typename data>
		@@ -443,7 +443,7 @@ namespace ATC {
		{
		for (typename std::map<std::string,data* >::iterator it = list.begin(); it != list.end(); ++it)
		(it->second)->grow_lammps_array(nmax,prefix_+it->first);
		};
		}

		/** helper function to copy arrays of all data in a list, only valid with PAQs */
		template <typename data>

lib/colvars/colvar_UIestimator.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -731,6 +731,6 @@ namespace UIestimator {
		}
		}
		};
		};
		}

		#endif

Admin message