diff --git a/etc/templates/singleFluidCHT/templates/constant/solid/fvModels b/etc/templates/singleFluidCHT/templates/constant/solid/fvModels index 326100cd39..d01f2d5263 100644 --- a/etc/templates/singleFluidCHT/templates/constant/solid/fvModels +++ b/etc/templates/singleFluidCHT/templates/constant/solid/fvModels @@ -29,21 +29,10 @@ fixedTemperature /* fixedPower { - type semiImplicitSource; + type heatSource; selectionMode all; - volumeMode absolute; - - power 100; // Set power (W) - - sources - { - e - { - explicit $power; - implicit 0; - } - } + Q 100; // Set power (W) } */ diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/fvModels b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/fvModels index e891c16255..4d55f968e7 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/fvModels +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/drift/constant/fvModels @@ -15,27 +15,67 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -massSource +airSource { - type semiImplicitSource; + type massSource; selectionMode all; - volumeMode specific; - sources + massFlowRate 24.535; + + phase air; + rho thermo:rho.air; + + fieldValues { - thermo:rho.air - { - explicit 0.024535; // kg/s/m^3 - implicit 0; - } - thermo:rho.water - { - explicit -24.535; // kg/s/m^3 - implicit 0; - } + f0.air 0; + f1.air 0; + f2.air 0; + f3.air 0; + f4.air 0; + f5.air 0; + f6.air 0; + f7.air 0; + f8.air 0; + f9.air 0; + f10.air 0; + f11.air 0; + f12.air 0; + f13.air 0; + f14.air 0; + f15.air 0; + f16.air 0; + f17.air 0; + f18.air 0; + f19.air 0; + f20.air 0; + f21.air 0; + f22.air 0; + f23.air 0; + f24.air 0; + f25.air 0; + f26.air 0; + f27.air 0; + f28.air 0; + f29.air 0; + f30.air 0; } } +waterSink +{ + type massSource; + + selectionMode all; + + massFlowRate -24535; + + phase water; + rho thermo:rho.water; + + fieldValues + {} +} + // ************************************************************************* // diff --git a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/fvModels b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/fvModels index 80dcc94327..efb4a01cf0 100644 --- a/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/fvModels +++ b/test/multiphase/multiphaseEulerFoam/populationBalance/negativeDrift/constant/fvModels @@ -15,27 +15,61 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -massSource +airSource { - type semiImplicitSource; + type massSource; selectionMode all; - volumeMode specific; - sources + massFlowRate -25.8575; + + phase air; + rho thermo:rho.air; + + fieldValues { - thermo:rho.air - { - explicit -0.0258575; // kg/s/m^3 - implicit 0; - } - thermo:rho.water - { - explicit 25.8575; // kg/s/m^3 - implicit 0; - } + f0.air 0; + f1.air 0; + f2.air 0; + f3.air 0; + f4.air 0; + f5.air 0; + f6.air 0; + f7.air 0; + f8.air 0; + f9.air 0; + f10.air 0; + f11.air 0; + f12.air 0; + f13.air 0; + f14.air 0; + f15.air 0; + f16.air 0; + f17.air 0; + f18.air 0; + f19.air 0; + f20.air 0; + f21.air 0; + f22.air 0; + f23.air 0; + f24.air 0; } } +waterSink +{ + type massSource; + + selectionMode all; + + massFlowRate 25857.5; + + phase water; + rho thermo:rho.water; + + fieldValues + {} +} + // ************************************************************************* // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/coolingCylinder2D/constant/solid/fvModels b/tutorials/heatTransfer/chtMultiRegionFoam/coolingCylinder2D/constant/solid/fvModels index 4922335064..87660efdd4 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/coolingCylinder2D/constant/solid/fvModels +++ b/tutorials/heatTransfer/chtMultiRegionFoam/coolingCylinder2D/constant/solid/fvModels @@ -16,19 +16,11 @@ FoamFile cylinderHeat { - type semiImplicitSource; - selectionMode all; - volumeMode specific; - power 5e7; + type heatSource; - sources - { - e - { - explicit $power; - implicit 0; - } - } + selectionMode all; + + q 5e7; } //************************************************************************** // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/templates/constant/solid/fvModels b/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/templates/constant/solid/fvModels index 5bb54b3584..d01f2d5263 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/templates/constant/solid/fvModels +++ b/tutorials/heatTransfer/chtMultiRegionFoam/coolingSphere/templates/constant/solid/fvModels @@ -14,23 +14,27 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// fixedPower -// { -// type semiImplicitSource; -// selectionMode all; +/* +fixedTemperature +{ + type fixedTemperatureConstraint; + selectionMode all; -// volumeMode absolute; + mode uniform; -// power 100; // Set power (W) + temperature constant 300; // Set temperature (K) +} +*/ + +/* +fixedPower +{ + type heatSource; + selectionMode all; + + Q 100; // Set power (W) +} +*/ -// sources -// { -// e -// { -// explicit $power; -// implicit 0; -// } -// } -// } //************************************************************************** // diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/fvModels b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/fvModels index f23bf329a3..9b55eb575a 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/fvModels +++ b/tutorials/heatTransfer/chtMultiRegionFoam/reverseBurner/constant/gas/fvModels @@ -17,27 +17,18 @@ FoamFile ignition { - type semiImplicitSource; + type heatSource; selectionMode cellSet; cellSet ignition; - volumeMode specific; - - sources + q { - h - { - explicit - { - type scale; - scale squarePulse; - start 0; - duration 1; - value 5e7; // kg/m/s^3 - } - implicit 0; - } + type scale; + scale squarePulse; + start 0; + duration 1; + value 5e7; } } diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/0.orig/G b/tutorials/lagrangian/reactingParticleFoam/filter/0/G similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/0.orig/G rename to tutorials/lagrangian/reactingParticleFoam/filter/0/G diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/0.orig/H2O b/tutorials/lagrangian/reactingParticleFoam/filter/0/H2O similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/0.orig/H2O rename to tutorials/lagrangian/reactingParticleFoam/filter/0/H2O diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/0.orig/N2 b/tutorials/lagrangian/reactingParticleFoam/filter/0/N2 similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/0.orig/N2 rename to tutorials/lagrangian/reactingParticleFoam/filter/0/N2 diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/0.orig/O2 b/tutorials/lagrangian/reactingParticleFoam/filter/0/O2 similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/0.orig/O2 rename to tutorials/lagrangian/reactingParticleFoam/filter/0/O2 diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/0.orig/T b/tutorials/lagrangian/reactingParticleFoam/filter/0/T similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/0.orig/T rename to tutorials/lagrangian/reactingParticleFoam/filter/0/T diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/0.orig/U b/tutorials/lagrangian/reactingParticleFoam/filter/0/U similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/0.orig/U rename to tutorials/lagrangian/reactingParticleFoam/filter/0/U diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/0.orig/alphat b/tutorials/lagrangian/reactingParticleFoam/filter/0/alphat similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/0.orig/alphat rename to tutorials/lagrangian/reactingParticleFoam/filter/0/alphat diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/0.orig/epsilon b/tutorials/lagrangian/reactingParticleFoam/filter/0/epsilon similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/0.orig/epsilon rename to tutorials/lagrangian/reactingParticleFoam/filter/0/epsilon diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/0.orig/k b/tutorials/lagrangian/reactingParticleFoam/filter/0/k similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/0.orig/k rename to tutorials/lagrangian/reactingParticleFoam/filter/0/k diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/0.orig/nut b/tutorials/lagrangian/reactingParticleFoam/filter/0/nut similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/0.orig/nut rename to tutorials/lagrangian/reactingParticleFoam/filter/0/nut diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/0.orig/p b/tutorials/lagrangian/reactingParticleFoam/filter/0/p similarity index 100% rename from tutorials/lagrangian/reactingParticleFoam/filter/0.orig/p rename to tutorials/lagrangian/reactingParticleFoam/filter/0/p diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/Allclean b/tutorials/lagrangian/reactingParticleFoam/filter/Allclean deleted file mode 100755 index 4d4ba35b8b..0000000000 --- a/tutorials/lagrangian/reactingParticleFoam/filter/Allclean +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -cd ${0%/*} || exit 1 # Run from this directory - -# Source tutorial clean functions -. $WM_PROJECT_DIR/bin/tools/CleanFunctions - -cleanCase - -# remove 0 directory -rm -rf 0 - -# remove post-processing directory -rm -rf postProcessing - -#------------------------------------------------------------------------------ diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/Allrun b/tutorials/lagrangian/reactingParticleFoam/filter/Allrun index fa4d7057e4..268fd14d4d 100755 --- a/tutorials/lagrangian/reactingParticleFoam/filter/Allrun +++ b/tutorials/lagrangian/reactingParticleFoam/filter/Allrun @@ -6,9 +6,6 @@ cd ${0%/*} || exit 1 # Run from this directory application=$(getApplication) -# copy 0.orig to 0 -cp -r 0.orig 0 - # create mesh runApplication blockMesh diff --git a/tutorials/lagrangian/reactingParticleFoam/filter/constant/fvModels b/tutorials/lagrangian/reactingParticleFoam/filter/constant/fvModels index fd8c2f655a..d6e455e00e 100644 --- a/tutorials/lagrangian/reactingParticleFoam/filter/constant/fvModels +++ b/tutorials/lagrangian/reactingParticleFoam/filter/constant/fvModels @@ -46,7 +46,7 @@ filter1 massSource { - type semiImplicitSource; + type massSource; selectionMode points; points @@ -54,57 +54,23 @@ massSource (2.75 0.5 0) ); - volumeMode absolute; - - squarePulse + massFlowRate { type scale; scale squarePulse; start 0.2; duration 2; + value 1e-4; } - sources + fieldValues { - rho - { - explicit - { - $squarePulse; - value 1e-4; // kg/s - } - implicit 0; - } - - U - { - explicit - { - $squarePulse; - value (0 0.005 0); - } - implicit 0; - } - - h - { - explicit - { - $squarePulse; - value 10; - } - implicit 0; - } - - H2O - { - explicit - { - $squarePulse; - value 1e-4; // kg/s - } - implicit 0; - } + U (0 50 0); + h 100000; + O2 0; + H2O 1; + k 0.0938; + epsilon 0.0449; } } diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/constant/fvModels b/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/constant/fvModels index 2c4c059d8a..d65d8478f2 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/constant/fvModels +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/bed/constant/fvModels @@ -22,8 +22,6 @@ massSource selectionMode points; points ((0.075 0.925 0.05)); - volumeMode absolute; - massFlowRate 1; phase water; diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/injection/constant/fvModels b/tutorials/multiphase/multiphaseEulerFoam/laminar/injection/constant/fvModels index c1ff61bc55..2d8f526348 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/injection/constant/fvModels +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/injection/constant/fvModels @@ -25,8 +25,6 @@ massSource (0.075 0.2 0.05) ); - volumeMode absolute; - phase air; rho thermo:rho.air; diff --git a/tutorials/multiphase/multiphaseEulerFoam/laminar/steamInjection/constant/fvModels b/tutorials/multiphase/multiphaseEulerFoam/laminar/steamInjection/constant/fvModels index 0aeaf32c85..75c2f4415c 100644 --- a/tutorials/multiphase/multiphaseEulerFoam/laminar/steamInjection/constant/fvModels +++ b/tutorials/multiphase/multiphaseEulerFoam/laminar/steamInjection/constant/fvModels @@ -25,8 +25,6 @@ massSource (0.075 0.2 0.05) ); - volumeMode absolute; - phase steam; rho thermo:rho.steam;