Resolved confict
Showing
- src/lagrangian/intermediate/Make/files 1 addition, 0 deletionssrc/lagrangian/intermediate/Make/files
- src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.C 9 additions, 4 deletions...ds/Templates/KinematicCloud/cloudSolution/cloudSolution.C
- src/lagrangian/intermediate/clouds/Templates/KinematicCloud/cloudSolution/cloudSolution.H 2 additions, 2 deletions...ds/Templates/KinematicCloud/cloudSolution/cloudSolution.H
- src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C 5 additions, 43 deletions...PatchInteractionModel/LocalInteraction/LocalInteraction.C
- src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H 3 additions, 3 deletions...PatchInteractionModel/LocalInteraction/LocalInteraction.H
- src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionDataList.C 130 additions, 0 deletions...eractionModel/LocalInteraction/patchInteractionDataList.C
- src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionDataList.H 90 additions, 0 deletions...eractionModel/LocalInteraction/patchInteractionDataList.H
- src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.C 46 additions, 32 deletions...ProcessingModel/PatchPostProcessing/PatchPostProcessing.C
- src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.H 3 additions, 9 deletions...ProcessingModel/PatchPostProcessing/PatchPostProcessing.H
- src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessingI.H 3 additions, 11 deletions...rocessingModel/PatchPostProcessing/PatchPostProcessingI.H
- src/sampling/sampledSet/sampledSets/sampledSets.C 46 additions, 27 deletionssrc/sampling/sampledSet/sampledSets/sampledSets.C
- src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C 40 additions, 25 deletions...sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
- tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/sampleDict 0 additions, 4 deletions...ssible/rhoCentralFoam/biconic25-55Run35/system/sampleDict
- tutorials/compressible/rhoCentralFoam/shockTube/system/sampleDict 0 additions, 4 deletions...s/compressible/rhoCentralFoam/shockTube/system/sampleDict
- tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict 0 additions, 1 deletion...ompressible/sonicFoam/laminar/shockTube/system/sampleDict
- tutorials/electromagnetics/mhdFoam/hartmann/system/sampleDict 0 additions, 2 deletions...rials/electromagnetics/mhdFoam/hartmann/system/sampleDict
- tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/system/sampleDict 0 additions, 2 deletions...ransfer/buoyantSimpleFoam/buoyantCavity/system/sampleDict
- tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/sampleDict 0 additions, 4 deletions...nalysis/solidDisplacementFoam/plateHole/system/sampleDict
- tutorials/stressAnalysis/solidDisplacementFoam/plateHole/system/sampleSurfaceDict 9 additions, 1 deletion.../solidDisplacementFoam/plateHole/system/sampleSurfaceDict
Please register or sign in to comment