handling new merge
8729f1657fc2
Actions

Authored by Christoph Schaefer <cerschae@greina13.cm.cluster> on Nov 19 2018, 14:57.

Description

handling new merge

Committed

Christoph Schaefer <cerschae@greina13.cm.cluster>

Nov 19 2018, 14:57

Pushed

schaefer

Nov 19 2018, 14:57

Parents

Branches

Unknown

Tags

Unknown

Christoph Schaefer <cerschae@greina13.cm.cluster> committed R1448:8729f1657fc2: handling new merge (authored by Christoph Schaefer <cerschae@greina13.cm.cluster>).Nov 19 2018, 14:57

Commit	Author	Details	Committed
5f4fd14128d7	fourestey	bug correction	Nov 16 2018
f5184db53091	fourestey	updated version	Nov 16 2018
498c806cb98d	fourestey	script moved to their specific folders	Nov 16 2018
4d7a714ed63b	fourestey	moving env files to their specific folder	Nov 16 2018
59f49275fdd6	fourestey	merge conclusion	Nov 16 2018
faec954dfac5	fourestey	merge conclusion	Nov 16 2018

		Path
V		Benchmarks/GridGradientBenchmark/{Makefile.GPU.intel ← MakefileFloat.GPU}
V		Benchmarks/GridGradientBenchmark/{MakefileFloat.GPU → Makefile.GPU.intel}
M		Benchmarks/GridGradientBenchmark/main.cpp
V		{Benchmarks/Scripts ← }/Doubletest
V		{Benchmarks/Scripts ← }/DoubletestSISMBench1st
V		{Benchmarks/Scripts ← }/FloattestSISMBench1st
V		{ → Benchmarks/Scripts}/Doubletest
V		{ → Benchmarks/Scripts}/DoubletestSISMBench1st
V		{ → Benchmarks/Scripts}/FloattestSISMBench1st
A	(dir)	env/
V		{env ← }/env_chrisgreina.sh
V		{env ← }/env_gilles.sh
V		{env ← }/env_gilles_daint.sh
V		{env ← }/env_gilles_greina.sh
V		{env ← }/env_gilles_tave.sh
V		{ → env}/env_chrisgreina.sh
V		{ → env}/env_gilles.sh
V		{ → env}/env_gilles_daint.sh
V		{ → env}/env_gilles_greina.sh
V		{ → env}/env_gilles_tave.sh
M		src/chi_CPU.hpp
A		src/grid_srcplane_conversion.cpp
A		src/grid_srcplane_conversion.hpp