mirror of
https://github.com/ParticulateFlow/CFDEMcoupling-PFM.git
synced 2025-12-08 06:37:44 +00:00
# Conflicts: # applications/solvers/rcfdemSolverRhoSteadyPimple/EEqn.H # applications/solvers/rcfdemSolverRhoSteadyPimple/rcfdemSolverRhoSteadyPimple.C # doc/CFDEMcoupling_Manual.txt # src/lagrangian/cfdemParticle/subModels/dataExchangeModel/dataExchangeModel/dataExchangeModel.H # src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayOne2One/twoWayOne2One.H # src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferGunn/heatTransferGunn.C # src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferGunn/heatTransferGunn.H # src/lagrangian/cfdemParticle/subModels/thermCondModel/SyamlalThermCond/SyamlalThermCond.H # src/lagrangian/cfdemParticle/subModels/thermCondModel/ZehnerSchluenderThermCond/ZehnerSchluenderThermCond.C # src/lagrangian/cfdemParticle/subModels/thermCondModel/ZehnerSchluenderThermCond/ZehnerSchluenderThermCond.H # src/lagrangian/cfdemParticle/subModels/thermCondModel/thermCondModel/thermCondModel.H