Salvatore Filippone c414d4d40a Merge branch 'implement-ainv' into dev-openmp ...

# Conflicts:
#	base/comm/internals/psi_cswapdata_a.F90
#	base/comm/internals/psi_cswaptran_a.F90
#	base/comm/internals/psi_dswapdata_a.F90
#	base/comm/internals/psi_dswaptran_a.F90
#	base/comm/internals/psi_eswapdata_a.F90
#	base/comm/internals/psi_eswaptran_a.F90
#	base/comm/internals/psi_i2swapdata_a.F90
#	base/comm/internals/psi_i2swaptran_a.F90
#	base/comm/internals/psi_mswapdata_a.F90
#	base/comm/internals/psi_mswaptran_a.F90
#	base/comm/internals/psi_sswapdata_a.F90
#	base/comm/internals/psi_sswaptran_a.F90
#	base/comm/internals/psi_zswapdata_a.F90
#	base/comm/internals/psi_zswaptran_a.F90
#	base/modules/psi_i_mod.F90

2020-11-26 15:18:05 +01:00

..

comm

Merge branch 'implement-ainv' into dev-openmp

2020-11-26 15:18:05 +01:00

internals

Fix wrong subroutine name ref.

2020-11-20 13:21:04 +01:00

modules

Merge branch 'implement-ainv' into dev-openmp

2020-11-26 15:18:05 +01:00

psblas

Corrected call to use mpi

2020-11-25 17:48:37 +01:00

serial

Merge branch 'implement-ainv' into dev-openmp

2020-11-26 15:18:05 +01:00

tools

Merge branch 'new-context' into implement-ainv

2020-11-20 17:18:40 +01:00

Makefile

Improve structure of Makefiles

2020-04-18 17:58:41 +02:00