Directory CCA/Components/Arches/ParticleModels/

Total Files:
23
Deleted Files:
2
Lines of Code:
5636

[root]/CCA/Components/Arches/ParticleModels

Lines of Code

CCA/Components/Arches/ParticleModels/ Lines of Code

Developers

Author Changes Lines of Code Lines per Change
Totals 131 (100.0%) 3117 (100.0%) 23.7
jthornoc 95 (72.5%) 2638 (84.6%) 27.7
derekhar 8 (6.1%) 217 (7.0%) 27.1
dav 4 (3.1%) 109 (3.5%) 27.2
dsunder 3 (2.3%) 82 (2.6%) 27.3
u0407585 12 (9.2%) 50 (1.6%) 4.1
wyxpuma 3 (2.3%) 14 (0.4%) 4.6
bisaac 4 (3.1%) 6 (0.2%) 1.5
ahumphrey 2 (1.5%) 1 (0.0%) 0.5

Most Recent Commits

jthornoc 2016-12-22 15:34 Rev.: 56144

Warning.

0 lines of code changed in 2 files:

  • CCA/Components/Arches/ParticleModels: ShaddixEnthalpy.h (new)
jthornoc 2016-12-22 15:33 Rev.: 56131

Adding a stub for a kokkos momentum solver.
Adding a print statement for registered Arches tasks.

1 lines of code changed in 2 files:

  • CCA/Components/Arches/ParticleModels: ParticleModelFactory.cc (new)
jthornoc 2016-11-18 16:33 Rev.: 55988

Have the solvers generate the new task factories rather than Arches.cc

3 lines of code changed in 2 files:

  • CCA/Components/Arches/ParticleModels: CoalHelper.h (new)
jthornoc 2016-09-21 12:17 Rev.: 55776

Reduce the domain edge BC information to be contained to local patches
only. Also reduce the numbers of reduction variables for inlet areas to
only occur in the case of Swirl and MassFlow inlets.

Clean up some warnings.

This commit should only change the answers for the
channel_LagPart_inlet.

0 lines of code changed in 1 file:

  • CCA/Components/Arches/ParticleModels: ShaddixEnthalpy.h (-3)
dav 2016-09-06 12:58 Rev.: 55704


The main updates in this commit are to configure and the build system:
A number of bullet-proofing / clean-ups have been added to configure,
and the dependency of Arches on Wasatch has been removed. (Note,
Arches still needs to build TabProps/RadProps in the Wasatch 3P.) I
have tested this on several machines, but it is possible that it will
now catch some peoples' bad configure lines (that 'worked' before but
only accidentally). If your configure stops working because of this
commit, please let me know so I can help you fix it. -Dav

M configure
M configure.ac

- Force bad configure command line arguments to be errors instead of warnings.
This will help avoid users accidentally mis-typing an arg and not noticing.
The autoconf configure system does not normally allow this to happen as
their philosophy is that configure usually calls a sub-configure and passes
args down to it... Thus configure "ignores" bad args under the theory that
a "sub configure" will use them. However, we don't do this and this will
help catch configure command line typos and potentially save developers and
users a lot of headaches.

The bad news is that in order to get this functionality, we have
to hack the autconf'd generated configure script and add a
variable (enable_option_checking=fatal) at the top. I have added
a section to configure.ac with the information about doing this,
but anyone who re-generates configure needs to manually follow the
instructions.

- Configure now will immediately tell you if you have typed in an invalid
file/directory name (bad spelling, doesn't exist) for the --with flags.
Perviously this occurred manually each time (now it is part of the macro)
at the point in the configure script when the library was tested for.

- Fix handling of finding the C/C++ compilers and version checking better.
Configure now determines which compiler (eg: GCC, ICC, XLC) you are
using explicitly and can test for things (like version) appropriately.
The version check may still need to be updated a little.

- Updated the --with handling to know whether the flag was set or not. Previously
we were using a "" (blank) value, which was ambiguous.

- Flag --without as invalid on anything we don't explicitly handle (we
only handle without on a few things such as: --without-fortran or
--without-hypre).

