Lines of Code
[root]/CCA/Components/Arches/Transport
| Author | Changes | Lines of Code | Lines per Change |
|---|---|---|---|
| Totals | 142 (100.0%) | 3875 (100.0%) | 27.2 |
| jthornoc | 133 (93.7%) | 3711 (95.8%) | 27.9 |
| dav | 8 (5.6%) | 163 (4.2%) | 20.3 |
| ahumphrey | 1 (0.7%) | 1 (0.0%) | 1.0 |
Warning and forgot a dt multiply.
0 lines of code changed in 2 files:
Fix some warnings and an sign error in the projection.
14 lines of code changed in 5 files:
Fix some bugs with the pressure solver implementation.
Specifically, the correct problemSpec wasn't being passed to the
pressure solve setup. Also, missing dt and sign error on the rhs.
Also fix a missing spec in the taylor-green-vortex problem.
23 lines of code changed in 3 files:
First cut of the projection in. Seems to be working with very simple
flows.
261 lines of code changed in 8 files:
More work on the projection.
Add BC for A and b.
Also get the atomic Tasks working for the factories and add new atomic
task.
247 lines of code changed in 7 files:
Adding first cut of the pressure projection for kokkos solver.
265 lines of code changed in 6 files:
* Make the face velocities for the staggered cells the same type.
* Move the initialization procedure into the factory itself so that
* ordering can be controlled easily
* Fix a bug in the Dirichlet BC for staggered fields
* Allow a second call to task initializations in case a model needs to
* reinitialize based on upstream initialization
* (should have been done before) Add access to field variables by
* returning an address rather than a pointer.
* Fix a bug in compute_psi for momentum eons.
* Working out the momentum transport. Pure convection seems stable now.
136 lines of code changed in 5 files:
WBCHelper:
Trying to preserve the meaning of the <value> tag. Therefore, parse
the type attribute for the functor name rather than the value tag.
BoundaryFunctors.h is updated accordingly.
BoundaryFunctors.h:
Added a velocity bc.
FaceVelocities:
Needed to account for boundary conditions.
KFEUpdate and ComputePsi:
Needed to add an exception for Momentum equations to allow them
to be setup property.
KMomentum:
Added the first cut of the Stress Tensor. Needs work.
91 lines of code changed in 5 files:
Adding a stub for a kokkos momentum solver.
Adding a print statement for registered Arches tasks.
580 lines of code changed in 8 files:
Move around some files.
1 lines of code changed in 1 file:
* More work on the new boundary condition interface. Working handoff
* file example is working. This demonstrates the CUSTOM bc
* implementation.
* Found a small bug in the VariableHelper header.
* Add a new boundary condition factory. This essentially allows for
* independent ArchesTasks to be executed for the boundaryFunctor
* implementation (e.g., see HandOff.h)
* In WBCHelper: UNSUPPORTED->CUSTOM. Seems like a better descriptor for
* the way in which we are using it.
7 lines of code changed in 1 file:
Cleanup.
Also, the timesteps werent aligning properly for the restarts on the
kokkos scalar tests.
42 lines of code changed in 1 file:
Cleanup and add three new kokkos-scalar regression tests.
1 lines of code changed in 1 file:
This should remove a bunch of warnings from my previous commit.
1 lines of code changed in 1 file:
Noteworthy comments on changes to files follows.
All other changes should be self-evident.
------
new file: src/CCA/Components/Arches/Task/AtomicTaskInterface.cc
new file: src/CCA/Components/Arches/Task/AtomicTaskInterface.h
Comment: A new Arches task without any algorithmic abstraction.
-------
new file: src/CCA/Components/Arches/Task/TaskVariableTools.h
Comment: Moved functionality out of the TaskInterface and into this helper file.
-------
new file: src/CCA/Components/Arches/UPSHelper.h
Comment: Helper for common tasks in parsing the UPS file.
-------
new file: src/CCA/Components/Arches/Utility/SurfaceVolumeFractionCalc.cc
new file: src/CCA/Components/Arches/Utility/SurfaceVolumeFractionCalc.h
Comment: Stub function for calculating Surface and volume fractions. Everything is = 1 at this point.
-------
modified: src/CCA/Components/Arches/BoundaryFunctors.h
Comment: Complete rework of the boundary functor class.
-------
modified: src/CCA/Components/Arches/ConvectionHelper.h
Comment: Moved to using volume fraction only for boundary conditions rather than surface area fractions.
This greatly simplified the implementation for all field types, but requires a ternay now to
discover boundaries.
-------
modified: src/CCA/Components/Arches/ExplicitSolver.cc
modified: src/CCA/Components/Arches/ExplicitSolver.h
Comment: Begun to consolidate the boundary condition setup proceedure into a function call so that we have
consistency between initialize and timeStepInitialize.
-------
modified: src/CCA/Components/Arches/KokkosSolver.cc
modified: src/CCA/Components/Arches/KokkosSolver.h
Comment: More work on the KokkosSolver to include dynamic timestep calculation among a few other little improvements.
------
modified: src/CCA/Components/Arches/Transport/KFEUpdate.h
Comment: Get the appropriate cell ranges for the different grid types. This needs some verification work.
------
modified: src/CCA/Components/Arches/WBCHelper.cc
modified: src/CCA/Components/Arches/WBCHelper.h
Comment: Inclusion of the "functor" abstraction into WBCHelper.
------
238 lines of code changed in 4 files:
Indentation is your friend.
2 lines of code changed in 1 file:
Adding a #ifdef that went missing...
2 lines of code changed in 1 file:
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.
11 lines of code changed in 2 files:
Fix compiler issues with my previous commits.
3 lines of code changed in 1 file:
Adding RK integrator to the kokkos scalar update.
93 lines of code changed in 1 file:
Using Array3 for the ConvectiveFlux assembly to simplify the code.
Added a mom-fe-update in the kokkos solver.
Fixed a bug with the rhs not being initialized properly at the start of
each timestep.
Turn back on FaceVelocity calculation using the *Vel…SPBC arches
notation.
KFEupdate now only needs one version of the parallel_for with the
lambda.
9 lines of code changed in 2 files:
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.
90 lines of code changed in 4 files:
Removing Operators.
22 lines of code changed in 3 files:
Removing spatialops includes.
Converting Lagrangian particle to standard Uintah loops.
0 lines of code changed in 4 files:
Removing old transport in favor of the Kokkos transport.
154 lines of code changed in 10 files:
GridTools->ArchesCore namespace.
27 lines of code changed in 5 files:
Cleanup of the former DiscretizationTools (renamed to GridTools)
Kokko-ized TaskAlgrebra and reduced the template parameters.
32 lines of code changed in 6 files:
Getting the kokkos scalar update to work
- Changed ComputePsi to work with the equation groups.
- Cleanup KFEUpdate
- Initialize RHS and fluxes to zero at each RHS construction.
42 lines of code changed in 3 files:
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 1 file:
Turn off face velocities.
Remove old GetPsi function.
Rename GetPsiA3 to GetPsi.
3 lines of code changed in 1 file:
Simplify the flux limiter operations by going to Array3.
Modified BlockRange to allow for operator() with an option
in addition to the (i,j,k).
Added a FaceVelocity class which computes the face velocities for the
various staggered grid faces.
124 lines of code changed in 4 files:
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.
6 lines of code changed in 1 file:
Allow for equation groups which will combine the work to assemble the
RHS and update of scalars into a single tasks rather than separate
tasks/equation.
Generalize the allocateAndInitializeToZero to allocate to a passed
constant instead.
293 lines of code changed in 4 files:
Fixes to Arches sub.mk files for CUDA builds. If you add a file to the list of
CUDA_ENABLED_SRCS, you have to add a corresponding line at the bottom of the sub.mk
file (see notes above CUDA_ENABLED_SRCS section).
M Transport/sub.mk
M PropertyModelsV2/sub.mk
M Utility/sub.mk
- Added corresonding .cu creation lines.
- Alphabetized
9 lines of code changed in 1 file:
const double -> double
1 lines of code changed in 1 file:
For Dan S.:
Only get a kokkos view is d_window is not NULL.
Use a brace constructor for Array3 rather than default.
From Jeremy:
Simplify some of the lambda captures using a shortened [&] notation.
4 lines of code changed in 2 files:
Cleanup warnings.
There are still some unused variable warnings in the new stencil macros
that need cleaning up.
3 lines of code changed in 2 files:
Added a new property model (constant value).
Added kokkos-ized scalar solver including FE update.
Added a version of the Wasatch BCHelper sans SpatialOps functionality.
Work on the Kokkos solver to actually update the scalar transport.
Work on ConvectionHelper - taking a stab at a convention for face
centered variable, face types.
Added some patch range helpers in DiscretizationTools.
Added timers.
Go to a single template parameter for WaveForm - Lambda-ize it.
Update arches_spec to work with new KScalars.
Other minor runtime or beautification.
6 lines of code changed in 2 files:
Add some old scalar updates to one of the new test input files.
Add timers around the old scalar solver.
Change output naming convention.
Put the DO_TIMINGS directive in Directives.h
13 lines of code changed in 5 files:
Better naming conventions for the timers.
4 lines of code changed in 4 files:
(2 more)