Merge branch 'CPD_CV_fix' into 'master'

Plug Flow Reactor Modification

See merge request !30

demos/1D_transient/1Dtrans_input.yaml

@@ -37,6 +37,5 @@ TimeIntegrator:
   end_time: 2.5e-4
   timestep: 1e-6
   tolerance: 1e-8
-Restart: True
 ReactorParameters:
-  ReactorType: ConstantVolume
+  ReactorType: PSRConstantVolume

demos/2D_steady_state/2Dss_input.yaml

@@ -34,6 +34,5 @@ Output:
   Fields:
     - name: T_inflow
     - name: tau_mix
-Restart: False
 ReactorParameters:
-  ReactorType: ConstantVolume
+  ReactorType: PSRConstantVolume

demos/Coal/Particle.yaml

@@ -31,7 +31,7 @@ TimeIntegrator:
  timestep: 1e-4
  tolerance: 1e-12
 ReactorParameters:
-  ReactorType: ConstantPressure
+  ReactorType: PSRConstantPressure
   Radius: 0.1
 Particles:
  ParticleType: Coal
@@ -45,9 +45,8 @@ Particles:
    variable: T_part_init
  - value: 1200
    variable: rho_part_init
- NumberOfParticles: 1
  Size:
   Distribution: Identity
   Value: 150e-6
 FlowParameters:
- KolmogorovScale: 1e-7
+ ReynoldsNumber: 2e4

demos/LiquidParticle/LiquidParticle.yaml

@@ -38,7 +38,7 @@ TimeIntegrator:
   timestep: 1e-6
   tolerance: 1e-8
 ReactorParameters:
-  ReactorType: ConstantPressure
+  ReactorType: PSRConstantPressure
   Radius: 0.1
 Particles:
  ParticleType: Liquid
@@ -54,10 +54,10 @@ Particles:
    variable: T_part_inflow
  - value: 1000
    variable: rho_part_inflow
- NumberOfParticles: 1000
- NumberOfParticlesInflow: 500
+ ParticleLoading: 1000
+ ParticleLoadingInflow: 500
  Size:
   Distribution: Identity
   Value: 1e-4
 FlowParameters:
- KolmogorovScale: 1e-7
+ ReynoldsNumber: 2e4

demos/PFR/Coal/Coal_PFR.yaml

+ReactionInGas: True
+Cantera:
+ GroupName: methane-gri211
+ InputFile: methane-gri211.xml
+InitialConditions:
+- value: 1200
+  variable: T
+- value: 101325
+  variable: p
+- value: 0.21
+  variable: X_O2
+- value: 0.79
+  variable: X_N2
+- value: 0.5
+  variable: u
+Output:
+  dualtime_interval: 1
+  time_interval: 1
+TimeIntegrator:
+ dsInitial: 1e-8
+ GESAT_Max: 1e1
+ GESAT_Ramp: 1.1
+ GESAT_Safety: 0.1
+ end_time: 0.15
+ timestep: 1e-6
+ tolerance: 1e-5
+ReactorParameters:
+  ReactorType: PFR
+  ReactorShape: Cylinder
+  Radius: 0.05
+  Height: 0.15
+Particles:
+ ParticleType: Coal
+ FuelAirEquivalenceRatio: 1.0
+ CoalType: IllinoisNo6
+ VapModel: ON
+ DevModel: CPD
+ TarSootModel: ON
+ TarIsC2H2: True
+ SootIsCarbon: False
+ CharModel:
+  GasificationModel: FirstOrder
+  OxidationModel: LH
+ InitialConditions:
+ - value: 350
+   variable: T_part_init
+ - value: 1200
+   variable: rho_part_init
+ InflowConditions:
+ - value: 350
+   variable: T_part_inflow
+ - value: 1200
+   variable: rho_part_inflow
+ Size:
+  Distribution: Identity
+  Value: 5e-5
+FlowParameters:
+ ReynoldsNumber: 2e4
+

demos/PFR/Gas/Gas_PFR.yaml

+Cantera:
+ GroupName: h2-burke
+ InputFile: h2-burke.xml
+ReactionInGas: True
+InitialConditions:
+- value: 1000
+  variable: T
+- value: 101325
+  variable: p
+- value: 0.295774648
+  variable: X_H2
+- value: 0.147887324
+  variable: X_O2
+- value: 0.556338028
+  variable: X_N2
+- value: 0.5
+  variable: u
+Output:
+  dualtime_interval: 1
+  time_interval: 1
+  Fields:
+  - name: ds
+  - name: p
+TimeIntegrator:
+ dsInitial: 1e-10
+ GESAT_Max: 1e2
+ GESAT_Ramp: 1.1
+ GESAT_Safety: 0.1
+ end_time: 8e-4
+ timestep: 1e-7
+ tolerance: 1e-5
+ReactorParameters:
+  ReactorType: PFR
+  ReactorShape: Cylinder
+  Radius: 0.001
+  Height: 0.001