- Allow the external Wasatch 3P to be specified on a single line (instead
of having a separate line for SpatialOps, ExprLib, etc) using
--with-wasatch3p=DIR. This will find all 4 W3P libs with one configure line.

- Got rid of IS_VS (wasn't set/used and don't know what it was for).

- While "no" and no (without quotes) are the same thing to configure, be consistent
and use "no" (with quotes) everywhere.

- Remove the BUILD_WASATCH_FOR_ARCHES logic, as we no longer need Wasatch to
be built for Arches.

- Clean up the left over files from relatively new MPI const test section.

- Fix the HAVE_ACCELERATE

- Update --enable-wasatch_3p to take a list of libs to build (in the case you only
wish to build a subset. Eg: --enable-wasatch_3p=radprops,tabprops
Pass list of libs to the build_wasatch_3p.sh script.

17 lines of code changed in 2 files:

  • CCA/Components/Arches/ParticleModels: sub.mk (new)
bisaac 2016-08-17 17:07 Rev.: 55656

Removed the running-sum averaging variables from the deposition model and wall heat transfer model. Removed t_ave_start flag. Modified the way the deposition rate is accounting for multiple environments. This commit is expected to change the answers, and the number of saved variables for the arches rt test: 1GW_RT.

6 lines of code changed in 4 files:

  • CCA/Components/Arches/ParticleModels: DepositionVelocity.cc (+6 -95), DepositionVelocity.h (new)
jthornoc 2016-08-09 14:03 Rev.: 55618

Dont output init timestep on coal_channel_hi_vel because this seems to
be causing problems for the RT.

Clean up some warnings.

3 lines of code changed in 1 file:

  • CCA/Components/Arches/ParticleModels: DepositionVelocity.cc (+3 -3)
jthornoc 2016-08-09 14:03 Rev.: 55617

Missing include.

0 lines of code changed in 2 files:

  • CCA/Components/Arches/ParticleModels: RateDeposition.cc (changed)
jthornoc 2016-08-09 14:03 Rev.: 55616

Removing Operators.

281 lines of code changed in 34 files:

  • CCA/Components/Arches/ParticleModels: BodyForce.h (+7 -16), CoalDensity.cc (+3 -6), CoalDensity.h (new), CoalMassClip.cc (new), CoalMassClip.h (new), CoalTemperature.cc (new), CoalTemperature.h (new), Constant.h (new), DepositionVelocity.cc (+5 -8), DepositionVelocity.h (+29 -33), DragModel.h (new), ExampleParticleModel.h (new), FOWYDevol.h (+7 -16), RateDeposition.cc (+108 -118), RateDeposition.h (new), ShaddixEnthalpy.h (+6 -13), ShaddixOxidation.h (new), TotNumDensity.cc (+2 -5), TotNumDensity.h (new)
jthornoc 2016-08-09 14:03 Rev.: 55615

Removing spatialops includes.
Converting Lagrangian particle to standard Uintah loops.

2 lines of code changed in 7 files:

  • CCA/Components/Arches/ParticleModels: CoalTemperature.cc (-2), Constant.h (-2), DragModel.h (-1), ExampleParticleModel.h (-4), FOWYDevol.h (-1), ParticleModelFactory.cc (-2), TotNumDensity.cc (+2 -3)
jthornoc 2016-08-09 14:02 Rev.: 55612

Change relaxation_coe to relation_coef.

Change channel_WD_CO to have a shorter, symmetric geometry.

1 lines of code changed in 1 file:

  • CCA/Components/Arches/ParticleModels: DepositionVelocity.cc (+1 -1)
jthornoc 2016-08-09 14:02 Rev.: 55611

Kokkos for RateDeposition.

Committed for Minmin (he did the hard work).

757 lines of code changed in 2 files:

  • CCA/Components/Arches/ParticleModels: RateDeposition.cc (+621 -561), RateDeposition.h (+136 -244)
jthornoc 2016-08-09 14:02 Rev.: 55610

Make sure coal density is initialized to zero in the extra cells.
Add a wall-deposition test (contribution from Minmin).

7 lines of code changed in 1 file:

  • CCA/Components/Arches/ParticleModels: CoalDensity.cc (+7 -2)
jthornoc 2016-08-09 14:02 Rev.: 55608

Turn off Yamamoto. This model isnt implemented correctly and is
producing garbage.

Change the branching in CoalDensity. This keeps answers consistent with
the SpatialOps implementation so as not to change answers.

39 lines of code changed in 1 file:

  • CCA/Components/Arches/ParticleModels: CoalDensity.cc (+39 -8)
jthornoc 2016-08-09 14:02 Rev.: 55605

Kokkos -> ShaddixOxidation. This seems to have changed the answers for
CQMOM_coal_test. This isnt too surprising because the SO version was
iterating the entire patch with the same number of iterations while this
new version is iterating pointwise. The differences seem like fuzz.

310 lines of code changed in 3 files:

  • CCA/Components/Arches/ParticleModels: ParticleModelFactory.cc (+9 -13), ShaddixEnthalpy.h (-1), ShaddixOxidation.h (+301 -291)
jthornoc 2016-08-09 14:02 Rev.: 55604

Kokkos -> ShaddixEnthalpy.

301 lines of code changed in 2 files:

  • CCA/Components/Arches/ParticleModels: ParticleModelFactory.cc (+5 -10), ShaddixEnthalpy.h (+296 -285)
jthornoc 2016-08-09 14:02 Rev.: 55603

Kokkos into FOWY (new version).
This model still needs to be updated to be consistent with the version
Ben was developing.

184 lines of code changed in 2 files:

  • CCA/Components/Arches/ParticleModels: FOWYDevol.h (+183 -173), ParticleModelFactory.cc (+1 -1)
jthornoc 2016-08-09 14:02 Rev.: 55602

Fixed the bug with partMassFlow.ups and cleaned up the files a little.

196 lines of code changed in 4 files:

  • CCA/Components/Arches/ParticleModels: CoalDensity.cc (+12 -36), CoalDensity.h (+42 -39), CoalTemperature.cc (+136 -55), CoalTemperature.h (+6 -161)
jthornoc 2016-08-09 14:02 Rev.: 55594

More kokkos into Arches.

Injecting some parallel_for into DepositionVelocity. This still needs
work.

67 lines of code changed in 3 files:

  • CCA/Components/Arches/ParticleModels: DepositionVelocity.cc (+47 -49), DragModel.h (-31), TotNumDensity.cc (+20 -32)
jthornoc 2016-08-09 14:01 Rev.: 55593

Turns out that multipying your model by a random number is a bad idea.

(fix a missing initialization on m_pi)

80 lines of code changed in 1 file:

  • CCA/Components/Arches/ParticleModels: DragModel.h (+80 -12)
jthornoc 2016-08-09 14:01 Rev.: 55592

Missing initialization of a couple variables.

3 lines of code changed in 1 file:

  • CCA/Components/Arches/ParticleModels: DragModel.h (+3)
jthornoc 2016-08-09 14:01 Rev.: 55591

Get the example cleaned up and working.

22 lines of code changed in 2 files:

  • CCA/Components/Arches/ParticleModels: ExampleParticleModel.h (+21 -37), ParticleModelFactory.cc (+1 -1)
jthornoc 2016-08-09 14:01 Rev.: 55590

Drag model -> Kokkos

Updated input files + spec.

114 lines of code changed in 5 files:

  • CCA/Components/Arches/ParticleModels: BodyForce.h (+5 -5), CoalDensity.cc (+14 -14), CoalTemperature.cc (+6 -6), DragModel.h (+78 -106), ParticleModelFactory.cc (+11 -11)
jthornoc 2016-08-09 14:01 Rev.: 55588

Kokkos for CoalTemperature.
Update OFC4_smith to use correct input.

19 lines of code changed in 1 file:

  • CCA/Components/Arches/ParticleModels: CoalTemperature.cc (+19 -23)
jthornoc 2016-08-09 14:01 Rev.: 55587

GridTools->ArchesCore namespace.

2 lines of code changed in 1 file:

  • CCA/Components/Arches/ParticleModels: BodyForce.h (+2 -2)
jthornoc 2016-08-09 14:01 Rev.: 55586

Typos.

2 lines of code changed in 1 file:

  • CCA/Components/Arches/ParticleModels: CoalDensity.cc (+2 -2)
jthornoc 2016-08-09 14:01 Rev.: 55585

Kokkos-ized CoalDensity.

56 lines of code changed in 1 file:

  • CCA/Components/Arches/ParticleModels: CoalDensity.cc (+56 -81)
jthornoc 2016-08-09 14:01 Rev.: 55584

Kokkos-izing BodyForce.

56 lines of code changed in 2 files:

  • CCA/Components/Arches/ParticleModels: BodyForce.h (+53 -56), ParticleModelFactory.cc (+3 -3)
jthornoc 2016-08-09 14:01 Rev.: 55583

Constant Particle Lambda.

28 lines of code changed in 2 files:

  • CCA/Components/Arches/ParticleModels: Constant.h (+18 -22), ParticleModelFactory.cc (+10 -14)
jthornoc 2016-08-09 14:01 Rev.: 55582

Lambdas for CoalMassClip. This model wasn't under RT but isn\'t being
use. It may need to be pruned.

10 lines of code changed in 1 file:

  • CCA/Components/Arches/ParticleModels: CoalMassClip.cc (+10 -15)
jthornoc 2016-08-09 14:01 Rev.: 55581

Remove CoalTemperatureNebo.
Update SampleTask with lambdas.

0 lines of code changed in 4 files:

  • CCA/Components/Arches/ParticleModels: CoalTemperatureNebo.cc (del), CoalTemperatureNebo.h (del), ParticleModelFactory.cc (-9), sub.mk (-1)
wyxpuma 2016-07-27 12:08 Rev.: 55552

to update the deposition thickness calculation by relaxation strategy

13 lines of code changed in 2 files:

  • CCA/Components/Arches/ParticleModels: DepositionVelocity.cc (+12 -4), DepositionVelocity.h (+1)
ahumphrey 2016-06-13 11:46 Rev.: 55440

Replace usage of NULL macro (type int) with nullptr (pointer literal of type: nullptr_t).

nullptr is implicitly convertible and comparable to any pointer type or pointer-to-member type, but is not implicitly comparable to integral types, except that it is convertible to bool (explicitly).

1 lines of code changed in 2 files:

  • CCA/Components/Arches/ParticleModels: ParticleTools.h (new)
derekhar 2016-05-20 16:21 Rev.: 55371

Removing code duplication that was used for functor profiling.

0 lines of code changed in 2 files:

  • CCA/Components/Arches/ParticleModels: CoalTemperature.cc (-99), CoalTemperature.h (-2)
dav 2016-05-16 14:48 Rev.: 55353


Fix the problem with fortran .h files (in Arches) not being generated correctly (on the binary
side) when CUDA is turned on.

Update the make system so that the dependency rules for CUDA enabled files are created
automatically. The user no-longer has to specify that each CUDA_ENABLED_SRCS .cu file
depends on the corresponding .cc file. Updated both Wasatch and Arches to use the
new approach.

M Makefile.in

- Add a 'function' (make-cuda-target) that will create CUDA dependency rules automatically,
instead of having the developer have to list the rules manually. This function must
be called in each sub.mk file that creates a CUDA_ENABLED_SRCS list.
- Remove all .cu and (mostly fortran) .h files from the <bin> side when
"make cleanreally" is called.

M configure
M configure.ac

- Put in check to verify that Uintah and Wasatch 3P are both (or neither) being
built with CUDA.
- Will also add Candera check once I get more info.

A include/sci_defs/wasatch_testdefs.h.in

- Place PoKitt and Candera defines in new (configure generated binary side) wasatch_defs.h
file.

M CCA/Components/Arches/sub.mk

- Fix fortran .h file dependency problem. Note, these dependencies are have been (and
continue to be) manually entered into the sub.mk file. However, previously, they
used multiple lines (eg: Source.$(OBJEXT) was written 5 times. You don't need to
do this, you can just list it once and then put all the files it depends on.

When building without CUDA, the fortran .h files are needed to create
the object files (eg: Source.o). However, if CUDA is turned on, then they are
needed to create the CUDA .cu file (eg: <bin>/Source.cu). Perviously, at least
on some machines (though the problem should have shown up on all machines?), the fortran
.h files were not being generated.

It appears that currently Arches/sub.mk is the only directory that has CUDA files that
are dependent on fortran .h files. If this occurs in other sub-dirs for Arches (as
CUDA is added to the code), then the same approach should be taken in those files.

M CCA/Components/Arches/ChemMix/sub.mk
M CCA/Components/Arches/CoalModels/sub.mk
M CCA/Components/Arches/LagrangianParticles/sub.mk
M CCA/Components/Arches/Operators/sub.mk
M CCA/Components/Arches/ParticleModels/sub.mk
M CCA/Components/Arches/PropertyModels/sub.mk
M CCA/Components/Arches/PropertyModelsV2/sub.mk
M CCA/Components/Arches/SourceTerms/sub.mk
M CCA/Components/Arches/Task/sub.mk
M CCA/Components/Arches/Transport/sub.mk
M CCA/Components/Arches/TransportEqns/sub.mk
M CCA/Components/Arches/Utility/sub.mk
M CCA/Components/Arches/WallHTModels/sub.mk
M CCA/Components/Wasatch/Expressions/BoundaryConditions/sub.mk
M CCA/Components/Wasatch/Expressions/MMS/sub.mk
M CCA/Components/Wasatch/Expressions/PostProcessing/sub.mk
M CCA/Components/Wasatch/Expressions/Turbulence/sub.mk
M CCA/Components/Wasatch/Expressions/sub.mk
M CCA/Components/Wasatch/Operators/sub.mk
M CCA/Components/Wasatch/Transport/sub.mk
M CCA/Components/Wasatch/sub.mk

- Call make system function make-cuda-target to generate CUDA .cu dependencies.

8 lines of code changed in 1 file:

  • CCA/Components/Arches/ParticleModels: sub.mk (+8 -39)
u0407585 2016-05-13 09:49 Rev.: 55347

Added task->requires for time-step size. This should fix the broken OFC4 RT test.

1 lines of code changed in 1 file:

  • CCA/Components/Arches/ParticleModels: DepositionVelocity.cc (+1 -1)
u0407585 2016-05-12 17:18 Rev.: 55346

Changed ash deposition averating time start tag from _t_interval to _t_ave_start to be more descriptive.

6 lines of code changed in 2 files:

  • CCA/Components/Arches/ParticleModels: DepositionVelocity.cc (+5 -5), DepositionVelocity.h (+1 -1)
wyxpuma 2016-05-06 14:14 Rev.: 55336

to fix a bug in calculating on average deposition velocity

1 lines of code changed in 1 file:

  • CCA/Components/Arches/ParticleModels: DepositionVelocity.cc (+1 -1)
dsunder 2016-05-04 23:20 Rev.: 55319

Fix dataware house bug in DQMOMEqn::buildRHS and hack CoalTemperature to avoid creating a reference to a nullptr

70 lines of code changed in 2 files:

  • CCA/Components/Arches/ParticleModels: CoalTemperature.cc (+4 -5), CoalTemperature.h (+66 -66)
dsunder 2016-05-04 16:07 Rev.: 55310

Refactor Array3 to remove iterator to make it possible to merge trunk
into the kokkos_dev branch

12 lines of code changed in 1 file:

  • CCA/Components/Arches/ParticleModels: CoalTemperature.cc (+12 -16)

(14 more)

Generated by StatSVN 0.7.0