diff --git a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.C b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.C index 5dec8815..5d30fd09 100644 --- a/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.C +++ b/src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMPI/twoWayMPI.C @@ -63,41 +63,20 @@ twoWayMPI::twoWayMPI ) : dataExchangeModel(dict,sm), - propsDict_(dict.subDict(typeName + "Props")) + propsDict_(dict.subDict(typeName + "Props")), + lmp(NULL) { Info<<"Starting up LIGGGHTS for first time execution"< 0) - { - MPI_Bcast(liggghtsPathChar,n,MPI_CHAR,0,MPI_COMM_WORLD); - if (liggghts == 1) lmp->input->file(liggghtsPathChar); - } - - delete [] liggghtsPathChar; + Info<<"Executing input script '"<< liggghtsPath.c_str() <<"'"<input->file(liggghtsPath.c_str()); // get DEM time step size DEMts_ = lmp->update->dt; @@ -109,7 +88,7 @@ twoWayMPI::twoWayMPI twoWayMPI::~twoWayMPI() { - if (liggghts == 1) delete lmp; + delete lmp; } // * * * * * * * * * * * * * * * public Member Functions * * * * * * * * * * * * * // @@ -240,8 +219,6 @@ bool Foam::twoWayMPI::couple(int i) const coupleNow = true; // start liggghts - if (liggghts == 1) - { // run commands from liggghtsCommands dict Info<<"Starting up LIGGGHTS" << endl; particleCloud_.clockM().start(3,"LIGGGHTS"); @@ -366,7 +343,6 @@ bool Foam::twoWayMPI::couple(int i) const particleCloud_.clockM().stop("LIGGGHTS"); Info<<"LIGGGHTS finished"<