1. move Custom.cpp into dir custom (ffa4273d) · Commits · DeAn Wei / prodata

src/Custom.cpp→custom/Custom.cpp

+35 −0

Original line number	Diff line number	Diff line

		#include "Home.h"
		#include "Util.h"
		#include "ProDataIO.h"


		void SpecifyEquations1(Table_t &table)
		{
		int i, j;
		int i;
		real8 tau;

		int colBurgID = GetColIDFromTable(table, "burgID");
		int colIndex = GetColIDFromTable(table, "index");
		vector<vector<double> >::iterator it;
		int colSeparation = GetColIDFromTable(table, "separation");

		for(i=0; i<table.data.size(); i++){
		real8 &burgID = table.data[i][colBurgID];
		real8 &index = table.data[i][colIndex];
		for(it = table.data.begin(); it != table.data.end(); ){

		if(burgID > 6.5){
		if(burgID == 7 \|\| burgID == 12 \|\| burgID == 17){
		burgID = -1;
		}else{
		burgID = 7;
		}
		if((*it)[colSeparation] < 25){
		table.data.erase(it);
		continue;
		}

		it++;
		}

		return;
		}


		void SpecifyEquations(Table_t &table)
		{
		int i, j;

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ typedef struct {
		vector<string> bounds;
		vector<string> variables;
		vector<Atom_t> atom;
		}MgData_t;
		}Dump_t;

		void HandleExtendedDislocation_MD(InArgs_t *inArgs);
		void GenerateDislocation(InArgs_t *inArgs);

+3 −3

Original line number	Diff line number	Diff line
		@@ -27,9 +27,9 @@ int ReadTecplotNormalData(string &file, Table_t &table, string &secLine);
		void WriteTecplotNormalData(const Table_t &table, const string &file, double precision, string secLine = "");
		void WriteTecplotNormalData(const LineList_t &list, const string &file,
		double precision = 6);
		int ReadMGDataFile(const string &file, MgData_t &mgdata);
		int ReadDumpFile(const string &file, Dump_t &dum);
		int ReadDataFromMDLogFile(const vector<string> &files, LineList_t &list);
		int WriteMGDataFile(const string &file, MgData_t &mg, int precision = 6);
		int MGToLMPDataFile(const string &file, MgData_t &mg, int precision = 10);
		int WriteDumpFile(const string &file, Dump_t &dum, int precision = 6);
		int MGToLMPDataFile(const string &file, Dump_t &dum, int precision = 10);

		#endif

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ void ZImage(real8 boundMin[3], real8 boundMax[3], real8 x, real8 y, real8 *z);
		real8 LinearInterpolation(const Curve_t &curve, real8 x, real8 min = -1, real8 max = -1);
		void SwapTable(Table_t &table);
		void SwapLineList(LineList_t &list);
		void CleanMgData(MgData_t &mg);
		void CleanDump(Dump_t &dum);
		void NormalizeVec(real8 vec[3]);
		void StitchTecplotData(vector<Table_t> &tables, Table_t &table, int eigenID = 0);
		int DataType(const string &str);

+1 −1

Original line number	Diff line number	Diff line
		Set (SRCS
		Main.cpp ReadData.cpp Util.cpp Math.cpp HandleExtendedDislocation.cpp
		WriteData.cpp Parse.cpp GenerateDislocation.cpp
		Custom.cpp)
		../custom/Custom.cpp)

		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -Wno-unknown-pragmas -DPARALLEL=1 " )
		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 " )