Skip to content

Commit

Permalink
Merge branch 'fix.adaptiveSurfFlux' into 'master.dev'
Browse files Browse the repository at this point in the history 
[fix.adaptiveSurfFlux] Correct weighting based on volume flow rate in adaptive surface flux Type 4

See merge request piclas/piclas!733
  • Loading branch information
@pnizenkov
pnizenkov committed Dec 7, 2022
2 parents 10cc6a1 + 6882692 commit c6341d3
Show file tree
Hide file tree
Showing 8 changed files with 243 additions and 249 deletions.
82 changes: 31 additions & 51 deletions regressioncheck/WEK_DSMC/ChannelFlow_AdaptiveBoundary_ConstMassflow/PartAnalyze_ref.csv
View file
Original file line number Diff line number Diff line change
@@ -1,52 +1,32 @@
001-TIME,002-Massflow-Spec-001-SF-001,003-Pressure-Spec-001-SF-001,004-Massflow-Spec-001-SF-002,005-Pressure-Spec-001-SF-002
0.00000000000000E+000,0.00000000000000E+000,0.00000000000000E+000,0.00000000000000E+000,0.00000000000000E+000
1.00000000000000E-006,8.27368199200000E-014,0.00000000000000E+000,-8.29546742400000E-014,0.00000000000000E+000
2.00000000000000E-006,6.32840232000000E-014,0.00000000000000E+000,-6.30130336800000E-014,0.00000000000000E+000
3.00000000000000E-006,6.11107935200000E-014,0.00000000000000E+000,-6.03881548000000E-014,0.00000000000000E+000
4.00000000000000E-006,6.15890103200000E-014,0.00000000000000E+000,-6.00799706400000E-014,0.00000000000000E+000
5.00000000000000E-006,7.53669676800000E-014,4.34392701564538E+000,-2.93625115200000E-014,1.70781235745906E-001
6.00000000000000E-006,6.64721352000000E-014,4.34392701564538E+000,-4.72797009600000E-014,1.70781235745906E-001
7.00000000000000E-006,6.30927364800000E-014,4.34392701564538E+000,-5.16899225600000E-014,1.70781235745906E-001
8.00000000000000E-006,6.20034648800000E-014,4.34392701564538E+000,-5.42722932800000E-014,1.70781235745906E-001
9.00000000000000E-006,5.65464798400000E-014,4.34392701564538E+000,-5.51383970400000E-014,1.70781235745906E-001
1.00000000000000E-005,5.59726196800000E-014,5.05858979674000E+000,-2.65304053600000E-014,1.17976454291038E+000
1.10000000000000E-005,5.36771790400000E-014,5.05858979674000E+000,-4.36824479200000E-014,1.17976454291038E+000
1.20000000000000E-005,5.52127863200000E-014,5.05858979674000E+000,-4.68971275200000E-014,1.17976454291038E+000
1.30000000000000E-005,5.54731488000000E-014,5.05858979674000E+000,-4.84327348000000E-014,1.17976454291038E+000
1.40000000000000E-005,5.42776068000000E-014,5.05858979674000E+000,-5.00692989600000E-014,1.17976454291038E+000
1.50000000000000E-005,4.80873560000000E-014,5.00431815788286E+000,-2.73327468800000E-014,1.57154527889946E+000
1.60000000000000E-005,4.92722709600000E-014,5.00431815788286E+000,-4.07918930400000E-014,1.57154527889946E+000
1.70000000000000E-005,4.97929959200000E-014,5.00431815788286E+000,-4.23912625600000E-014,1.57154527889946E+000
1.80000000000000E-005,4.66899002400000E-014,5.00431815788286E+000,-4.34858476800000E-014,1.57154527889946E+000
1.90000000000000E-005,4.54305960000000E-014,5.00431815788286E+000,-4.49151845600000E-014,1.57154527889946E+000
2.00000000000000E-005,5.27526265600000E-014,5.01017348801521E+000,-2.62009671200000E-014,1.88903617715045E+000
2.10000000000000E-005,4.65730028000000E-014,5.01017348801521E+000,-3.97238755200000E-014,1.88903617715045E+000
2.20000000000000E-005,4.80023396800000E-014,5.01017348801521E+000,-4.04465142400000E-014,1.88903617715045E+000
2.30000000000000E-005,4.62010564000000E-014,5.01017348801521E+000,-4.20405702400000E-014,1.88903617715045E+000
2.40000000000000E-005,4.46920167200000E-014,5.01017348801521E+000,-4.32201716800000E-014,1.88903617715045E+000
2.50000000000000E-005,3.71574453600000E-014,5.03899597131423E+000,-2.88524136000000E-014,2.05759004367976E+000
2.60000000000000E-005,3.90915666400000E-014,5.03899597131423E+000,-3.65570176000000E-014,2.05759004367976E+000
2.70000000000000E-005,3.99948650400000E-014,5.03899597131423E+000,-3.76622297600000E-014,2.05759004367976E+000
2.80000000000000E-005,4.00745678400000E-014,5.03899597131423E+000,-4.06059198400000E-014,2.05759004367976E+000
2.90000000000000E-005,3.93625561600000E-014,5.03899597131423E+000,-3.92297181600000E-014,2.05759004367976E+000
3.00000000000000E-005,3.84592577600000E-014,4.97788906577944E+000,-2.96281875200000E-014,2.24000824653455E+000
3.10000000000000E-005,3.99523568800000E-014,4.97788906577944E+000,-3.45803881600000E-014,2.24000824653455E+000
3.20000000000000E-005,3.68333206400000E-014,4.97788906577944E+000,-3.46441504000000E-014,2.24000824653455E+000
3.30000000000000E-005,4.02817951200000E-014,4.97788906577944E+000,-3.67323637600000E-014,2.24000824653455E+000
3.40000000000000E-005,3.70192938400000E-014,4.97788906577944E+000,-3.62382064000000E-014,2.24000824653455E+000
3.49999999999999E-005,3.93359885600000E-014,4.98920254714498E+000,-3.23752773600000E-014,2.26883563269608E+000
3.59999999999999E-005,3.88471447200000E-014,4.98920254714498E+000,-3.58875140800000E-014,2.26883563269608E+000
3.69999999999999E-005,3.72371481600000E-014,4.98920254714498E+000,-3.59512763200000E-014,2.26883563269608E+000
3.79999999999999E-005,3.47504208000000E-014,4.98920254714498E+000,-3.53561620800000E-014,2.26883563269608E+000
3.89999999999999E-005,3.70352344000000E-014,4.98920254714498E+000,-3.78800840800000E-014,2.26883563269608E+000
3.99999999999999E-005,3.51276807200000E-014,4.95200409212670E+000,-2.97769660800000E-014,2.30490302530031E+000
4.09999999999999E-005,3.52286376000000E-014,4.95200409212670E+000,-3.52445781600000E-014,2.30490302530031E+000
4.19999999999999E-005,3.74284348800000E-014,4.95200409212670E+000,-3.45857016800000E-014,2.30490302530031E+000
4.29999999999999E-005,3.36452086400000E-014,4.95200409212670E+000,-3.40437226400000E-014,2.30490302530031E+000
4.39999999999999E-005,3.37833601600000E-014,4.95200409212670E+000,-3.36239545600000E-014,2.30490302530031E+000
4.49999999999999E-005,3.52339511200000E-014,4.98529594272020E+000,-3.03933344000000E-014,2.41212765247496E+000
4.59999999999999E-005,3.17907901600000E-014,4.98529594272020E+000,-3.41127984000000E-014,2.41212765247496E+000
4.69999999999999E-005,3.43678473600000E-014,4.98529594272020E+000,-3.46919720800000E-014,2.41212765247496E+000
4.79999999999999E-005,3.52073835200000E-014,4.98529594272020E+000,-3.47557343200000E-014,2.41212765247496E+000
4.89999999999999E-005,3.55049406400000E-014,4.98529594272020E+000,-3.66632880000000E-014,2.41212765247496E+000
5.00000000000000E-005,3.88205771199928E-014,4.97308033474993E+000,-3.59618810399942E-014,2.44818685295101E+000
0.0000000000000000E+000,0.0000000000000000E+000,0.0000000000000000E+000,0.0000000000000000E+000,0.0000000000000000E+000
0.1000000000000000E-005,-.2160477232000007E-014,0.5438100504172863E+000,0.1301281047999999E-013,0.2551613014067587E+001
0.2000000000000000E-005,0.4997896912000020E-014,0.1294771852625714E+001,0.1821793467200001E-013,0.2522460339588515E+001
0.3000000000000000E-005,0.1148783024000000E-013,0.1607708488706000E+001,0.1194479295999999E-013,0.2507726067154505E+001
0.4000000000000000E-005,0.1461430540800002E-013,0.1844670173859858E+001,0.6447425167999980E-014,0.2508081298992916E+001
0.5000000000000000E-005,0.1741240503999998E-013,0.2042083618751872E+001,-.8395361599999189E-016,0.2510614047512956E+001
0.6000000000000001E-005,0.2088000819200000E-013,0.2370947583486195E+001,-.4208307840000003E-014,0.2515927055831678E+001
0.7000000000000002E-005,0.2256651944000001E-013,0.2679163296266943E+001,-.9919279135999999E-014,0.2522177171671231E+001
0.8000000000000001E-005,0.2453783536000000E-013,0.2937511632231268E+001,-.1417647136000000E-013,0.2538381520496905E+001
0.9000000000000002E-005,0.2645176526400002E-013,0.3153553886098444E+001,-.1623386630400000E-013,0.2553399419209018E+001
0.1000000000000000E-004,0.2653784428800007E-013,0.3334749837248620E+001,-.1990657132800005E-013,0.2566844253875795E+001
0.1100000000000000E-004,0.2777270633600001E-013,0.3492953624889923E+001,-.2192783433600001E-013,0.2570335420450902E+001
0.1200000000000000E-004,0.3024243043200002E-013,0.3621778685508302E+001,-.2422327497599998E-013,0.2574217960123442E+001
0.1300000000000000E-004,0.3107771577599999E-013,0.3738757438283882E+001,-.2563242047999999E-013,0.2579682290620827E+001
0.1400000000000000E-004,0.3111809852799999E-013,0.3823138284903422E+001,-.2775251496000002E-013,0.2575956093329860E+001
0.1500000000000000E-004,0.3034976353599999E-013,0.3902495665276909E+001,-.2966963297600000E-013,0.2570122033964163E+001
0.1600000000000000E-004,0.3368559139199998E-013,0.3971010192852202E+001,-.3042627822400002E-013,0.2571869474677951E+001
0.1700000000000000E-004,0.3243903960000001E-013,0.4015182312569924E+001,-.3090662043200000E-013,0.2567865329490435E+001
0.1800000000000000E-004,0.3333277366400000E-013,0.4054365668882586E+001,-.3153149038400000E-013,0.2557568567319311E+001
0.1899999999999999E-004,0.3436040843200001E-013,0.4105523487124288E+001,-.3189706056000001E-013,0.2551679261347710E+001
0.2000000000000000E-004,0.3273447131199942E-013,0.4131746825633499E+001,-.3220843283199944E-013,0.2552036487020768E+001
0.2100000000000000E-004,0.3345923544000000E-013,0.4157128781561378E+001,-.3276210161600001E-013,0.2539856945002305E+001
0.2200000000000000E-004,0.3470366182399999E-013,0.4187447617109554E+001,-.3400440259199999E-013,0.2537024662230533E+001
0.2299999999999999E-004,0.3539335672000000E-013,0.4204019117093607E+001,-.3398421121600001E-013,0.2538983258948380E+001
0.2399999999999999E-004,0.3449005831999997E-013,0.4220405331369403E+001,-.3314148694400001E-013,0.2537614088417073E+001
0.2499999999999999E-004,0.3453788000000000E-013,0.4241800629420518E+001,-.3421906880000000E-013,0.2535444492139198E+001
0.2599999999999998E-004,0.3390769652799999E-013,0.4254092336491262E+001,-.3445711449600000E-013,0.2544904136886347E+001
0.2699999999999998E-004,0.3445286368000001E-013,0.4264381532485316E+001,-.3507242011200000E-013,0.2547404515918131E+001
0.2799999999999998E-004,0.3477805110400002E-013,0.4267891937629085E+001,-.3342097809600000E-013,0.2549471886043859E+001
0.2899999999999998E-004,0.3523076300799998E-013,0.4263639231454835E+001,-.3468878396800000E-013,0.2553729581195537E+001
0.3000000000000000E-004,0.3573873551999816E-013,0.4262598101513217E+001,-.3429664619199823E-013,0.2546734480158401E+001
5 changes: 2 additions & 3 deletions regressioncheck/WEK_DSMC/ChannelFlow_AdaptiveBoundary_ConstMassflow/analyze.ini
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
compare_data_file_name = PartAnalyze.csv
compare_data_file_reference = PartAnalyze_ref.csv
compare_data_file_tolerance = 0.20
compare_data_file_tolerance_type = relative
compare_data_file_max_differences = 1
compare_data_file_tolerance = 0.15
compare_data_file_tolerance_type = relative
2 changes: 1 addition & 1 deletion regressioncheck/WEK_DSMC/ChannelFlow_AdaptiveBoundary_ConstMassflow/command_line.ini
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
MPI = 6
MPI = 12
cmd_suffix = DSMC.ini
Binary file modified regressioncheck/WEK_DSMC/ChannelFlow_AdaptiveBoundary_ConstMassflow/cube_mesh.h5
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions regressioncheck/WEK_DSMC/ChannelFlow_AdaptiveBoundary_ConstMassflow/hopr.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ DebugVisuLevel=2
NVisu =1
Mode =1

