Commit 6e9fd4b5 authored by DeAn Wei's avatar DeAn Wei
Browse files

add specifing equations.

parent a4a5ce77
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ typedef enum{
	FTYPE_AVERAGE_LINES = 0,
    FTYPE_PROC_EXTEND_DIS_DDD,
    FTYPE_PROC_EXTEND_DIS_MD,
    FTYPE_SPECIFY_EQUATIONS,
	FTYPE_MAX
}FTYPE_t;

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@


int ReadTecplotNormalData(string &file, Table_t &table, string &secLine);
void WriteTecplotNormalData(const Table_t &table, const string &file, double precision); 
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);
+2 −0
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ void CleanMgData(MgData_t &mg);
void NormalizeVec(real8 vec[3]);
void StitchTecplotData(vector<Table_t> &tables, Table_t &table, int eigenID = 0);
int DataType(const string &str);
void SpecifyEquations_PLTDATA(InArgs_t *inArgs);
void SpecifyEquations(Table_t &table);


#endif
+2 −2
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ void HandleExtendedDislocation_DDD(InArgs_t *inArgs)
    }

    if(inArgs->outFiles.size() < 3){
        auxFile = "tecdata.plt";
        auxFile = "ss.plt";
    }else{
        auxFile = inArgs->outFiles[2];
    }
@@ -92,7 +92,6 @@ void HandleExtendedDislocation_DDD(InArgs_t *inArgs)
        remeshSize = atof(inArgs->priVars[index].vals[0].c_str());
    }
    printf("The remesh size is %f\n", remeshSize);
    if(inArgs->help)return;

    if(inArgs->auxFiles.size()>0){
        auxTables.resize(inArgs->auxFiles.size());
@@ -107,6 +106,7 @@ void HandleExtendedDislocation_DDD(InArgs_t *inArgs)
        logFile = 1;
        WriteTecplotNormalData(auxTable, auxFile, 10);
    }
    if(inArgs->help)return;

    ofstream out;
    out.open(aveFile.c_str(), ios::out);
+3 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@
#include "MD.h"
#include "Math.h"
#include "Parse.h"
#include "Util.h"

using namespace std;

@@ -337,6 +338,8 @@ int main(int argc, char *argv[])
            case FTYPE_PROC_EXTEND_DIS_MD:
                HandleExtendedDislocation_MD(&inArgs);
                break;
            case FTYPE_SPECIFY_EQUATIONS:
                SpecifyEquations_PLTDATA(&inArgs);
        }

        exit(0);
Loading