fortran
(1 files, 37 lines)
[root]/CCA/Components/Arches/CoalModels
fortran
(1 files, 37 lines)
| Author | Changes | Lines of Code | Lines per Change |
|---|---|---|---|
| Totals | 127 (100.0%) | 3954 (100.0%) | 31.1 |
| u0407585 | 17 (13.4%) | 1471 (37.2%) | 86.5 |
| derekhar | 30 (23.6%) | 979 (24.8%) | 32.6 |
| jthornoc | 16 (12.6%) | 760 (19.2%) | 47.5 |
| dsunder | 4 (3.1%) | 387 (9.8%) | 96.7 |
| dav | 5 (3.9%) | 123 (3.1%) | 24.6 |
| allen | 39 (30.7%) | 118 (3.0%) | 3.0 |
| ahumphrey | 9 (7.1%) | 105 (2.7%) | 11.6 |
| jsutherland | 2 (1.6%) | 5 (0.1%) | 2.5 |
| jas | 1 (0.8%) | 4 (0.1%) | 4.0 |
| wyxpuma | 2 (1.6%) | 2 (0.1%) | 1.0 |
| zhouminmin | 2 (1.6%) | 0 (0.0%) | 0.0 |
Clean up numerous compiler warnings
5 lines of code changed in 2 files:
fixed boolean chaeck and added modified var mapper for saving vars in the timestep.xml file
2 lines of code changed in 4 files:
Fixed sign error in Thermophoresis model. This will break rt 1GW_RT.ups.
0 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.
19 lines of code changed in 2 files:
added debug streams and state vars
6 lines of code changed in 2 files:
backed out sim state changes
27 lines of code changed in 20 files:
cleanup of the simulation state - most everything is now private
1 lines of code changed in 1 file:
cleanup of the simulation state - most everything is now private
26 lines of code changed in 10 files:
Fix race condition in CharOxidationSmith.
Added copyright header and removed the opening up of std namespace.
Also removed the include of a SpatialOps header that wasn't being used.
86 lines of code changed in 3 files:
Fixed unnecessary limitation in charOxySmith requiring fields to be saved to disk as specified by the dataArchiver block.
28 lines of code changed in 1 file:
added VisIt dashborad code
23 lines of code changed in 1 file:
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).
19 lines of code changed in 6 files:
Changed Functor to c++11 lambda.
5 lines of code changed in 1 file:
Removing code duplication that was used for functor profiling.
1 lines of code changed in 10 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.
7 lines of code changed in 1 file:
to increase the iterations again in order to guarantee converge
1 lines of code changed in 1 file:
to increase the iteration number so that a better prediction was achieved
1 lines of code changed in 1 file:
Refactor Array3 to remove iterator to make it possible to merge trunk
into the kokkos_dev branch
387 lines of code changed in 4 files:
Fix the ability to make just Arches (--enable-arches instead of having to --enable-all-components).
M configure
M configure.ac
- Force the use of CMake 3.1+ if building Wasatch or VisIt).
- Add in RadProps info to W3P check.
M CCA/Components/Wasatch/Transport/sub.mk
M CCA/Components/Wasatch/Expressions/sub.mk
M CCA/Components/Wasatch/Operators/sub.mk
M CCA/Components/Arches/CoalModels/sub.mk
M CCA/Components/Arches/sub.mk
- Remove superfluous white space.
- Alphabetize.
- Fix comment typo (cut/paste error).
- Untabify (as appropriate).
M CCA/Components/Wasatch/sub.mk
- Same as above and:
- Fix the problem where CUDA_ENABLED_SRCS was not set if just building Arches.
- A number of files (eg: BCHelper.cc) were listed twice in the list of sources.
M Core/Grid/UnknownVariable.h
- Remove warning (Exception is now in the Uintah namespace so don't need to qualify it).
2 lines of code changed in 1 file:
Cleaning up warnings.
212 lines of code changed in 5 files:
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.
95 lines of code changed in 1 file:
add in-situ var reference and added comments
33 lines of code changed in 1 file:
Changed mass transfer coefficient correction factor to be consistent with derivation.
5 lines of code changed in 2 files:
BUGS:
* Fix a bug with the handoff files. Both heat loss and DQMOM variables
* weren’t being properly setup, resulting in the default value always
* being used.
* Fix a bug wherein the handoff output (showing missed hand-off
* information) wasn’t being
* printed correctly for the velocities.
KOKKOS:
* Cleanup ConvectionHelper/DiscretizationTools to use Dan’s latest
* infrastructure improvements.
* This version of code gives nearly the same answers as the
* non-Kokkoized code. The diffs are understandable from an order of
* operations standpoint.
MODELS:
* For drag, use the magnitude of the difference in velocities
* For drag, use the updated weight rather than the guess. This
* helps stabilize things, BUT it isn’t general enough. —> NEEDS
* WORK<—
* In PartVel, compute the face centered velocities for the
* transport. This should allow us to phase out the
* CCVariable<Vector> velocities.
OTHER
* For MPI_Bcast, send and int rather than an unsigned int to
* remove a warning.
* Consolidated the checkBCs function into BoundaryCondition_new.
528 lines of code changed in 7 files:
Added new functors to the momentum solver. Also, consolidated compiler directives into a new header.
7 lines of code changed in 4 files:
Eliminate SCIRun namespace usage.
4 lines of code changed in 1 file:
Functorized Particle Birth model.
67 lines of code changed in 1 file:
The computation of the coal temperature has been functorized. Minor formatting of previous commit.
145 lines of code changed in 1 file:
Added a functor for the CharOxidation Source term. Also cleaned up some warnings.
319 lines of code changed in 2 files:
Functorized the coal devolitalization FOWY model.
174 lines of code changed in 2 files:
In the particle Enthalpy source functor, the function abs( ) was not functioning properly.
Switched abs( ) to std::abs( )
4 lines of code changed in 2 files:
Functorized computation of Coal-Enthalpy source term.
222 lines of code changed in 2 files:
Made root function in char oxidation model a little faster.
19 lines of code changed in 2 files:
Moved varlable creation into problem setup. This won't effect regression tests.
23 lines of code changed in 1 file:
pow() -> std::pow()
20 lines of code changed in 4 files:
Using std::pow( double , int ) causes answers to change when using c++11, changed to pow(double, double)
7 lines of code changed in 4 files:
Initialized temporary variable AreaSum.
2 lines of code changed in 1 file:
Fixed another sign error in new char oxidation model.
8 lines of code changed in 1 file:
fixed onother sign error in blowing parameter for new char oxidation model.
6 lines of code changed in 1 file:
Fixed mass transfer coefficient correction factor, and sign errors in the new char oxidation model.
51 lines of code changed in 2 files:
(3 more)