Directory CCA/Components/Arches/SourceTerms/

Total Files:
28
Deleted Files:
0
Lines of Code:
6362

[root]/CCA/Components/Arches/SourceTerms

Lines of Code

CCA/Components/Arches/SourceTerms/ Lines of Code

Developers

Author Changes Lines of Code Lines per Change
Totals 97 (100.0%) 1936 (100.0%) 19.9
u0407585 11 (11.3%) 656 (33.9%) 59.6
dsunder 7 (7.2%) 396 (20.5%) 56.5
zhouminmin 6 (6.2%) 355 (18.3%) 59.1
derekhar 28 (28.9%) 256 (13.2%) 9.1
dav 3 (3.1%) 107 (5.5%) 35.6
jthornoc 7 (7.2%) 81 (4.2%) 11.5
bisaac 4 (4.1%) 32 (1.7%) 8.0
harman 4 (4.1%) 28 (1.4%) 7.0
allen 23 (23.7%) 20 (1.0%) 0.8
ahumphrey 4 (4.1%) 5 (0.3%) 1.2

Most Recent Commits

zhouminmin 2016-12-08 12:30 Rev.: 56080

wall convection term for the wall heat transfer equation

355 lines of code changed in 6 files:

  • CCA/Components/Arches/SourceTerms: HTConvection.cc (new 279), HTConvection.h (new 76), SourceTermFactory.cc (new), sub.mk (new)
harman 2016-11-09 16:25 Rev.: 55964

added code to coarsen fine level extra cells to the coarser level extra cells. Incomplete

Added input file to test it.

User spec:
<algorithm type='dataOnion'>
<coarsenExtraCells> true </coarsenExtraCells>
</algorithm>

or

<algorithm type='RMCRT_coarseLevel'>
<coarsenExtraCells> true </coarsenExtraCells>
</algorithm>

9 lines of code changed in 2 files:

  • CCA/Components/Arches/SourceTerms: RMCRT.cc (+9 -4)
harman 2016-09-27 14:56 Rev.: 55804

setBoundaryConditions()
Fixed abskg computes/requires bug when using floats. A different VarLabel is used with
floats are enabled.


5 lines of code changed in 1 file:

  • CCA/Components/Arches/SourceTerms: RMCRT.cc (+5 -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.

13 lines of code changed in 1 file:

  • CCA/Components/Arches/SourceTerms: sub.mk (+13 -13)
derekhar 2016-08-31 12:00 Rev.: 55686

Added Burns-Christion using the Arches Task Interface. Changes to Discrete-Ordinates to be compatible with this interface were also made.

14 lines of code changed in 2 files:

  • CCA/Components/Arches/SourceTerms: DORadiation.cc (new)
allen 2016-08-16 14:33 Rev.: 55646

backed out sim state changes

10 lines of code changed in 15 files:

  • CCA/Components/Arches/SourceTerms: BowmanNOx.cc (+1 -1), BrownSootFormation_Tar.cc (+1 -1), BrownSootFormation_nd.cc (+1 -1), BrownSootFormation_rhoYs.cc (+1 -1), ManifoldRxn.cc (new), RMCRT.cc (+1 -1), SootMassBalance.cc (new), WestbrookDryer.cc (new)
allen 2016-08-15 17:29 Rev.: 55641

cleanup of the simulation state - most everything is now private

1 lines of code changed in 1 file:

  • CCA/Components/Arches/SourceTerms: BowmanNOx.cc (+1 -1)
allen 2016-08-15 17:14 Rev.: 55638

cleanup of the simulation state - most everything is now private

9 lines of code changed in 7 files:

  • CCA/Components/Arches/SourceTerms: BrownSootFormation_Tar.cc (+1 -1), BrownSootFormation_nd.cc (+1 -1), BrownSootFormation_rhoYs.cc (+1 -1), ManifoldRxn.cc (+2 -2), RMCRT.cc (+1 -1), SootMassBalance.cc (+1 -1), WestbrookDryer.cc (+2 -2)
harman 2016-07-29 14:01 Rev.: 55557

User can now specify using floats or double for all-to-all communications via:

<RMCRT type="float"> or
<RMCRT type="double">

14 lines of code changed in 1 file:

  • CCA/Components/Arches/SourceTerms: RMCRT.cc (+14 -6)
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).

