Remove tabs, alphabetize
12 lines of code changed in 1 file:
M Core/Disclosure/TypeDescription.h
M Core/Disclosure/TypeDescription.cc
- Added utility function to return string version of "Type" enumerated type.
M Core/ProblemSpec/ProblemSpec.cc
- White space.
47 lines of code changed in 3 files:
Some minor (I hope) updates to help keep the user from using configure incorrectly, and to avoid allowing
configure to find system libraries (in this case for hypre, those this should actually be expanded to
all the tests at some point) that shadow the specifically requested libraries the user wants.
This commit really should not break anything, but it is possible that many people have bad configure
lines, and this will catch it... they will just have to update their configure line to be unambiguous.
It should also catch if the user points to any libraries in /usr/lib, which if we allowed would
cause the make system to use libraries found in /usr/lib instead of those specified by the user (via configure).
If you run into configure issues with this update, please let me know.
M aclocal.m4
- Configure previously checked for (and disallowed) --with-<lib>=/usr/lib but a logic issue allowed --with-<lib>-/usr/lib/
(notice the / at the end of the line) to get through. This is no longer the case. If you run into a problem with this,
you most likely can just remove --with-<lib> from your configure line. If this doesn't work, let us know and we'll fix it.
M configVars.mk.in
- Previously there was a separate rule for compiling .cpp files (even though up until very recently, we didn't have any.)
However, while the .ccp rule was almost identical to the .cc rule, it wasn't finished. Because it uses the exact same
compilation line as .cc files, I just removed the redundant rule, and pointed .cpp files at the same make fragment
as .cc files. If we ever need to do something specific for .cpp files, we can add the rule back (and bring it up to date).
M configure.ac
M configure
- Pull in the changes from aclocal.m4.
- Minor informational update.
- Put in a check that hopefully disallows system libraries from shadowing other specific libs (only implemented for HYPRE
at this point).
5 lines of code changed in 3 files:
M configure
M configure.ac
- Check to make sure the user has specified the use of MPI. When configuring, the user must now
explicitly either specify --with-mpi=dir (or --with-mpi-include/lib), or use --with-mpi=built-in.
- Add in compiler spam reduction flag for Intel compiler remarks.
M StandAlone/sus.cc
- Cosmetic: Add in a code comment.
1 lines of code changed in 1 file:
M CCA/Components/FVM/GaussSolve.cc
- Only real change: Fix Mac compilation by changing "0" to "nullptr".
- Cosmetics: line up variables, coding standards.
36 lines of code changed in 1 file:
Remove the unused (and unnecessary/confusing) copy constructor that had propagated via cut and paste for Todd and Jim.
M CCA/Components/MPM/ConstitutiveModel/ArenaSoilBanerjeeBrannon/ArenaPartiallySaturated.cc
M CCA/Components/MPM/ConstitutiveModel/ArenaSoilBanerjeeBrannon/ArenaPartiallySaturated.h
M CCA/Components/MPM/ConstitutiveModel/Arenisca.cc
M CCA/Components/MPM/ConstitutiveModel/Arenisca.h
M CCA/Components/MPM/ConstitutiveModel/Arenisca3.cc
M CCA/Components/MPM/ConstitutiveModel/Arenisca3.h
M CCA/Components/MPM/ConstitutiveModel/Arenisca4.cc
M CCA/Components/MPM/ConstitutiveModel/Arenisca4.h
M CCA/Components/MPM/ConstitutiveModel/CNH_MMS.cc
M CCA/Components/MPM/ConstitutiveModel/CNH_MMS.h
M CCA/Components/MPM/ConstitutiveModel/CompMooneyRivlin.cc
M CCA/Components/MPM/ConstitutiveModel/CompMooneyRivlin.h
M CCA/Components/MPM/ConstitutiveModel/ConstitutiveModel.cc
M CCA/Components/MPM/ConstitutiveModel/ConstitutiveModel.h
M CCA/Components/MPM/ConstitutiveModel/Diamm.cc
M CCA/Components/MPM/ConstitutiveModel/Diamm.h
M CCA/Components/MPM/ConstitutiveModel/ElasticPlasticHP.cc
M CCA/Components/MPM/ConstitutiveModel/ElasticPlasticHP.h
M CCA/Components/MPM/ConstitutiveModel/HypoElastic.cc
M CCA/Components/MPM/ConstitutiveModel/HypoElastic.h
M CCA/Components/MPM/ConstitutiveModel/HypoElasticFortran.cc
M CCA/Components/MPM/ConstitutiveModel/HypoElasticFortran.h
M CCA/Components/MPM/ConstitutiveModel/HypoElasticImplicit.cc
M CCA/Components/MPM/ConstitutiveModel/HypoElasticImplicit.h
M CCA/Components/MPM/ConstitutiveModel/IdealGasMP.cc
M CCA/Components/MPM/ConstitutiveModel/IdealGasMP.h
M CCA/Components/MPM/ConstitutiveModel/JWLppMPM.cc
M CCA/Components/MPM/ConstitutiveModel/JWLppMPM.h
M CCA/Components/MPM/ConstitutiveModel/Kayenta.cc
M CCA/Components/MPM/ConstitutiveModel/Kayenta.h
M CCA/Components/MPM/ConstitutiveModel/MWViscoElastic.cc
M CCA/Components/MPM/ConstitutiveModel/MWViscoElastic.h
M CCA/Components/MPM/ConstitutiveModel/MurnaghanMPM.cc
M CCA/Components/MPM/ConstitutiveModel/MurnaghanMPM.h
M CCA/Components/MPM/ConstitutiveModel/NonLocalDruckerPrager.cc
M CCA/Components/MPM/ConstitutiveModel/NonLocalDruckerPrager.h
M CCA/Components/MPM/ConstitutiveModel/P_Alpha.cc
M CCA/Components/MPM/ConstitutiveModel/P_Alpha.h
M CCA/Components/MPM/ConstitutiveModel/PortableTongeRamesh/TongeRameshPTR.cc
M CCA/Components/MPM/ConstitutiveModel/PortableTongeRamesh/TongeRameshPTR.h
M CCA/Components/MPM/ConstitutiveModel/ProgramBurn.cc
M CCA/Components/MPM/ConstitutiveModel/ProgramBurn.h
M CCA/Components/MPM/ConstitutiveModel/RFElasticPlastic.cc
M CCA/Components/MPM/ConstitutiveModel/RFElasticPlastic.h
M CCA/Components/MPM/ConstitutiveModel/RigidMaterial.cc
M CCA/Components/MPM/ConstitutiveModel/RigidMaterial.h
M CCA/Components/MPM/ConstitutiveModel/ShellMaterial.cc
M CCA/Components/MPM/ConstitutiveModel/ShellMaterial.h
M CCA/Components/MPM/ConstitutiveModel/SoilFoam.cc
M CCA/Components/MPM/ConstitutiveModel/SoilFoam.h
M CCA/Components/MPM/ConstitutiveModel/TH_Water.cc
M CCA/Components/MPM/ConstitutiveModel/TH_Water.h
M CCA/Components/MPM/ConstitutiveModel/TransIsoHyper.cc
M CCA/Components/MPM/ConstitutiveModel/TransIsoHyper.h
M CCA/Components/MPM/ConstitutiveModel/TransIsoHyperImplicit.cc
M CCA/Components/MPM/ConstitutiveModel/TransIsoHyperImplicit.h
M CCA/Components/MPM/ConstitutiveModel/UCNH.h
M CCA/Components/MPM/ConstitutiveModel/ViscoPlastic.cc
M CCA/Components/MPM/ConstitutiveModel/ViscoPlastic.h
M CCA/Components/MPM/ConstitutiveModel/ViscoSCRAMHotSpot.cc
M CCA/Components/MPM/ConstitutiveModel/ViscoSCRAMHotSpot.h
M CCA/Components/MPM/ConstitutiveModel/ViscoScram.cc
M CCA/Components/MPM/ConstitutiveModel/ViscoScram.h
M CCA/Components/MPM/ConstitutiveModel/ViscoScramImplicit.cc
M CCA/Components/MPM/ConstitutiveModel/ViscoScramImplicit.h
M CCA/Components/MPM/ConstitutiveModel/ViscoTransIsoHyper.cc
M CCA/Components/MPM/ConstitutiveModel/ViscoTransIsoHyper.h
M CCA/Components/MPM/ConstitutiveModel/ViscoTransIsoHyperImplicit.cc
M CCA/Components/MPM/ConstitutiveModel/ViscoTransIsoHyperImplicit.h
M CCA/Components/MPM/ConstitutiveModel/Water.cc
M CCA/Components/MPM/ConstitutiveModel/Water.h
63 lines of code changed in 73 files:
M build_scripts/so_epilogue.mk
M configVars.mk.in
Revert previous commit.
7 lines of code changed in 3 files:
The SOFLAGS make variable was redundant with the LDFLAGS make var. It also
was not used everywhere that it was needed. So put the SOFLAGS info into
the LDFLAGS var. This should fix Todd's build on microslip.
M build_scripts/so_epilogue.mk
M configVars.mk.in
6 lines of code changed in 2 files:
Few minor mostly cosmetic fixes. Should not effect Rt.
M AMRSimulationController.cc
- Removed unused variable.
M SimulationController.h
M SimulationController.cc
- Renamed 'd_archive' to 'd_restart_archive' as that is what it is and is only used for restarting.
142 lines of code changed in 3 files:
Add in the --enable-pidx flag which will automatically build the PIDX I/O library for you.
M configure
- Place the bullet proofing (enable_option_checking=fatal) back at the top of the configure script.
M configure.ac
- Added --enable-pidx
- Validates that only --enable-pidx or --wiht-pidx=DIR is used.
- Enable PIDX needs CMake so validate CMake in this case.
- Use Cameron's script to build PIDX locally.
AM build_scripts/build_pidx.sh
- Initial commit of script for auto-downloading/building PIDX for Uintah (original draft provided by Cameron).
84 lines of code changed in 1 file:
M Makefile.in
Fix type for removing dependency (.d) files. Needed ".d" and not just "d".
1 lines of code changed in 1 file:
Previously we used a VarHashMap to keep track on our variables and
where they were located in the DataArchive (UDA) files on
disk. However, as it was a hash map, there was no prescribed order to
how the variables were stored in that map. When using PIDX, the
variables must be read and written in exactly the same order. To
solve this problem, instead of hashing, I have just created a vector
to hold this data. The change is fairly straightforward, and Todd and
Sid have tested this, and my own local RT over ICE works, so I am
fairly certaint that this will not break the RT.
However, I have not analyzed how often this code is actually called
during a simulation and there could be some performance issues.
Though I don't think this should be the case, I am leaving this note
in the commit log in case someone sees an issue in the future
hopefully it will make it easier to track down. The performance issue
would come from the fact that instead of pulling a variable directly
out of the hash map [O(1)], we now have to search the vector [O(n)]
for it. If this is shown to be an issue, we will need to rethink how
to solve the two issues (savinging in a defined order - while not
having to linearly search the vector). -Dav
39 lines of code changed in 2 files:
- Fixes by Sid (with some help from Dav)
* Update to create individual MPI_Comms for use by PIDX.
* Update to newest PIDX API.
* Minor formatting, variable alignment for readability. Remove tabs.
* Pass strings as const references (&) to avoid copy.
M CCA/Components/DataArchiver/DataArchiver.cc
M CCA/Components/DataArchiver/DataArchiver.h
M CCA/Components/SimulationController/AMRSimulationController.cc
M CCA/Ports/PIDXOutputContext.cc
M CCA/Ports/PIDXOutputContext.h
M Core/DataArchive/DataArchive.cc
M Core/DataArchive/sub.mk
167 lines of code changed in 10 files:
Make the "cleanreally" and "reallyclean" targets do the same thing. Added some
comments on what is being cleaned. Removed some superfluous "rm"s.
14 lines of code changed in 1 file:
- Some tweaks to cleanup w3p build.
M ExprLib-build/doit
M RadProps-build/doit
M TabProps-build/doit
M SpatialOps-build/doit
- Don't need continuation chars (\) in a string.
- Put all the CUDA flags into the CUDA if section.
M NSCBC-build/doit
- There apparently isn't a "make clean" in NSCBC.
0 lines of code changed in 10 files:
Adding back in the TIFF make variables. Note, when TIFF (and JPEG, etc) were ripped out of Uintah,
a lot of the infrastructure for them was left in (for example, configure kept checking for them), so
to put it back all I had to do was resurrect the TIFF vars in the Makefile (well, actually in
configVars.mk which is included into the Makefile).
M configVars.mk.in
- Add in HAVE_TIFF and TIFF_LIBRARY flags.
M StandAlone/tools/extractors/sub.mk
- Since I added back the HAVE_TIFF and TIFF_LIBRARY flags to the make system, I am reverting
the change to this sub.mk as it now (again) just works.
4 lines of code changed in 2 files:
I think TIFF support was yanked out of Uintah a long time ago, but Todd asked me to look at compiling the
left over particle2tiff.cc file. These commits allow for that to happen (assuming libtiff is installed
in the system library location correctly). I am not adding any configure support, so you will have to
manually >
M extractors/particle2tiff.cc
- Few minor tweeks to get the file to compile with the newerer Core. I have not actually tried running
it to see if it actually works.
M extractors/sub.mk
- Manually added "-ltiff" the LIBS variable. Before (I think) configure, figured this out for you.
- Also, to make this work, you need to manually comment out (use: #) the check for HAVE_TIFF. So do the following:
#ifeq ($(HAVE_TIFF),yes)
.
.
.
#endif
5 lines of code changed in 2 files:
M doit
If a W3P repository directory doesn't exist, git clone it... Before it assumed that if one was missing,
they all were. Now just check and update one at a time. This probably only occurs if an error happened
during the initial checkout, or if a new lib is added to the 3P.
0 lines of code changed in 2 files:
_M .
M doit
- More verbose.
- Quit if error detected.
M HelperBuildScripts/checkEnv.sh
M ExprLib-build/doit
M RadProps-build/doit
M TabProps-build/doit
- Display CMAKE command.
M SpatialOps-build/doit
- Display CMAKE command.
- Quit if error in cmake.
M README
- Cleanup/update.
100 lines of code changed in 9 files:
Todd asked that the SCI_DEBUG name be treated in a case-insensitive manner...
So now you can do:
setenv SCI_DEBUG my_debug_stream:+
or
setenv SCI_DEBUG MY_DEBUG_STREAM:+
or
setenv SCI_DEBUG my_DEBUG_stream:+
and they will all work and refer to the same thing.
M Core/Util/DebugStream.h
M Core/Util/DebugStream.cc
- Fixed formatting, naming conventions, spacing, etc.
125 lines of code changed in 2 files:
(13 more)