Corner =(/0.0,0.0,0.0 ,, 15.0,0.0,0.0 ,, 15.0,1.0,0.0 ,, 0.0,1.0,0.0 ,, 0.0,0.0,1.0 ,, 15.0,0.0,1.0 ,, 15.0,1.0,1.0 ,, 0.0,1.0,1.0 /)
nElems =(/100,4,4/)
Corner =(/0.0,0.0,0.0 ,, 10.0,0.0,0.0 ,, 10.0,1.0,0.0 ,, 0.0,1.0,0.0 ,, 0.0,0.0,1.0 ,, 10.0,0.0,1.0 ,, 10.0,1.0,1.0 ,, 0.0,1.0,1.0 /)
nElems =(/40,4,4/)
elemtype =108

BCIndex =(/6 ,4 ,1 ,3 ,2 ,5/)
Expand Down
25 changes: 17 additions & 8 deletions regressioncheck/WEK_DSMC/ChannelFlow_AdaptiveBoundary_ConstMassflow/parameter.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ TimeStampLength = 14
! =============================================================================== !
! CALCULATION
! =============================================================================== !
tend = 5.0E-5
Analyze_dt = 2.5E-5
tend = 3.0E-5
Analyze_dt = 1.0E-5
CFLscale = 0.2 ! Scaling of theoretical CFL number
! Load balancing
DoLoadBalance = T
PartWeightLoadBalance = T
Load-DeviationThreshold = 0.01
Load-DeviationThreshold = 0.05
LoadBalanceMaxSteps = 1
! =============================================================================== !
! PARTICLES
Expand Down Expand Up @@ -82,7 +82,7 @@ Part-FIBGMdeltas=(/2e-6,2e-6,2e-6/)
! Species1 - O2
! =============================================================================== !
Part-Species1-MassIC=5.31352E-26
Part-Species1-MacroParticleFactor=2E2
Part-Species1-MacroParticleFactor=1E2

