resolved Conflicts: - applications/solvers/cfdemSolverIB/Make/options - etc/solver-list.txt - src/lagrangian/cfdemParticle/Make/files - src/lagrangian/cfdemParticle/derived/cfdemCloudIB/cfdemCloudIB.C resolved Issues: src/lagrangian/cfdemParticle/subModels/ShirgaonkarIBTorque/ShirgaonkarIBTorque.C
20 lines
487 B
Plaintext
20 lines
487 B
Plaintext
rcfdemSolverRhoSteadyPimple/dir
|
|
rcfdemSolverRhoSteadyPimpleChem/dir
|
|
rcfdemSolverCoupledHeattransfer/dir
|
|
rcfdemSolverForcedTracers/dir
|
|
rStatAnalysis/dir
|
|
rcfdemSolverBase/dir
|
|
rtfmSolverSpecies/dir
|
|
cfdemSolverPisoMS/dir
|
|
cfdemSolverPiso/dir
|
|
cfdemSolverRhoPimple/dir
|
|
cfdemSolverIB/dir
|
|
cfdemSolverPisoScalar/dir
|
|
cfdemSolverIBContinuousForcing/dir
|
|
cfdemSolverRhoPimpleChem/dir
|
|
cfdemSolverMultiphase/dir
|
|
cfdemSolverMultiphaseScalar/dir
|
|
rctfSpeciesTransport/dir
|
|
cfdemSolverPisoFreeStreaming/dir
|
|
|