partial merge

This commit is contained in:
James McClure
2021-01-04 19:33:27 -05:00
173 changed files with 27358 additions and 7516 deletions

View File

@@ -9,7 +9,7 @@
#include "common/ScaLBL.h"
#include "common/Communication.h"
#include "analysis/TwoPhase.h"
#include "common/MPI.h"
#include "common/MPI_Helpers.h"
std::shared_ptr<Database> loadInputs( )
@@ -24,11 +24,14 @@ std::shared_ptr<Database> loadInputs( )
//***************************************************************************************
int main(int argc, char **argv)
{
//*****************************************
// ***** MPI STUFF ****************
//*****************************************
// Initialize MPI
Utilities::startup( argc, argv );
Utilities::MPI comm( MPI_COMM_WORLD );
int rank = comm.getRank();
int nprocs = comm.getSize();
Utilities::MPI comm( MPI_COMM_WORLD );
int rank = comm.getRank();
int nprocs = comm.getSize();
{
//*****************************************
// MPI ranks for all 18 neighbors
@@ -92,7 +95,7 @@ int main(int argc, char **argv)
rank_xy, rank_XY, rank_xY, rank_Xy, rank_xz, rank_XZ, rank_xZ, rank_Xz,
rank_yz, rank_YZ, rank_yZ, rank_Yz );
comm.barrier();
MPI_Barrier(comm);
Nz += 2;
Nx = Ny = Nz; // Cubic domain