demos/ParticleHeatUp/ParticleHeatUp.yaml

@@ -38,7 +38,7 @@ TimeIntegrator:
 #  timestep: 1e-6
   tolerance: 1e-8
 ReactorParameters:
-  ReactorType: ConstantPressure
+  ReactorType: PSRConstantPressure
   Radius: 0.1
 Particles:
  ParticleType: Solid
@@ -49,27 +49,20 @@ Particles:
    variable: rho_part_init
  - value: 4200
    variable: cp_part_init
-# - value: 0
-#   variable: moist_mass_coal_init
  InflowConditions:
  - value: 1000
    variable: T_part_inflow
  - value: 1000
    variable: rho_part_inflow
- NumberOfParticles: 6
- NumberOfParticlesInflow: 12
+ ParticleLoading: 6
+ ParticleLoadingInflow: 12
  Size:
   Distribution: Uniform
   Upper: 10e-5
   Lower: 5e-5
-#  Distribution: Identity
-#  Value: 1e-4
-#  Distribution: UserDefinedList
-#  Values: [1e-4, 1e-5]
-#  Numbers: [1, 2]
  ParticleParameters:
   RadiationWithWall: OFF
   EmissivityPart: 0.01
   RadiationTemperature: 1200
 FlowParameters:
- KolmogorovScale: 1e-7
+ ReynoldsNumber: 2e4

demos/diff_mechanisms/methane.yaml

@@ -34,6 +34,5 @@ Output:
   Fields:
    - name: T_inflow
    - name: p_inflow
-Restart: False
 ReactorParameters:
-  ReactorType: ConstantVolume
+  ReactorType: PSRConstantVolume

demos/diff_mechanisms/syngas.yaml

@@ -38,6 +38,5 @@ Output:
   Fields:
    - name: T_inflow
    - name: p_inflow
-Restart: False
 ReactorParameters:
-  ReactorType: ConstantVolume
+  ReactorType: PSRConstantVolume

rtests/inputs/steady_cp_ad_closed__1pt.yaml

@@ -49,5 +49,5 @@ TimeIntegrator:
   tolerance: 1.e-12
   
 ReactorParameters:
-  ReactorType: ConstantPressure
+  ReactorType: PSRConstantPressure
 

rtests/inputs/steady_cp_ad_open__1pt.yaml

@@ -33,4 +33,4 @@ TimeIntegrator:
   tolerance: 1.e-12
 
 ReactorParameters:
-  ReactorType: ConstantPressure
\ No newline at end of file
+  ReactorType: PSRConstantPressure
\ No newline at end of file

rtests/inputs/steady_cp_conv_open__1pt.yaml

@@ -24,7 +24,7 @@ InflowConditions:
   variable: X_N2_inflow
 
 ReactorParameters:
-  ReactorType: ConstantPressure
+  ReactorType: PSRConstantPressure
   Radius: 1.e-3
   HeatTransferParameter:
     HeatTransferCoefficient: 1.e1

rtests/inputs/steady_cp_conv_open__Tsurroundvar.yaml

@@ -24,7 +24,7 @@ InflowConditions:
   variable: X_N2_inflow
 
 ReactorParameters:
-  ReactorType: ConstantPressure
+  ReactorType: PSRConstantPressure
   Radius: 1.e-3
   HeatTransferParameter:
     HeatTransferCoefficient: 1.e1

rtests/inputs/steady_cp_conv_open__hConvecvar.yaml

@@ -24,7 +24,7 @@ InflowConditions:
   variable: X_N2_inflow
 
 ReactorParameters:
-  ReactorType: ConstantPressure
+  ReactorType: PSRConstantPressure
   Radius: 1.e-3
   HeatTransferParameter:
     HeatTransferCoefficient:

rtests/inputs/steady_cv_ad_closed__1pt.yaml

@@ -51,5 +51,5 @@ TimeIntegrator:
   tolerance: 1.e-12
   
 ReactorParameters:
-  ReactorType: ConstantVolume
+  ReactorType: PSRConstantVolume
 

rtests/inputs/steady_cv_ad_closed__Tpzvar.yaml

@@ -44,4 +44,4 @@ TimeIntegrator:
   tolerance: 1.e-9
 
 ReactorParameters:
-  ReactorType: ConstantVolume
\ No newline at end of file
+  ReactorType: PSRConstantVolume
\ No newline at end of file

rtests/inputs/steady_cv_ad_closed__Tvar.yaml

@@ -38,4 +38,4 @@ TimeIntegrator:
   tolerance: 1.e-12
 
 ReactorParameters:
-  ReactorType: ConstantVolume
\ No newline at end of file
+  ReactorType: PSRConstantVolume
\ No newline at end of file

rtests/inputs/steady_cv_ad_closed__pvar.yaml

@@ -38,5 +38,5 @@ TimeIntegrator:
   tolerance: 1.e-12
   
 ReactorParameters:
-  ReactorType: ConstantVolume
+  ReactorType: PSRConstantVolume