Part-Species1-nInits=1
Part-Species1-Init1-SpaceIC=cell_local
Expand Down Expand Up @@ -119,7 +119,16 @@ Part-Species1-Surfaceflux2-Adaptive=TRUE
Part-Species1-Surfaceflux2-Adaptive-Type=2
Part-Species1-Surfaceflux2-Adaptive-Pressure=2.5

AdaptiveBC-RelaxationFactor = 0.2
! Continuous sample, where the current value is added partially, multiplied the relaxation factor
AdaptiveBC-RelaxationFactor = 0.1
! Sample is reset every given number of iterations
AdaptiveBC-SamplingIteration = 0,10,10,10
!AdaptiveBC-SamplingIteration = 10
! Sample is not reset, current value replaces the oldest (DEFAULT: TRUE)
AdaptiveBC-TruncateRunningAverage = F,F,T,T
! Average the sample over the whole BC
AdaptiveBC-AverageValuesOverBC = F,F,F,T
nocrosscombination:AdaptiveBC-SamplingIteration,AdaptiveBC-TruncateRunningAverage,AdaptiveBC-AverageValuesOverBC
! =============================================================================== !
! DSMC
! =============================================================================== !
Expand All @@ -129,10 +138,10 @@ Particles-NumberForDSMCOutputs=1
Part-TimeFracForSampling=0.25
Particles-DSMC-CalcSurfaceVal=true
UseDSMC=true
Particles-DSMC-CollisMode=2 !(1:elast coll, 2: elast + rela, 3:chem)
Particles-DSMC-CollisMode=2
Part-NumberOfRandomSeeds=2
Particles-RandomSeed1=1
Particles-RandomSeed2=2
Particles-RandomSeed1=3
Particles-RandomSeed2=4
Particles-DSMC-UseOctree = T
Particles-DSMC-UseNearestNeighbour = T
Particles-DSMC-CalcQualityFactors= F
Loading

0 comments on commit c6341d3

Please sign in to comment.