Merge branch 'misc' into 'master'

Misc See merge request !3
2017-08-16 23:32:56 +00:00 · 2017-08-16 23:32:56 +00:00 · f4c39c52b4
commit f4c39c52b4
parent 05cf4af9ff 13f98aa1b3
92 changed files with 4 additions and 4 deletions
--- a/solvers_post/LagrangianCMCFoam/CMCequation.H
+++ b/solvers_post/LagrangianCMCFoam/CMCequation.H
--- a/solvers_post/LagrangianCMCFoam/CMCintegration.H
+++ b/solvers_post/LagrangianCMCFoam/CMCintegration.H
--- a/solvers_post/LagrangianCMCFoam/CMCwrite.H
+++ b/solvers_post/LagrangianCMCFoam/CMCwrite.H
--- a/solvers_post/LagrangianCMCFoam/Flamegroup.H
+++ b/solvers_post/LagrangianCMCFoam/Flamegroup.H
--- a/solvers_post/LagrangianCMCFoam/InjNewFG.H
+++ b/solvers_post/LagrangianCMCFoam/InjNewFG.H
--- a/solvers_post/LagrangianCMCFoam/Math.H
+++ b/solvers_post/LagrangianCMCFoam/Math.H
--- a/solvers_post/LagrangianCMCFoam/Mixturefraction.H
+++ b/solvers_post/LagrangianCMCFoam/Mixturefraction.H
--- a/solvers_post/LagrangianCMCFoam/MixturefractionVar.H
+++ b/solvers_post/LagrangianCMCFoam/MixturefractionVar.H
--- a/solvers_post/LagrangianCMCFoam/Peta.H
+++ b/solvers_post/LagrangianCMCFoam/Peta.H
--- a/solvers_post/LagrangianCMCFoam/QCMC_init.H
+++ b/solvers_post/LagrangianCMCFoam/QCMC_init.H
--- a/solvers_post/LagrangianCMCFoam/Qh_diffusion.H
+++ b/solvers_post/LagrangianCMCFoam/Qh_diffusion.H
--- a/solvers_post/LagrangianCMCFoam/Qh_reaction.H
+++ b/solvers_post/LagrangianCMCFoam/Qh_reaction.H
--- a/solvers_post/LagrangianCMCFoam/Qi_diffusion.H
+++ b/solvers_post/LagrangianCMCFoam/Qi_diffusion.H
--- a/solvers_post/LagrangianCMCFoam/Qi_reaction.H
+++ b/solvers_post/LagrangianCMCFoam/Qi_reaction.H
--- a/solvers_post/LagrangianCMCFoam/chemistryCMC.H
+++ b/solvers_post/LagrangianCMCFoam/chemistryCMC.H
--- a/solvers_post/LagrangianCMCFoam/correctRHOandT.H
+++ b/solvers_post/LagrangianCMCFoam/correctRHOandT.H
--- a/solvers_post/LagrangianCMCFoam/correctRHOandT2.H
+++ b/solvers_post/LagrangianCMCFoam/correctRHOandT2.H
--- a/solvers_post/LagrangianCMCFoam/logSummary.H
+++ b/solvers_post/LagrangianCMCFoam/logSummary.H
--- a/solvers_post/LagrangianCMCFoam/readCMCProperties.H
+++ b/solvers_post/LagrangianCMCFoam/readCMCProperties.H
--- a/solvers_post/LagrangianCMCFoam/restartCMC.H
+++ b/solvers_post/LagrangianCMCFoam/restartCMC.H
--- a/solvers_post/LagrangianCMCFoam/setRHOCMC.H
+++ b/solvers_post/LagrangianCMCFoam/setRHOCMC.H
--- a/solvers_post/LagrangianCMCFoam/setSDRCMC.H
+++ b/solvers_post/LagrangianCMCFoam/setSDRCMC.H
--- a/solvers_post/LagrangianCMCFoam/startSummary.H
+++ b/solvers_post/LagrangianCMCFoam/startSummary.H
--- a/solvers_post/LagrangiansCMCSprayFoam/CMCequation.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/CMCequation.H
--- a/solvers_post/LagrangiansCMCSprayFoam/CMCintegration.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/CMCintegration.H
--- a/solvers_post/LagrangiansCMCSprayFoam/CMCwrite.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/CMCwrite.H
--- a/solvers_post/LagrangiansCMCSprayFoam/EEqn.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/EEqn.H
--- a/solvers_post/LagrangiansCMCSprayFoam/Flamegroup.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/Flamegroup.H
--- a/solvers_post/LagrangiansCMCSprayFoam/Flamegroup_old.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/Flamegroup_old.H
--- a/solvers_post/LagrangiansCMCSprayFoam/LagrangiansCMCSprayFoam.C
+++ b/solvers_post/LagrangiansCMCSprayFoam/LagrangiansCMCSprayFoam.C
@ -105,7 +105,7 @@ int main(int argc, char *argv[])

 		if(runTime.value() >= parcels.injectors()[0].timeStart())
 		{
-			CMC_on = true;	
+			CMC_on = true;
 			if(init_start_CMC == true)
 			{
 				#include "QiCMC_init.H"
--- a/solvers_post/LagrangianCMCSprayFoam/Make/files
+++ b/solvers_post/LagrangianCMCSprayFoam/Make/files
@ -0,0 +1,3 @@
+LagrangianCMCSprayFoam.C
+
+EXE = $(FOAM_USER_APPBIN)/LagrangianCMCSprayFoam
--- a/solvers_post/LagrangiansCMCSprayFoam/Make/options
+++ b/solvers_post/LagrangiansCMCSprayFoam/Make/options
--- a/solvers_post/LagrangiansCMCSprayFoam/Math.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/Math.H
--- a/solvers_post/LagrangiansCMCSprayFoam/Mixturefraction.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/Mixturefraction.H
--- a/solvers_post/LagrangiansCMCSprayFoam/MixturefractionVar.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/MixturefractionVar.H
--- a/solvers_post/LagrangiansCMCSprayFoam/Peta.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/Peta.H
--- a/solvers_post/LagrangiansCMCSprayFoam/QhCMC_init.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/QhCMC_init.H
--- a/solvers_post/LagrangiansCMCSprayFoam/Qh_Reinit.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/Qh_Reinit.H
--- a/solvers_post/LagrangiansCMCSprayFoam/Qh_diffusion.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/Qh_diffusion.H
--- a/solvers_post/LagrangiansCMCSprayFoam/Qh_reaction.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/Qh_reaction.H
--- a/solvers_post/LagrangiansCMCSprayFoam/QiCMC_init.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/QiCMC_init.H
--- a/solvers_post/LagrangiansCMCSprayFoam/Qi_diffusion.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/Qi_diffusion.H
--- a/solvers_post/LagrangiansCMCSprayFoam/Qi_reaction.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/Qi_reaction.H
--- a/solvers_post/LagrangiansCMCSprayFoam/UEqn.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/UEqn.H
--- a/solvers_post/LagrangiansCMCSprayFoam/YEqn.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/YEqn.H
--- a/solvers_post/LagrangiansCMCSprayFoam/chemistryCMC.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/chemistryCMC.H
--- a/solvers_post/LagrangiansCMCSprayFoam/correctRHOandT.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/correctRHOandT.H
--- a/solvers_post/LagrangiansCMCSprayFoam/correctRHOandT2.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/correctRHOandT2.H
--- a/solvers_post/LagrangiansCMCSprayFoam/createClouds.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/createClouds.H
--- a/solvers_post/LagrangiansCMCSprayFoam/createFieldRefs.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/createFieldRefs.H
--- a/solvers_post/LagrangiansCMCSprayFoam/createFields.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/createFields.H
--- a/solvers_post/LagrangiansCMCSprayFoam/fieldInitialization.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/fieldInitialization.H
--- a/solvers_post/LagrangiansCMCSprayFoam/log
+++ b/solvers_post/LagrangiansCMCSprayFoam/log
--- a/solvers_post/LagrangiansCMCSprayFoam/logSummary.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/logSummary.H
--- a/solvers_post/LagrangiansCMCSprayFoam/pEqn.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/pEqn.H
--- a/solvers_post/LagrangiansCMCSprayFoam/pcEqn.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/pcEqn.H
--- a/solvers_post/LagrangiansCMCSprayFoam/post.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/post.H
--- a/solvers_post/LagrangiansCMCSprayFoam/readCMCProperties.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/readCMCProperties.H
--- a/solvers_post/LagrangiansCMCSprayFoam/readChemistryProperties.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/readChemistryProperties.H
--- a/solvers_post/LagrangiansCMCSprayFoam/readEngineTimeControls.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/readEngineTimeControls.H
--- a/solvers_post/LagrangiansCMCSprayFoam/readSLFMlib.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/readSLFMlib.H
--- a/solvers_post/LagrangiansCMCSprayFoam/rhoEqn.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/rhoEqn.H
--- a/solvers_post/LagrangiansCMCSprayFoam/setInitializationTime.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/setInitializationTime.H
--- a/solvers_post/LagrangiansCMCSprayFoam/setRDeltaT.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/setRDeltaT.H
--- a/solvers_post/LagrangiansCMCSprayFoam/setRHOCMC.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/setRHOCMC.H
--- a/solvers_post/LagrangiansCMCSprayFoam/setSDRCMC.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/setSDRCMC.H
--- a/solvers_post/LagrangiansCMCSprayFoam/spraySummary.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/spraySummary.H
--- a/solvers_post/LagrangiansCMCSprayFoam/startSummary.H
+++ b/solvers_post/LagrangiansCMCSprayFoam/startSummary.H
--- a/solvers_post/LagrangianCMCdieselEngineFoam4x/CMCequation.H
+++ b/solvers_post/LagrangianCMCdieselEngineFoam4x/CMCequation.H
--- a/solvers_post/LagrangianCMCdieselEngineFoam4x/CMCintegration.H
+++ b/solvers_post/LagrangianCMCdieselEngineFoam4x/CMCintegration.H
--- a/solvers_post/LagrangianCMCdieselEngineFoam4x/CMCwrite.H
+++ b/solvers_post/LagrangianCMCdieselEngineFoam4x/CMCwrite.H
--- a/solvers_post/LagrangianCMCdieselEngineFoam4x/Flamegroup.H
+++ b/solvers_post/LagrangianCMCdieselEngineFoam4x/Flamegroup.H
--- a/solvers_post/LagrangianCMCdieselEngineFoam4x/Math.H
+++ b/solvers_post/LagrangianCMCdieselEngineFoam4x/Math.H
--- a/solvers_post/LagrangianCMCdieselEngineFoam4x/Mixturefraction.H
+++ b/solvers_post/LagrangianCMCdieselEngineFoam4x/Mixturefraction.H
--- a/solvers_post/LagrangianCMCdieselEngineFoam4x/MixturefractionVar.H
+++ b/solvers_post/LagrangianCMCdieselEngineFoam4x/MixturefractionVar.H
--- a/solvers_post/LagrangianCMCdieselEngineFoam4x/Peta.H
+++ b/solvers_post/LagrangianCMCdieselEngineFoam4x/Peta.H
--- a/solvers_post/LagrangianCMCdieselEngineFoam4x/QhCMC_init.H
+++ b/solvers_post/LagrangianCMCdieselEngineFoam4x/QhCMC_init.H
--- a/solvers_post/LagrangianCMCdieselEngineFoam4x/Qh_Reinit.H
+++ b/solvers_post/LagrangianCMCdieselEngineFoam4x/Qh_Reinit.H
--- a/solvers_post/LagrangianCMCdieselEngineFoam4x/Qh_diffusion.H
+++ b/solvers_post/LagrangianCMCdieselEngineFoam4x/Qh_diffusion.H
--- a/solvers_post/LagrangianCMCdieselEngineFoam4x/Qh_reaction.H
+++ b/solvers_post/LagrangianCMCdieselEngineFoam4x/Qh_reaction.H
--- a/solvers_post/LagrangianCMCdieselEngineFoam4x/QiCMC_init.H
+++ b/solvers_post/LagrangianCMCdieselEngineFoam4x/QiCMC_init.H
--- a/solvers_post/LagrangianCMCdieselEngineFoam4x/Qi_diffusion.H
+++ b/solvers_post/LagrangianCMCdieselEngineFoam4x/Qi_diffusion.H
--- a/solvers_post/LagrangianCMCdieselEngineFoam4x/Qi_reaction.H
+++ b/solvers_post/LagrangianCMCdieselEngineFoam4x/Qi_reaction.H
--- a/solvers_post/LagrangianCMCdieselEngineFoam4x/chemistryCMC.H
+++ b/solvers_post/LagrangianCMCdieselEngineFoam4x/chemistryCMC.H
--- a/solvers_post/LagrangianCMCdieselEngineFoam4x/correctRHOandT.H
+++ b/solvers_post/LagrangianCMCdieselEngineFoam4x/correctRHOandT.H
--- a/solvers_post/LagrangianCMCdieselEngineFoam4x/correctRHOandT2.H
+++ b/solvers_post/LagrangianCMCdieselEngineFoam4x/correctRHOandT2.H
--- a/solvers_post/LagrangianCMCdieselEngineFoam4x/readCMCProperties.H
+++ b/solvers_post/LagrangianCMCdieselEngineFoam4x/readCMCProperties.H
--- a/solvers_post/LagrangianCMCdieselEngineFoam4x/setInitializationTime.H
+++ b/solvers_post/LagrangianCMCdieselEngineFoam4x/setInitializationTime.H
--- a/solvers_post/LagrangianCMCdieselEngineFoam4x/setRHOCMC.H
+++ b/solvers_post/LagrangianCMCdieselEngineFoam4x/setRHOCMC.H
--- a/solvers_post/LagrangianCMCdieselEngineFoam4x/setSDRCMC.H
+++ b/solvers_post/LagrangianCMCdieselEngineFoam4x/setSDRCMC.H
--- a/solvers_post/LagrangianCMCdieselEngineFoam4x/spraySummary.H
+++ b/solvers_post/LagrangianCMCdieselEngineFoam4x/spraySummary.H
--- a/solvers_post/LagrangiansCMCSprayFoam/Make/files
+++ b/solvers_post/LagrangiansCMCSprayFoam/Make/files
@ -1,3 +0,0 @@
-LagrangiansCMCSprayFoam.C
-
-EXE = $(FOAM_USER_APPBIN)/LagrangiansCMCSprayFoam