Diffusion SP4E-TB-TL-FR 1fc56f4c072d

sp4e
1fc56f4c072d
Actions

Authored by barjavel on Dec 14 2018, 15:13.

Description

Merge branch 'master' of https://c4science.ch/source/sp4e

Details

Committed

barjavel

Dec 14 2018, 15:13

Pushed

barjavel

Dec 18 2018, 14:25

Parents

R7571:aef25e388551: Merge branch 'master' of ssh://c4science.ch/source/sp4e
R7571:ee40fddcde12: merged conflicts in README file.

Branches

Unknown

Tags

Unknown

Event Timeline

barjavel committed R7571:1fc56f4c072d: Merge branch 'master' of https://c4science.ch/source/sp4e (authored by barjavel).Dec 14 2018, 15:13

Merged Changes

Commit	Author	Details	Committed
aef25e388551	anciaux	Merge branch 'master' of ssh://c4science.ch/source/sp4e	Dec 14 2018
19322b6a8679	anciaux	adding a comment	Dec 14 2018
c106fd1f71ef	anciaux	adding a missing CMakeLists.txt	Dec 14 2018
0a2c99c87334	frerot	Merge branch 'master' of ssh://c4science.ch/source/sp4e	Dec 11 2018
7fe05c247709	frerot	added exercise for week 13	Dec 11 2018

Changes (58)

		Path
A	(dir)	exercises/week13/
A	(dir)	exercises/week13/starting_point/
P		exercises/week13/starting_point/CMakeLists.txt Copied from exercises/week12/starting_point/CMakeLists.txt
P		exercises/week13/starting_point/Doxyfile Copied from exercises/week10/correction/Doxyfile
P		exercises/week13/starting_point/compute.hh Copied from exercises/week10/correction/compute.hh
P		exercises/week13/starting_point/compute_boundary.cc Copied from work/week12/starting_point/compute_boundary.cc
P		exercises/week13/starting_point/compute_boundary.hh Copied from exercises/week10/correction/compute_boundary.hh
P		exercises/week13/starting_point/compute_contact.cc Copied from work/week12/starting_point/compute_contact.cc
P		exercises/week13/starting_point/compute_contact.hh Copied from exercises/week10/correction/compute_contact.hh
P		exercises/week13/starting_point/compute_energy.cc Copied from exercises/week10/correction/compute_energy.cc
P		exercises/week13/starting_point/compute_energy.hh Copied from exercises/week10/correction/compute_energy.hh
P		exercises/week13/starting_point/compute_gravity.cc Copied from exercises/week10/correction/compute_gravity.cc
P		exercises/week13/starting_point/compute_gravity.hh Copied from exercises/week10/correction/compute_gravity.hh
P		exercises/week13/starting_point/compute_interaction.cc Copied from exercises/week10/correction/compute_interaction.cc
P		exercises/week13/starting_point/compute_interaction.hh Copied from exercises/week10/correction/compute_interaction.hh
P		exercises/week13/starting_point/compute_kinetic_energy.cc Copied from exercises/week10/correction/compute_kinetic_energy.cc
P		exercises/week13/starting_point/compute_kinetic_energy.hh Copied from exercises/week10/correction/compute_kinetic_energy.hh
P		exercises/week13/starting_point/compute_potential_energy.cc Copied from exercises/week10/correction/compute_potential_energy.cc
P		exercises/week13/starting_point/compute_potential_energy.hh Copied from exercises/week10/correction/compute_potential_energy.hh
P		exercises/week13/starting_point/compute_temperature.cc Copied from exercises/week12/starting_point/compute_temperature.cc
P		exercises/week13/starting_point/compute_temperature.hh Copied from exercises/week12/starting_point/compute_temperature.hh
P		exercises/week13/starting_point/compute_verlet_integration.cc Copied from work/week12/starting_point/compute_verlet_integration.cc
P		exercises/week13/starting_point/compute_verlet_integration.hh Copied from exercises/week10/correction/compute_verlet_integration.hh
P		exercises/week13/starting_point/csv_reader.cc Copied from exercises/week10/correction/csv_reader.cc
P		exercises/week13/starting_point/csv_reader.hh Copied from exercises/week10/correction/csv_reader.hh
P		exercises/week13/starting_point/csv_writer.cc Copied from exercises/week10/correction/csv_writer.cc
P		exercises/week13/starting_point/csv_writer.hh Copied from exercises/week10/correction/csv_writer.hh
P		exercises/week13/starting_point/fft.hh Copied from exercises/week12/starting_point/fft.hh
P		exercises/week13/starting_point/main.cc Copied from exercises/week12/starting_point/main.cc
P		exercises/week13/starting_point/material_point.cc Copied from exercises/week12/starting_point/material_point.cc
P		exercises/week13/starting_point/material_point.hh Copied from exercises/week12/starting_point/material_point.hh
P		exercises/week13/starting_point/material_points_factory.cc Copied from exercises/week12/starting_point/material_points_factory.cc
P		exercises/week13/starting_point/material_points_factory.hh Copied from exercises/week12/starting_point/material_points_factory.hh
A		exercises/week13/starting_point/matrix.hh
A		exercises/week13/starting_point/matrix_eigen_addons.hh
P		exercises/week13/starting_point/my_types.hh Copied from work/week12/starting_point/my_types.hh
P		exercises/week13/starting_point/particle.cc Copied from exercises/week10/correction/particle.cc
P		exercises/week13/starting_point/particle.hh Copied from exercises/week10/correction/particle.hh
P		exercises/week13/starting_point/particles_factory_interface.cc Copied from exercises/week10/correction/particles_factory_interface.cc
P		exercises/week13/starting_point/particles_factory_interface.hh Copied from exercises/week10/correction/particles_factory_interface.hh
P		exercises/week13/starting_point/ping_pong_ball.cc Copied from exercises/week12/starting_point/ping_pong_ball.cc
P		exercises/week13/starting_point/ping_pong_ball.hh Copied from exercises/week10/correction/ping_pong_ball.hh
P		exercises/week13/starting_point/ping_pong_balls_factory.cc Copied from exercises/week12/starting_point/ping_pong_balls_factory.cc
P		exercises/week13/starting_point/ping_pong_balls_factory.hh Copied from exercises/week10/correction/ping_pong_balls_factory.hh
P		exercises/week13/starting_point/planet.cc Copied from exercises/week10/correction/planet.cc
P		exercises/week13/starting_point/planet.hh Copied from exercises/week10/correction/planet.hh
P		exercises/week13/starting_point/planets_factory.cc Copied from exercises/week10/correction/planets_factory.cc
P		exercises/week13/starting_point/planets_factory.hh Copied from exercises/week10/correction/planets_factory.hh
P		exercises/week13/starting_point/system.cc Copied from exercises/week12/starting_point/system.cc
P		exercises/week13/starting_point/system.hh Copied from exercises/week12/starting_point/system.hh
P		exercises/week13/starting_point/system_evolution.cc Copied from exercises/week10/correction/system_evolution.cc
P		exercises/week13/starting_point/system_evolution.hh Copied from exercises/week10/correction/system_evolution.hh
P		exercises/week13/starting_point/test_fft.cc Copied from exercises/week12/starting_point/test_fft.cc
P		exercises/week13/starting_point/test_kepler.cc Copied from exercises/week12/starting_point/test_kepler.cc
A		exercises/week13/starting_point/vector.hh
A		exercises/week13/sujet.pdf
A		exercises/week6/series/sources-solution/CMakeLists.txt
M		lectures/week12-eigen_lecture/main.cc