Lines of Code
[root]/CCA/Components/Arches/SourceTerms
| Author | Changes | Lines of Code | Lines per Change |
|---|---|---|---|
| Totals | 118 (100.0%) | 1395 (100.0%) | 11.8 |
| jthornoc | 38 (32.2%) | 543 (38.9%) | 14.2 |
| derekhar | 17 (14.4%) | 364 (26.1%) | 21.4 |
| awabboud | 6 (5.1%) | 329 (23.6%) | 54.8 |
| harman | 48 (40.7%) | 126 (9.0%) | 2.6 |
| jsutherland | 6 (5.1%) | 17 (1.2%) | 2.8 |
| dav | 3 (2.5%) | 16 (1.1%) | 5.3 |
Recommitting Arches changes that were reverted by Dav's commit, r52897.
0 lines of code changed in 4 files:
Reverting code to r52880 before my memory use fix commit. While most tests passed, the ones using AMR and the dynamic load balancer were not passing and the weeds are too deep within them to quickly figure out what is causing the problems. Next week I will attempt to figure out what is going on with them. My guess is that it will take quite a bit of effort to understand the inner workings of the dynamic loadbalancer in order to get everything to work, so it may be quite a while before this fix may go in.
9 lines of code changed in 2 files:
Added an additional particle model for radiation. The constant complex-index-refraction model. Decoupled the particle temperature from the gas temperature for radiation.
32 lines of code changed in 2 files:
Multi-level RMCRT:
- removed maxLevels == 1 from the conditional.
This won't change the answers.
1 lines of code changed in 2 files:
- Removed global variables/methods that aren't being used.
- No longer computing sigmaT4 or cellType on non-arches levels
That's handled by RMCRT.
This won't change the answers.
24 lines of code changed in 3 files:
Merge conflicts.
24 lines of code changed in 2 files:
Global d_sigmaT4_label -> d_sigmaT4Label (consistency with the rest of the global labels)
RMCRT_test.cc/.h
- component defines either float or dbl RMCRT
- d_abskgLabel -> d_comp(onent)AbskgLabel
- No longer recomputing the abskg, temperature and cellType every timestep. Compute once in initialize()
and carryForward every timestep.
- Added DoublToFloat() task to scheduleTimeAdvance()
Arches/RMCRT.cc
- cleaned out DQMONEqnFac .h files
- component defines either float or dbl RMCRT
- scheduleTimeAdvance()
added calls to DoubleToFloat() task
- computeSource()
removed cellType carryForward. That's handled by RMCRT
Wasatch/RadiationSource
- component defines either float or dbl RMCRT
- Added DoublToFloat() task to scheduleTimeAdvance() to schedule_ray_tracing
RMCRTCommon.cc
- now using d_comp(onent)AbskgLabel and d_comp(onent)TempLabel
- Component now decides if communicated variables are doubles or floats
Added logic where appropriate.
More templates
- Added DoubleToFloat() task. This simply casts the CCVariable< double> -> CCVariable<float>
Radiometer
- Component now decides if communicated variables are doubles or floats
Added logic where appropriate.
More templates
Ray
- now using d_comp(onent)AbskgLabel and d_comp(onent)TempLabel
- Component now decides if communicated variables are doubles or floats
Added logic where appropriate.
More templates
- coarsen_Q(): This task carries forward coarse level variables on non-radCalc timesteps
- Added coarsen_cellType()task: This task computes cellType on the coarse levels, needs additional logic.
RayGPU.cc
d_sigmaT4_label -> d_sigmaT4Label (consistency with the rest of the labels)
OnTheFlyAnalysis/radiometer
- Component now decides if communicated variables are doubles or floats
______________________________________________________________________
S U M M A R Y
Failed: ARCHES-opt tests <<<< These tests fail due to an new material set for abskg. The answers are the same >>>
:rmcrt_bm1_ML: test failed comparison tests
:rmcrt_bm1_ML: (restart) test failed comparison tests
:rmcrt_bm1_DO: test failed comparison tests
:rmcrt_bm1_DO: (restart) test failed comparison tests
:rmcrt_bm1_ML_thread: test failed comparison tests
:rmcrt_bm1_DO_thread: test failed comparison tests
Failed: Examples-opt tests <<<< This commit drastically improves the answers >>>
:RMCRT_bm1_DO: test failed comparison tests
:RMCRT_bm1_DO: (restart) test failed comparison tests
:RMCRT_ML: test failed comparison tests
:RMCRT_ML: (restart) test failed comparison tests
Passed: Wasatch-opt tests!
29 lines of code changed in 1 file:
Made DO-radiation consisently use zero ghost
cells when allocating memory for the DO b array.
2 lines of code changed in 1 file:
Modified DO-radiation to use no ghost cells for the source term in the DO-Solve.
1 lines of code changed in 1 file:
This commit, moves all computations of abskp to radPropertyCalculator.cc. It also makes improvements to DO-radiation scattering, and radprops.
A new class was created in this commit, which contains the machinery for computing particle absorption coefficients.
This commit changes the answers to two arches tests, coal_channel and coal_RadPropsPlanck.
26 lines of code changed in 2 files:
Added Scattering in discrete ordinates radiation using the radProps property model. Also made some changes to reflections in discrete ordinates radiation. In this version, the complex index of refraction is a constant for all particles.
6 lines of code changed in 2 files:
Fixed compile time warnings, as well as a compile time error.
4 lines of code changed in 1 file:
This is Stage 1 of a commit which adds reflections for DO-Radiation. The RT-Tests are expected to fail, due to a new VarLabel in the checkpoints. The uda files are expected to remain unchanged.
64 lines of code changed in 2 files:
DQMOM cleanup: Will change answers.
Changes are due to name changes.
Changed the naming convention on the internal coordinate variable (icv)
to only have the internal coordinate root, then append an _# for the
environment.
Moved the DQMOM eqn registration into the DQMOM factory.
1 lines of code changed in 2 files:
Add a more generalized momentum drag source, adjust the momentum solver to actually call problemSetup on sources, fix drag model term.
329 lines of code changed in 6 files:
passing grid into RMCRT problemSetup().
1 lines of code changed in 1 file:
**Warning: Answer will change **
Derek and Jeremy making this commit:
Added bulletproofing for boundary temperatures in arches.
Radiation models including Discrete-Ordinates (DO) and Reverse-Monte-Carlo-Ray-Tracing (RMCRT) now are passed a new temperature variable called "radiation_temperature".
This new variable is a copy of temperature with modified boundary conditions, consistent with DO and RMCRT radiation models.
This is fixing a known bug where the temperature in the boundary conditions for inlets and outlets was incorrect for radiation.
The cell-centered variable "radiation_temperature" can be set in input files using Dirichlet, Neumann, and Tabulated boundary conditions.
ForcedDirichlet is applied for in place of Dirichlet for variable "radiation_temperature". This commit is expected to break all radiation RTests.
7 lines of code changed in 2 files:
Arches now sets the boundary conditions on temperature and abskg for single level problems.
For multi-level problems the boundary conditions are set by RMCRT.
7 lines of code changed in 1 file:
Moved BC bulletproofing code from problemSetup to new function.
The component can elect to not call this.
The flag d_onOff_setBC can now be set by the component and no longer a input file option.
For single level RMCRT problems the component should set all BCs and you want to set this
to be false, for multi-level you *may* want it be true.
Arches:RMCRT.cc
- added single level rmcrt algorithm to sched_computeSource()
Updated ups spec
42 lines of code changed in 2 files:
On active sources that are used multiple times: only call the extraSetup
once.
15 lines of code changed in 9 files:
Fix Warches - the poor, neglected step child.
0 lines of code changed in 2 files:
Arches currently uses two versions of wrap_uintah_field_as_spatialops(). One from Wasatch and another that has been pulled internally into Arches. This commit corrects usage of the one from Wasatch to conform to recent changes. Note that it is preferable to use the Wasatch version to avoid code duplication and make maintenance easier.
10 lines of code changed in 3 files:
Reversing the previous delete. This was causing segfaults in other
tests. However, valgrind is reporting it still as a "leak". I believe
the RT will as well.
Cleaning up some memory issues in other parts of Arches.
2 lines of code changed in 1 file:
** THIS COMMIT CHANGES THE ANSWERS **
Moving the radiation properties into the property model. Currently, the
properties are being computed every timestep on every RK stage. This
fact changes the answers from previous results. Also, the ERSCG term was
moved into the fortran for DORadiation which also caused some numerical
fuzzzzzzzzzz.
With this commit, the radiation properties are completely independent
from the radiation model allowing for use of multiple radiation models
at once (ie, DORadiation + RMCRT virtual radiaometer).
22 lines of code changed in 3 files:
Complete divorce of the radiation properties from the radiation models
themselves. This simplified the radiation models considerably. The
properties are now being computed upstream and only accessed by the
models themselves.
For the RadProps models with particles, the particle interface needs to
added back in. It should be done in a generic way so as not to preclude
any CQMOM interface.
46 lines of code changed in 4 files:
Cleaning up the abskg/abskp stuff for the DO radiation model.
Also pulled some weeds and spruced the place up.
96 lines of code changed in 1 file:
Changed how Arches.cc interfaces with radproperty_Calculator.
Changed default name of abskp to abskp_HS.
Removed redundant and unneeded line in DORadiation.cc.
0 lines of code changed in 1 file:
This patch changes the interface used to invoke radiation property models: hottel-sarofim, Burns-christian, and constant.
///---IMPORTANT!! OLD INPUT FILES WILL NO LONGER PARSE CORRECTLY AND MUST INVOKE THE DESIRED PROPERTY MODEL USING "property_calculator" WITHIN THE RADIATION MODEL --//
The property models are now called using property_calculator. The regression test input files show the correct syntax to invoke the property models.
This was done to improve the modularity of the code.
A coal regression test has also been added.
Other notes:
--The OPL for hottel-sarofim can no longer be passed through the radiation model and must also be passed through the property_calculator.
--The label for the absorption coefficient must be set through the property_calculator.
--For coal cases, the label of abskp must be set to "Julien_abskp" in both the PropertyModel and property_calculator. The user will be given more freedom in future patches. This was done to prevent a multiple-computes error.
--For coal cases, computation of the abskp values is less than ideal. Currently, abskp is computed for every time step, however it is only needed when then the radiation solve is executed. This will be removed in future patches.
--For coal cases, a bug was removed where abskp was summed to be 3x its correct value when using second order Runge-Kutta. Fortunately, first order Runge-Kutta computed the correct value for abskp.
229 lines of code changed in 5 files:
Pulled weeds, removed the variable _label_sched_init. It's no longer needed.
22 lines of code changed in 37 files:
Get Warches compiling again.
7 lines of code changed in 1 file:
* Put in a warches source term for testing.
* Remove a repeated spec.
277 lines of code changed in 3 files:
Fixed a number of warnings. ICC compiler pointed out a number of
times where functions where returning "const int" (or some such), and
that it does not make any sense to return a const number, as the
caller can do what they want with the result. (This removes 1000s of
warning messages during compilation.)
(I assume that the author did not mean to put the "const" after the
function name? It didn't appear that this was what was desired, but
perhaps he/she could take a look?)
Also, removed a lot of stray ';'s (semi-colons). Seems like someone
just randomly through them in without knowing what lines require them
and what lines do not. I only removed the ones near the locations of
the "const" return values, but there are probably many more that
should be cleaned up.
M TransportEqns/EqnBase.h
Removed const from return value of get_stage().
M Radiation/RadPropertyCalculator.h
M Radiation/RadPropertyCalculator.cc
Removed const from return value of does_scattering().
M SourceTerms/SourceTermBase.h
Removed const from return value of stage_compute().
7 lines of code changed in 1 file:
Whoops. Reversing an earlier commit that was suppose to fix a
conversion factor. Turns out it was correct all along.
1 lines of code changed in 1 file:
To get the residence time to work properly, you must be solving the
transport equation post table-lookup and be using the new density for
the RHS to get the correct time.
8 lines of code changed in 1 file:
Fixing a typo in the previous unit conversion update for the NOx model.
Adding a density weighting option for the constant source term to enable
residence time calculations for variable density.
43 lines of code changed in 4 files:
Use MW of NO rather than NO2 for the NOx model.
1 lines of code changed in 1 file:
Eliminated the carryforward task. That code has been moved to the rayTrace task
Added calc_frequency tag to ups files.
RMCRT_test_1L.ups & RMCRT_bm1_DO.ups:
- set calc_frequency to 2.
This should not change the answers.
0 lines of code changed in 1 file: