Merge pull request #1049 from jblueh/codi_medi_update

Update CoDiPack and MeDiPack

Author: pcarruscag

Common/include/mpi_structure.hpp

@@ -50,21 +50,16 @@
 #include <medi/medi.hpp>
 using namespace medi;
 
+#include <codi/externals/codiMpiTypes.hpp>
+
 class CMediMPIWrapper;
 typedef CMediMPIWrapper SU2_MPI;
 
-#if defined CODI_REVERSE_TYPE
-#include <codi/externals/codiMediPackTypes.hpp>
-#if CODI_PRIMAL_INDEX_TAPE
-typedef CoDiPackToolPrimalRestore<su2double> MediTool;
-#else
-typedef CoDiPackTool<su2double> MediTool;
-#endif // defined CODI_REVERSE_TYPE
-#elif defined CODI_FORWARD_TYPE
-#include <codi/externals/codiForwardMediPackTypes.hpp>
-typedef CoDiPackForwardTool<su2double> MediTool;
-#endif // defined CODI_FORWARD_TYPE
-#define AMPI_ADOUBLE ((medi::MpiTypeInterface*)MediTool::MPI_TYPE)
+typedef CoDiMpiTypes<su2double> MediTypes;
+typedef MediTypes::Tool MediTool;
+
+extern MediTypes* mediTypes;
+#define AMPI_ADOUBLE ((medi::MpiTypeInterface*)mediTypes->MPI_TYPE)
 
 #else
 class CBaseMPIWrapper;

Common/include/mpi_structure.inl

@@ -286,7 +286,7 @@ inline passivedouble CBaseMPIWrapper::Wtime(void) {
 
 inline void CMediMPIWrapper::Init(int *argc, char ***argv) {
   AMPI_Init(argc,argv);
-  MediTool::init();
+  mediTypes = new MediTypes();
   AMPI_Comm_rank(convertComm(currentComm), &Rank);
   AMPI_Comm_size(convertComm(currentComm), &Size);
 
@@ -298,7 +298,7 @@ inline void CMediMPIWrapper::Init(int *argc, char ***argv) {
 
 inline void CMediMPIWrapper::Init_thread(int *argc, char ***argv, int required, int* provided) {
   AMPI_Init_thread(argc,argv,required,provided);
-  MediTool::init();
+  mediTypes = new MediTypes();
   AMPI_Comm_rank(convertComm(currentComm), &Rank);
   AMPI_Comm_size(convertComm(currentComm), &Size);
 
@@ -310,7 +310,7 @@ inline void CMediMPIWrapper::Init_thread(int *argc, char ***argv, int required,
 
 inline void CMediMPIWrapper::Init_AMPI(void) {
   AMPI_Init_common();
-  MediTool::init();
+  mediTypes = new MediTypes();
 }
 
 inline void CMediMPIWrapper::SetComm(Comm newComm){
@@ -391,6 +391,8 @@ inline void CMediMPIWrapper::Comm_size(Comm comm, int *size){
 
 inline void CMediMPIWrapper::Finalize(){
   if( winMinRankErrorInUse ) MPI_Win_free(&winMinRankError);
+
+  delete mediTypes;
   AMPI_Finalize();
 }
 

Common/src/mpi_structure.cpp

@@ -39,7 +39,7 @@ CBaseMPIWrapper::Win CBaseMPIWrapper::winMinRankError;
 
 #ifdef HAVE_MPI
 #if defined CODI_REVERSE_TYPE || defined CODI_FORWARD_TYPE
-//AMPI_ADOUBLE_TYPE* AMPI_ADOUBLE;
+MediTypes* mediTypes;
 #include <medi/medi.cpp>
 #endif // defined CODI_REVERSE_TYPE || defined CODI_FORWARD_TYPE
 

SU2_CFD/src/solvers/CSolver.cpp

@@ -1843,6 +1843,7 @@ void CSolver::InitiateComms(CGeometry *geometry,
   }
 
 }
+
 void CSolver::CompleteComms(CGeometry *geometry,
                             const CConfig *config,
                             unsigned short commType) {

externals/codi

@@ -44,9 +44,9 @@ def init_submodules(method = 'auto'):
 
   # This information of the modules is used if projects was not cloned using git
   # The sha tag must be maintained manually to point to the correct commit
-  sha_version_codi = '501dcf0305df147481630f20ce37c2e624fb351f'
+  sha_version_codi = 'b8ddede642eb2824a56c75cebddb79ba194c2ada'
   github_repo_codi = 'https://github.com/scicompkl/CoDiPack'
-  sha_version_medi = 'edde14f9ac4026b72b1e130f61c0a78e8652afa5'
+  sha_version_medi = '051753df5bb6e66c9fb6fbe4f2413c4ba187e81d'
   github_repo_medi = 'https://github.com/SciCompKL/MeDiPack'
   sha_version_meson = '29ef4478df6d3aaca40c7993f125b29409be1de2'
   github_repo_meson = 'https://github.com/mesonbuild/meson'

externals/medi

@@ -290,9 +290,9 @@ def init_codi(argument_dict, modes, mpi_support = False, update = False):
 
     # This information of the modules is used if projects was not cloned using git
     # The sha tag must be maintained manually to point to the correct commit
-    sha_version_codi = 'bd4a639c2fe625a80946c8365bd2976a2868cf46'
+    sha_version_codi = 'b8ddede642eb2824a56c75cebddb79ba194c2ada'
     github_repo_codi = 'https://github.com/scicompkl/CoDiPack'
-    sha_version_medi = '46a97e1d6e8fdd3cb42b06534cff6acad2a49693'
+    sha_version_medi = '051753df5bb6e66c9fb6fbe4f2413c4ba187e81d'
     github_repo_medi = 'https://github.com/SciCompKL/MeDiPack'
 
     medi_name = 'MeDiPack'