mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Conflicts: src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/newAtomizationModel.C src/lagrangian/dieselSpray/spraySubModels/dispersionModel/dispersionModel/newDispersionModel.C src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H