5 lines of code changed in 4 files:

  • CCA/Components/Arches/SourceTerms: Inject.h (new), RMCRT.cc (+2 -2), SourceTermFactory.cc (+1 -1)
bisaac 2016-05-23 14:13 Rev.: 55373

Converted newton solver to a void function in WallHT, add functionality to gas-phase constant src term. Made existing RT compatible with constant src term changes.

32 lines of code changed in 4 files:

  • CCA/Components/Arches/SourceTerms: ConstSrcTerm.cc (new), ConstSrcTerm.h (+3 -1)
derekhar 2016-05-20 16:21 Rev.: 55371

Removing code duplication that was used for functor profiling.

0 lines of code changed in 14 files:

  • CCA/Components/Arches/SourceTerms: CoalGasDevol.cc (-9), CoalGasDevolMom.cc (-2), CoalGasHeat.cc (new), CoalGasMomentum.cc (new), CoalGasOxi.cc (-9), CoalGasOxiMom.cc (-2), MomentumDragSrc.cc (-19)
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.

7 lines of code changed in 1 file:

  • CCA/Components/Arches/SourceTerms: sub.mk (+7 -30)
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

396 lines of code changed in 7 files:

  • CCA/Components/Arches/SourceTerms: CoalGasDevol.cc (+60 -67), CoalGasDevolMom.cc (+60 -62), CoalGasHeat.cc (+61 -68), CoalGasMomentum.cc (+56 -62), CoalGasOxi.cc (+60 -67), CoalGasOxiMom.cc (+60 -62), MomentumDragSrc.cc (+39 -44)
jthornoc 2016-04-22 17:47 Rev.: 55210

* Clean up some dummy labels that did nothing (dummySolve, anyone?)
* Add a standalone function to ensure BCs are set for all independent
* variables. This is run once at simulation startup.
* Add a RestartInitialize for property models. This is needed for models
* such as heat loss that are using a handoff file to ensure the handoff
* file is properly loaded.
* Make sure that the handoff file information is loaded for transport
* equations before calling getState
This is needed to ensure that the initial condition is properly set at
the handoff file locations.

81 lines of code changed in 7 files:

  • CCA/Components/Arches/SourceTerms: RMCRT.cc (+21 -21), RMCRT.h (new), SourceTermBase.cc (new), SourceTermBase.h (+38 -38)
dav 2016-04-15 22:12 Rev.: 55199

This commit should fix the previous commit with respect to Uintah Variable
types. Additionally, it adds support for Arches files to be pushed through
NVCC as needed.

M CCA/Components/Wasatch/sub.mk

- Added a brief comment on use of CUDA_ENABLED_SRCS.

M CCA/Components/Arches/TransportEqns/CQMOM_Convection.h
M CCA/Components/Arches/TransportEqns/Discretization_new.h
M CCA/Components/Arches/TransportEqns/CQMOMEqn.h
M CCA/Components/Arches/TransportEqns/DQMOMEqn.h
M CCA/Components/Arches/Task/TaskInterface.h

- Minor cleanups:
- Fix warning message.
- Some white space for readability.
- Remove an empty "private:" block.

M CCA/Components/Arches/CoalModels/sub.mk
M CCA/Components/Arches/TransportEqns/sub.mk
M CCA/Components/Arches/Transport/sub.mk
M CCA/Components/Arches/sub.mk
M CCA/Components/Arches/ParticleModels/sub.mk
M CCA/Components/Arches/PropertyModels/sub.mk
M CCA/Components/Arches/ChemMix/sub.mk
M CCA/Components/Arches/PropertyModelsV2/sub.mk
M CCA/Components/Arches/Task/sub.mk
M CCA/Components/Arches/SourceTerms/sub.mk
M CCA/Components/Arches/Operators/sub.mk
M CCA/Components/Arches/WallHTModels/sub.mk
M CCA/Components/Arches/Utility/sub.mk
M CCA/Components/Arches/LagrangianParticles/sub.mk

