From 34ee7b0b9527dbdfb443fa93343ddca22788d9a9 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 10 Jun 2020 14:20:18 +0200 Subject: [PATCH] STYLE: use .template instead of .temp for tutorial template files - avoids possible confusion with temporary files --- .../0.orig/{qPlant.temp => qPlant.template} | 0 .../atmFlatTerrain/precursor/Allrun | 11 ++++++----- .../{fvOptions.temp => fvOptions.template} | 0 ...operties.temp => turbulenceProperties.template} | 0 .../atmFlatTerrain/successor/Allrun | 7 ++++--- ...operties.temp => turbulenceProperties.template} | 0 .../0.orig/{qPlant.temp => qPlant.template} | 0 .../atmosphericModels/atmForestStability/Allrun | 14 ++++++++------ .../atmForestStability/Allrun.pre | 3 ++- .../{fvOptions.temp => fvOptions.template} | 0 ...operties.temp => turbulenceProperties.template} | 0 .../{setFieldsDict.temp => setFieldsDict.template} | 0 12 files changed, 20 insertions(+), 15 deletions(-) rename tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/0.orig/{qPlant.temp => qPlant.template} (100%) rename tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/constant/{fvOptions.temp => fvOptions.template} (100%) rename tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/constant/{turbulenceProperties.temp => turbulenceProperties.template} (100%) rename tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/constant/{turbulenceProperties.temp => turbulenceProperties.template} (100%) rename tutorials/verificationAndValidation/atmosphericModels/atmForestStability/0.orig/{qPlant.temp => qPlant.template} (100%) rename tutorials/verificationAndValidation/atmosphericModels/atmForestStability/constant/{fvOptions.temp => fvOptions.template} (100%) rename tutorials/verificationAndValidation/atmosphericModels/atmForestStability/constant/{turbulenceProperties.temp => turbulenceProperties.template} (100%) rename tutorials/verificationAndValidation/atmosphericModels/atmForestStability/system/{setFieldsDict.temp => setFieldsDict.template} (100%) diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/0.orig/qPlant.temp b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/0.orig/qPlant.template similarity index 100% rename from tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/0.orig/qPlant.temp rename to tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/0.orig/qPlant.template diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/Allrun b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/Allrun index 3c384dfbd0..4e78ba0297 100755 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/Allrun +++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/Allrun @@ -18,10 +18,11 @@ echo " ## Lmax = $Lmax [m], qPlant = $qPlant [-]" #------------------------------------------------------------------------------ -sed -e "s|RAS_MODEL|$RASmodel|g" constant/turbulenceProperties.temp > \ - constant/turbulenceProperties -sed -e "s|L_MAX|$Lmax|g" constant/fvOptions.temp > constant/fvOptions -sed -e "s|Q_PLANT|$qPlant|g" 0.orig/qPlant.temp > 0/qPlant +sed -e "s|RAS_MODEL|$RASmodel|g" \ + constant/turbulenceProperties.template \ + > constant/turbulenceProperties +sed -e "s|L_MAX|$Lmax|g" constant/fvOptions.template > constant/fvOptions +sed -e "s|Q_PLANT|$qPlant|g" 0.orig/qPlant.template > 0/qPlant runApplication renumberMesh -overwrite @@ -31,4 +32,4 @@ runApplication $(getApplication) # to encapsulate the successor domain, so that mapFields can be used runApplication transformPoints -scale '(10 10 1)' -translate '(0 0 20)' -#------------------------------------------------------------------------------ \ No newline at end of file +#------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/constant/fvOptions.temp b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/constant/fvOptions.template similarity index 100% rename from tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/constant/fvOptions.temp rename to tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/constant/fvOptions.template diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/constant/turbulenceProperties.temp b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/constant/turbulenceProperties.template similarity index 100% rename from tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/constant/turbulenceProperties.temp rename to tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/precursor/constant/turbulenceProperties.template diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/Allrun b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/Allrun index ad602cdb42..d91b00d025 100755 --- a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/Allrun +++ b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/Allrun @@ -5,8 +5,9 @@ cd "${0%/*}" || exit # Run from this directory RASModel="kEpsilon" # "kOmegaSST" -sed -e "s|RAS_MODEL|$RASModel|g" constant/turbulenceProperties.temp > \ - constant/turbulenceProperties +sed -e "s|RAS_MODEL|$RASModel|g" \ + constant/turbulenceProperties.template \ + > constant/turbulenceProperties restore0Dir @@ -22,4 +23,4 @@ runParallel $(getApplication) runParallel redistributePar -reconstruct -latestTime -#------------------------------------------------------------------------------ \ No newline at end of file +#------------------------------------------------------------------------------ diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/constant/turbulenceProperties.temp b/tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/constant/turbulenceProperties.template similarity index 100% rename from tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/constant/turbulenceProperties.temp rename to tutorials/verificationAndValidation/atmosphericModels/atmFlatTerrain/successor/constant/turbulenceProperties.template diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/0.orig/qPlant.temp b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/0.orig/qPlant.template similarity index 100% rename from tutorials/verificationAndValidation/atmosphericModels/atmForestStability/0.orig/qPlant.temp rename to tutorials/verificationAndValidation/atmosphericModels/atmForestStability/0.orig/qPlant.template diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/Allrun b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/Allrun index a43a68a57f..a244d8c962 100755 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/Allrun +++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/Allrun @@ -46,12 +46,14 @@ do echo " ## Lmax = $Lmax [m], qPlant = $qPlant [-]" echo "" - sed -e "s|RAS_MODEL|$RASmodel|g" constant/turbulenceProperties.temp > \ - constant/turbulenceProperties - sed -e "s|L_MAX|$Lmax|g" constant/fvOptions.temp > constant/fvOptions - sed -e "s|Q_PLANT|$qPlant|g" 0.orig/qPlant.temp > 0/qPlant - sed -e "s|Q_PLANT|$qPlant|g" system/setFieldsDict.temp > \ - system/setFieldsDict + sed -e "s|RAS_MODEL|$RASmodel|g" \ + constant/turbulenceProperties.template \ + > constant/turbulenceProperties + sed -e "s|L_MAX|$Lmax|g" constant/fvOptions.template > constant/fvOptions + sed -e "s|Q_PLANT|$qPlant|g" 0.orig/qPlant.template > 0/qPlant + sed -e "s|Q_PLANT|$qPlant|g" \ + system/setFieldsDict.template \ + > system/setFieldsDict runApplication decomposePar runParallel -s parallel renumberMesh -overwrite diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/Allrun.pre b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/Allrun.pre index 3835295df2..d62a611710 100755 --- a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/Allrun.pre +++ b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/Allrun.pre @@ -5,7 +5,8 @@ cd "${0%/*}" || exit # Run from this directory restore0Dir -rm -f 0/qPlant.temp +# Without template file(s) +rm -f 0/qPlant.template runApplication blockMesh diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/constant/fvOptions.temp b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/constant/fvOptions.template similarity index 100% rename from tutorials/verificationAndValidation/atmosphericModels/atmForestStability/constant/fvOptions.temp rename to tutorials/verificationAndValidation/atmosphericModels/atmForestStability/constant/fvOptions.template diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/constant/turbulenceProperties.temp b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/constant/turbulenceProperties.template similarity index 100% rename from tutorials/verificationAndValidation/atmosphericModels/atmForestStability/constant/turbulenceProperties.temp rename to tutorials/verificationAndValidation/atmosphericModels/atmForestStability/constant/turbulenceProperties.template diff --git a/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/system/setFieldsDict.temp b/tutorials/verificationAndValidation/atmosphericModels/atmForestStability/system/setFieldsDict.template similarity index 100% rename from tutorials/verificationAndValidation/atmosphericModels/atmForestStability/system/setFieldsDict.temp rename to tutorials/verificationAndValidation/atmosphericModels/atmForestStability/system/setFieldsDict.template