Commit 29a1ce81 authored by DeAn_Wei's avatar DeAn_Wei
Browse files

finsh AverageLines function

parent c2d625ab

CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) 


Message (STATUS "PRODATA_BINARY_DIR = " ${PRODATA_BINARY_DIR})

Message (STATUS "PRODATA_SOURCE_DIR = " ${PRODATA_SOURCE_DIR})

Message (STATUS "HOME = " ${ENV_HOME})

Message (STATUS "HOME = " $ENV{HOME})



Set(CMAKE_C_COMPILER "mpicc")

Set(CMAKE_CXX_COMPILER "mpicxx")

include/Math.h

+2 −0
Original line number Diff line number Diff line
@@ -20,4 +20,6 @@ 
#include <numeric>





void AverageLines(InArgs_t *inArgs);



#endif

include/ReadData.h→include/Parse.h

+5 −2
Original line number Diff line number Diff line 
#ifndef _READDATA_h

#define _READDATA_h

#ifndef _PARSE_h

#define _PARSE_h



#include <stdio.h>

#include <stdarg.h>
@@ -19,6 +19,9 @@ 
#include <algorithm>

#include <numeric>



#include <iomanip>





vector<string> GetFiles(const string &file);



#endif

src/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line 
Set (SRCS 

    Main.cpp  ReadData.cpp  Util.cpp Math.cpp HandleExtendedDislocation.cpp

    WriteData.cpp )

    WriteData.cpp Parse.cpp)



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

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 " )

src/HandleExtendedDislocation.cpp

+0 −1
Original line number Diff line number Diff line
@@ -144,7 +144,6 @@ void HandleExtendedDislocation(InArgs_t *inArgs) 
    }



    swap(list.data, data);

    printf("separation is %f\n", separation);

    fileName = inArgs->outFiles[0] + "." + to_string(separation);

    WriteTecplotNormalData(list, fileName, 10);
Impressum   Privacy Policy   WW8 Homepage   Explore   Help