- Update Arches sub.mk files to correctly specify which files
need CUDA (nvcc) compilation.

M Core/Grid/Variables/CCVariable.h
M Core/Grid/Variables/SFCYVariable.h
M Core/Grid/Variables/NCVariable.h
M Core/Grid/Variables/SFCXVariable.h
M Core/Grid/Variables/SFCZVariable.h
M Core/Grid/Variables/ParticleVariable.h
M Core/Disclosure/TypeDescription.h

- Turns out that the registerMe variable was needed. There was an erroneous comment
in the previous version that implied that it wasn't needed (that the work happened
in the Variable constructor, but this was not the case. I have added a number of
comments to clarify how this works so the next person to dig into it will have an
easier time.

M Core/Disclosure/TypeDescription.cc

- Update file global variables to be designated as such to help avoid confusion.
- Assign to NULL as they are pointers and not integers.


87 lines of code changed in 1 file:

  • CCA/Components/Arches/SourceTerms: sub.mk (+87 -29)
u0407585 2016-04-04 21:12 Rev.: 55169

Functorized the new momentum source terms. I still need to add all of the kokkos stuff.

30 lines of code changed in 2 files:

  • CCA/Components/Arches/SourceTerms: CoalGasDevolMom.cc (+17 -40), CoalGasOxiMom.cc (+13 -35)
u0407585 2016-04-04 11:18 Rev.: 55167

Added missing momentum source term from char oxidation.

313 lines of code changed in 4 files:

  • CCA/Components/Arches/SourceTerms: CoalGasOxiMom.cc (+233), CoalGasOxiMom.h (new 73), SourceTermFactory.cc (+6), sub.mk (+1)
u0407585 2016-04-04 09:56 Rev.: 55165

Added missing momentum source term from devolatilization.

312 lines of code changed in 4 files:

  • CCA/Components/Arches/SourceTerms: CoalGasDevolMom.cc (+232), CoalGasDevolMom.h (new 73), SourceTermFactory.cc (+6), sub.mk (+1)
derekhar 2016-03-16 16:41 Rev.: 55046

Added new functors to the momentum solver. Also, consolidated compiler directives into a new header.

6 lines of code changed in 5 files:

  • CCA/Components/Arches/SourceTerms: CoalGasDevol.cc (+1 -2), CoalGasHeat.cc (+1 -2), CoalGasMomentum.cc (+1 -2), CoalGasOxi.cc (+1 -2), MomentumDragSrc.cc (+2 -2)
derekhar 2016-03-14 17:21 Rev.: 55021

Functorized computing the sum of drag, devolitalization, char-oxidation, and enthalpy source terms.

192 lines of code changed in 5 files:

  • CCA/Components/Arches/SourceTerms: CoalGasDevol.cc (+44), CoalGasHeat.cc (+47), CoalGasOxi.cc (+49), DORadiation.cc (-1), MomentumDragSrc.cc (+52 -1)
derekhar 2016-03-10 11:04 Rev.: 55002

Made compiler directives more readable.

4 lines of code changed in 1 file:

  • CCA/Components/Arches/SourceTerms: CoalGasMomentum.cc (+4 -4)
derekhar 2016-03-09 17:52 Rev.: 54999

Functorized sum of momentum from environments.

40 lines of code changed in 1 file:

  • CCA/Components/Arches/SourceTerms: CoalGasMomentum.cc (+40)
u0407585 2016-01-18 15:27 Rev.: 54672

Created a copy of the old char oxidation model for the implementation of Phils new char oxidation model.

1 lines of code changed in 1 file:

  • CCA/Components/Arches/SourceTerms: CoalGasOxi.cc (+1)
Generated by StatSVN 0.7.0