From 42677bba76b8434ba75da6736bdee37219c54d67 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 19 Jun 2012 12:49:27 +0100 Subject: [PATCH] ENH: Restructured combustion models library --- src/combustionModels/Make/files | 18 ++++++++---------- .../psiChemistryCombustion.C | 0 .../psiChemistryCombustion.H | 0 .../psiCombustionModel.C | 0 .../psiCombustionModel.H | 0 .../psiCombustionModelNew.C | 0 .../psiCombustionModels.C | 0 .../psiThermoCombustion/psiThermoCombustion.C | 0 .../psiThermoCombustion/psiThermoCombustion.H | 0 .../rhoChemistryCombustion.C | 0 .../rhoChemistryCombustion.H | 0 .../rhoCombustionModel.C | 0 .../rhoCombustionModel.H | 0 .../rhoCombustionModelNew.C | 0 .../rhoThermoCombustion/rhoThermoCombustion.C | 0 .../rhoThermoCombustion/rhoThermoCombustion.H | 0 16 files changed, 8 insertions(+), 10 deletions(-) rename src/combustionModels/{ => psiCombustionModel}/psiChemistryCombustion/psiChemistryCombustion.C (100%) rename src/combustionModels/{ => psiCombustionModel}/psiChemistryCombustion/psiChemistryCombustion.H (100%) rename src/combustionModels/psiCombustionModel/{ => psiCombustionModel}/psiCombustionModel.C (100%) rename src/combustionModels/psiCombustionModel/{ => psiCombustionModel}/psiCombustionModel.H (100%) rename src/combustionModels/psiCombustionModel/{ => psiCombustionModel}/psiCombustionModelNew.C (100%) rename src/combustionModels/psiCombustionModel/{ => psiCombustionModel}/psiCombustionModels.C (100%) rename src/combustionModels/{ => psiCombustionModel}/psiThermoCombustion/psiThermoCombustion.C (100%) rename src/combustionModels/{ => psiCombustionModel}/psiThermoCombustion/psiThermoCombustion.H (100%) rename src/combustionModels/{ => rhoCombustionModel}/rhoChemistryCombustion/rhoChemistryCombustion.C (100%) rename src/combustionModels/{ => rhoCombustionModel}/rhoChemistryCombustion/rhoChemistryCombustion.H (100%) rename src/combustionModels/rhoCombustionModel/{ => rhoCombustionModel}/rhoCombustionModel.C (100%) rename src/combustionModels/rhoCombustionModel/{ => rhoCombustionModel}/rhoCombustionModel.H (100%) rename src/combustionModels/rhoCombustionModel/{ => rhoCombustionModel}/rhoCombustionModelNew.C (100%) rename src/combustionModels/{ => rhoCombustionModel}/rhoThermoCombustion/rhoThermoCombustion.C (100%) rename src/combustionModels/{ => rhoCombustionModel}/rhoThermoCombustion/rhoThermoCombustion.H (100%) diff --git a/src/combustionModels/Make/files b/src/combustionModels/Make/files index 3138f918cd..20de91ecc6 100644 --- a/src/combustionModels/Make/files +++ b/src/combustionModels/Make/files @@ -1,16 +1,14 @@ combustionModel/combustionModel.C -psiCombustionModel/psiCombustionModel.C -psiCombustionModel/psiCombustionModelNew.C +psiCombustionModel/psiCombustionModel/psiCombustionModel.C +psiCombustionModel/psiCombustionModel/psiCombustionModelNew.C +psiCombustionModel/psiThermoCombustion/psiThermoCombustion.C +psiCombustionModel/psiChemistryCombustion/psiChemistryCombustion.C -rhoCombustionModel/rhoCombustionModel.C -rhoCombustionModel/rhoCombustionModelNew.C - -psiThermoCombustion/psiThermoCombustion.C -rhoThermoCombustion/rhoThermoCombustion.C - -psiChemistryCombustion/psiChemistryCombustion.C -rhoChemistryCombustion/rhoChemistryCombustion.C +rhoCombustionModel/rhoCombustionModel/rhoCombustionModel.C +rhoCombustionModel/rhoCombustionModel/rhoCombustionModelNew.C +rhoCombustionModel/rhoThermoCombustion/rhoThermoCombustion.C +rhoCombustionModel/rhoChemistryCombustion/rhoChemistryCombustion.C infinitelyFastChemistry/infinitelyFastChemistrys.C diff --git a/src/combustionModels/psiChemistryCombustion/psiChemistryCombustion.C b/src/combustionModels/psiCombustionModel/psiChemistryCombustion/psiChemistryCombustion.C similarity index 100% rename from src/combustionModels/psiChemistryCombustion/psiChemistryCombustion.C rename to src/combustionModels/psiCombustionModel/psiChemistryCombustion/psiChemistryCombustion.C diff --git a/src/combustionModels/psiChemistryCombustion/psiChemistryCombustion.H b/src/combustionModels/psiCombustionModel/psiChemistryCombustion/psiChemistryCombustion.H similarity index 100% rename from src/combustionModels/psiChemistryCombustion/psiChemistryCombustion.H rename to src/combustionModels/psiCombustionModel/psiChemistryCombustion/psiChemistryCombustion.H diff --git a/src/combustionModels/psiCombustionModel/psiCombustionModel.C b/src/combustionModels/psiCombustionModel/psiCombustionModel/psiCombustionModel.C similarity index 100% rename from src/combustionModels/psiCombustionModel/psiCombustionModel.C rename to src/combustionModels/psiCombustionModel/psiCombustionModel/psiCombustionModel.C diff --git a/src/combustionModels/psiCombustionModel/psiCombustionModel.H b/src/combustionModels/psiCombustionModel/psiCombustionModel/psiCombustionModel.H similarity index 100% rename from src/combustionModels/psiCombustionModel/psiCombustionModel.H rename to src/combustionModels/psiCombustionModel/psiCombustionModel/psiCombustionModel.H diff --git a/src/combustionModels/psiCombustionModel/psiCombustionModelNew.C b/src/combustionModels/psiCombustionModel/psiCombustionModel/psiCombustionModelNew.C similarity index 100% rename from src/combustionModels/psiCombustionModel/psiCombustionModelNew.C rename to src/combustionModels/psiCombustionModel/psiCombustionModel/psiCombustionModelNew.C diff --git a/src/combustionModels/psiCombustionModel/psiCombustionModels.C b/src/combustionModels/psiCombustionModel/psiCombustionModel/psiCombustionModels.C similarity index 100% rename from src/combustionModels/psiCombustionModel/psiCombustionModels.C rename to src/combustionModels/psiCombustionModel/psiCombustionModel/psiCombustionModels.C diff --git a/src/combustionModels/psiThermoCombustion/psiThermoCombustion.C b/src/combustionModels/psiCombustionModel/psiThermoCombustion/psiThermoCombustion.C similarity index 100% rename from src/combustionModels/psiThermoCombustion/psiThermoCombustion.C rename to src/combustionModels/psiCombustionModel/psiThermoCombustion/psiThermoCombustion.C diff --git a/src/combustionModels/psiThermoCombustion/psiThermoCombustion.H b/src/combustionModels/psiCombustionModel/psiThermoCombustion/psiThermoCombustion.H similarity index 100% rename from src/combustionModels/psiThermoCombustion/psiThermoCombustion.H rename to src/combustionModels/psiCombustionModel/psiThermoCombustion/psiThermoCombustion.H diff --git a/src/combustionModels/rhoChemistryCombustion/rhoChemistryCombustion.C b/src/combustionModels/rhoCombustionModel/rhoChemistryCombustion/rhoChemistryCombustion.C similarity index 100% rename from src/combustionModels/rhoChemistryCombustion/rhoChemistryCombustion.C rename to src/combustionModels/rhoCombustionModel/rhoChemistryCombustion/rhoChemistryCombustion.C diff --git a/src/combustionModels/rhoChemistryCombustion/rhoChemistryCombustion.H b/src/combustionModels/rhoCombustionModel/rhoChemistryCombustion/rhoChemistryCombustion.H similarity index 100% rename from src/combustionModels/rhoChemistryCombustion/rhoChemistryCombustion.H rename to src/combustionModels/rhoCombustionModel/rhoChemistryCombustion/rhoChemistryCombustion.H diff --git a/src/combustionModels/rhoCombustionModel/rhoCombustionModel.C b/src/combustionModels/rhoCombustionModel/rhoCombustionModel/rhoCombustionModel.C similarity index 100% rename from src/combustionModels/rhoCombustionModel/rhoCombustionModel.C rename to src/combustionModels/rhoCombustionModel/rhoCombustionModel/rhoCombustionModel.C diff --git a/src/combustionModels/rhoCombustionModel/rhoCombustionModel.H b/src/combustionModels/rhoCombustionModel/rhoCombustionModel/rhoCombustionModel.H similarity index 100% rename from src/combustionModels/rhoCombustionModel/rhoCombustionModel.H rename to src/combustionModels/rhoCombustionModel/rhoCombustionModel/rhoCombustionModel.H diff --git a/src/combustionModels/rhoCombustionModel/rhoCombustionModelNew.C b/src/combustionModels/rhoCombustionModel/rhoCombustionModel/rhoCombustionModelNew.C similarity index 100% rename from src/combustionModels/rhoCombustionModel/rhoCombustionModelNew.C rename to src/combustionModels/rhoCombustionModel/rhoCombustionModel/rhoCombustionModelNew.C diff --git a/src/combustionModels/rhoThermoCombustion/rhoThermoCombustion.C b/src/combustionModels/rhoCombustionModel/rhoThermoCombustion/rhoThermoCombustion.C similarity index 100% rename from src/combustionModels/rhoThermoCombustion/rhoThermoCombustion.C rename to src/combustionModels/rhoCombustionModel/rhoThermoCombustion/rhoThermoCombustion.C diff --git a/src/combustionModels/rhoThermoCombustion/rhoThermoCombustion.H b/src/combustionModels/rhoCombustionModel/rhoThermoCombustion/rhoThermoCombustion.H similarity index 100% rename from src/combustionModels/rhoThermoCombustion/rhoThermoCombustion.H rename to src/combustionModels/rhoCombustionModel/rhoThermoCombustion/rhoThermoCombustion.H