Fixing conflict for release 1.0.0

CHANGELOG.md

Jenkins_sec_OS

Jenkinsfile_numerics

build.sh

build_pdata.sh

build_sec_OS.sh

configure.ac

example/Grid/0_simple/main.cpp

example/Grid/1_stencil/main.cpp

example/Grid/2_solve_eq/main.cpp

example/Grid/3_gray_scott/main.cpp

example/Grid/3_gray_scott_3d/Makefile

example/Grid/3_gray_scott_3d/config.cfg

example/Grid/3_gray_scott_3d/main.cpp

...le/Numerics/Stoke_flow/0_2D_incompressible/main_eigen.cpp

...le/Numerics/Stoke_flow/0_2D_incompressible/main_petsc.cpp

...le/Numerics/Stoke_flow/1_3D_incompressible/main_eigen.cpp

...le/Numerics/Stoke_flow/1_3D_incompressible/main_petsc.cpp

example/Numerics/Vortex_in_cell/Makefile

example/Numerics/Vortex_in_cell/main_vic.cpp