You can render a clock now and edit all the parameters now.
GUI/TimestepSelector.tcl
Added clock position gui and other boxes for other clock parameters.
Modules/Selectors/TimestepSelector.cc
Added update_clock() method and tcl interface to it.
Port pointers are all now initialized to zero.
Modules/Selectors/TimestepSelector.h
Added current_time and update_clock().
0 lines of code changed in 6 files:
Undo the removal of GL_ATI_fragment_shader. It appears to have broken volume rendering on Apple machines
43 lines of code changed in 5 files:
problem setup()
- replaced "kittens with yarn" with something a little cleaner.
radLinearSolve()
- cleaned up the conditional statements
0 lines of code changed in 4 files:
Comment out debug print
1 lines of code changed in 1 file:
New Feature - Multiple 2D transfer functions per volume via user selected clipping planes.
At the network level, this makes the SCIRun->Visualization->VolumeVisualizer 2D colormap input port a dynamic input port. The first 2d colormap input behaves as before and thus backwards funcitonality is the same.
Any subsequent 2D colormaps input to the VolumeVisualizer will create an arrow widget in the viewer. This widget specifies where the new transfer funciton will be applied to the volume. The arrow points in the direction where the transfer function is not applied, allowing the user to more easily pick the direction of the clipping plane while not being occluded by the volume. But if the widget is occluded by the volume, it still shows as a lightly stippled widget that the user can still manipulate.
Files changed and a brief description:
A Core/Geom/GeomStippleOccluded.cc
A Core/Geom/GeomStippleOccluded.h
M Core/Geom/sub.mk
M Core/Geom/GeomSwitch.h
M Core/Geom/GeomOpenGL.cc
---> Added GeomStippleOccluded container that inherits from GeomSwitch. All children look normal, until they are occluded by another object, then they are drawn with a stipple pattern to allow them to be seen behind other objects. Gives a nice transparency look without the computation expense. Very useful for widgets.
M Core/Volume/VolumeRenderer.cc
M Core/Volume/VolumeRenderer.h
---> Added parameter to VolumeRenderer constructor to take in an array of clipping planes that determine where the 2D colormaps are applied. Added support for computing multple transfer functions regions with call to TextureBrick::mask_polygons. Other minor Code Cleanup.
M Core/Volume/TextureBrick.cc
M Core/Volume/TextureBrick.h
---> Rewrite for code clarity. Major addition of mask_polygons method, which takes in a vector of clipping Planes, slices the polygons into clipped and non-clipped regions, and returns their resultant bitmasks. Remove min/max of t parameter calculation that was causing re-slicing of volume at different planes for each different zoom level.
M Core/Volume/SliceRenderer.h
M Core/Volume/SliceRenderer.cc
---> Minor code to support the vector of colormap2's being passed down
M Core/Volume/TextureRenderer.h
M Core/Volume/TextureRenderer.cc
---> Code factoring to seperate long blocks of code in build_colormap2. Added code for rendering multiple colormap2s into one texture to support the multiple transfer functions that can be applied to a volume. Set bitmask for which colormaps to apply to a polygon via shader parameter to draw_polygons. Got rid of extraneous use_pbuffer_ boolean. Other minor code cleanup.
M Core/Volume/VolShader.h
M Core/Volume/VolShader.cc
---> Added shader to render using multiple transfer functions via a bitmask. Trickery by using a floating point parameter as a boolean bit mask.
M Core/Geometry/Plane.cc
M Core/Geometry/Plane.h
---> Added Plane::ChangePlane(Point,Vector) for linking w/ ArrowWidget. Added Plane::Intersect(Point, Vector, t) to get the parametric parameter where a ray hits the plane, used in TextureBrick::mask_polygons.
M Dataflow/XML/VolumeVisualizer.xml
---> Made last ColorMap2D port dynamic to support multiple transfer functions.
M Dataflow/GUI/VolumeVisualizer.tcl
---> Added checkbutton to turn off transfer function clipping plane arrow widgets.
M Dataflow/Widgets/ArrowWidget.cc
M Dataflow/Widgets/ArrowWidget.h
M Dataflow/Widgets/BaseWidget.cc
M Dataflow/Widgets/BaseWidget.h
---> Added boolean parameter to constructor to specify if ArrowWidget is rendered with a stipple pattern when occluded. Useful when arrow widget is inside the volume.
M Dataflow/Modules/Visualization/VolumeSlicer.cc
---> Send Colormap2 as vector to SliceRenderer.
M Dataflow/Modules/Visualization/VolumeVisualizer.cc
---> Create an arrow widget for each extra ColorMap2, so user can specify half-plaen where transfer function is applied to volume. Code for multiple transfer funcitons.
-McKay Davis
1264 lines of code changed in 34 files:
added a decrement operator
0 lines of code changed in 2 files:
added new analysis module
2438 lines of code changed in 7 files:
added properties for quicking finding streamlines
17 lines of code changed in 1 file:
removed Ren2Tex.tcl
0 lines of code changed in 1 file:
added new module for setting properties
705 lines of code changed in 5 files:
allowed point cloud option - although this can be done in gatherfields it is not obvious
127 lines of code changed in 4 files:
make parse_scirunrc callable from SCIRun2
0 lines of code changed in 4 files:
Rewrite logic for copying and versioning of .scirunrc file to be cleaner. Add bool validFile(string) and bool validDir(string) to Core/Util/FileUtils.h as convenice functions.
101 lines of code changed in 10 files:
updated stress
0 lines of code changed in 2 files:
updated stress
71 lines of code changed in 1 file:
Add backwards compatability for 'on release' option in Isosurface
0 lines of code changed in 2 files:
Fix logic for .scirunrc creation, was backwards (always created)
1 lines of code changed in 1 file:
PI redefined to be consistent with the other 8 PI definitions
0 lines of code changed in 2 files:
- variable name change d_residual -> d_tolerance (consistent with the input file and petsc solver)
- weeded
13 lines of code changed in 2 files:
Fix minor typo
1 lines of code changed in 1 file:
added hints for TxtBuilder; added UserGuider for TxtBuilder
41 lines of code changed in 4 files:
added gui variables to store button and slider info for multi-level data nets
39 lines of code changed in 2 files:
Dataflow/GUI/GenClock.tcl
Changed the name of the module from genClock to GenClock.
Removed unneeded argument to makeStickyLocator.
Packages/Uintah/Dataflow/GUI/TimestepSelector.tcl
Updated for new API for makeStickyLocator. Put it in a cool labeled
frame.
12 lines of code changed in 3 files:
added sticky locator
69 lines of code changed in 3 files:
removed label and frame border
0 lines of code changed in 2 files:
Changes to allow the removal of boundary cells in the visualization code
184 lines of code changed in 11 files:
Allow the TextureBuilder to fail gracefully if it does not receive 3D data
16 lines of code changed in 1 file:
Added a Matrix output port that we can send the current timestep
(first value) as well as other information (index to the timestep, and
all the timestep values). You get a dense matrix of size
(numTimestep+2,1).
22 lines of code changed in 4 files:
Get AMR MPM-on-finest-level thing working again, and progress toward load balancing it "
MPM, ICE, MPMICE: Modify run{MPM,ICE}OnThisLevel to include the number of levels, so the user can specify the finer levels rather than the coarser ones (so running MPM on the finest level only will work again) LoadBalancers
Replace ParticleLoadBalancer with DynamicLoadBalancer, along with a few structural modications
Schedulers
A few lb quirks
1090 lines of code changed in 29 files:
Fixed the autoPatch feature so that it will distribute patches correctly for any given resolution.
152 lines of code changed in 3 files:
Core/Grid DataWarehouse, TaskGraph Fixes to the AMR corner case problem (2d works, 3d mostly works) SchedulerCommon Fixes to the VarTracker Everything else
slight debug changes
271 lines of code changed in 7 files:
Only print out the stiff material warning on proc 0.
1 lines of code changed in 1 file:
Remove dummy library from commit ...
0 lines of code changed in 2 files:
reduce some spew to once per processor
35 lines of code changed in 12 files:
Dataflow/GUI/StickyLocator.tcl
Dataflow/GUI/sub.mk
New functions for generating a little GUI frame for positioning
Sticky objects in the viewer.
Packages/Uintah/Dataflow/GUI/TimestepSelector.tcl
Use StickyLoader instead of internal implementation. Yanked old code.
Packages/Uintah/Dataflow/Modules/Selectors/TimestepSelector.cc
When deleting the module, you should remove the callback instead of
adding it again. Cut-paste error most likely.
251 lines of code changed in 4 files:
Package for the collaboration with Duke and NIH. This package contains functions and modules for scripting and calculating tensors for volume conductor models, to be used in CardioWave or in Matlab or any other environment.
14826 lines of code changed in 107 files:
Small bug fixes
307 lines of code changed in 14 files:
weeds
0 lines of code changed in 2 files:
Trying to add a clock. This code will likely be moved to the genClock
module, but I want to have it here before something kills my disk. ;)
GUI/TimestepSelector.tcl
Added variables for clock parameters. There isn't any GUI widgets
to modify the variables just yet, though.
Modules/Selectors/TimestepSelector.cc
Added clock rendering. It is commented out, so you will have to
uncomment the line where I call createClock.
Fixed the bug where the time was able to be hidden behind geometry.
It turns out you have to put the word "Sticky" in the geometry's
name in order to get the right behavior.
Modules/Selectors/TimestepSelector.h
Formatted some of the old variables. Added clock parameters.
136 lines of code changed in 3 files:
Make colors and level selectors for multi-level data savable in nets
40 lines of code changed in 3 files:
changes from last coding session
54 lines of code changed in 1 file:
added solidEmission and isGasSolidInterface labels
-more work on solid emission.
100 lines of code changed in 2 files:
removed a compliation error
0 lines of code changed in 2 files:
remove some unecessary output messages
29 lines of code changed in 14 files:
remove some unecessaryoutput messages
58 lines of code changed in 23 files:
Adding cVolumeLabel to MPMLabel.
Todd, add cleaning up the Labels to the TODO list.
5 lines of code changed in 2 files:
new version of TxtBuilder using ncurse library, mouse is not supported yet
2592 lines of code changed in 19 files:
Delete the interpolator.
0 lines of code changed in 2 files:
Fixed bug so when reloading the network the data is preserved
0 lines of code changed in 2 files:
-Now dragging in temp(X,Y,Z)_FC for the solid.
-Hacked in functions to tack on sigma * T^4 to the absorbing solid source.
(Not being called)
90 lines of code changed in 2 files:
Add one coarse ghost cell to select the coarser neighborhood
8 lines of code changed in 1 file:
Adding temporary (I hope) option to turn off mechanics calculation at
compile time. This will be necessary for the September DAT.
10 lines of code changed in 1 file:
I don't know how projectCCHeat... ever worked in parallel in 2D, but it
didn't work in 3D until now. Now getting appropriate ghost data and
added some logic.
7 lines of code changed in 1 file:
Globally:
- started incorporating radiation heat flux into the absorbing solid.
copyValues()
now using transferFrom()
87 lines of code changed in 2 files:
so arches compiles
1 lines of code changed in 1 file:
Changed the way configure finds petsc on aix platforms.
==This line, and those below, will be ignored--
M configure
M configure.ac
4 lines of code changed in 2 files:
spew diet:
- no longer warn the user if they're using aggressive timestepping and implicit.
1 lines of code changed in 1 file:
Spew Diet:
setup()
- replaced cerr with cerr_dbg
- pass in cerrSwitch and activate cerr_dbg only on the first processor
Only see the spew once
23 lines of code changed in 9 files:
a little mods to SteadyBurn
0 lines of code changed in 4 files:
Started adding multi-level static refinement for 2D L-Shaped test for the pressure solver matlab code
92 lines of code changed in 14 files:
Adjusted AMG parameters to be read from input file
0 lines of code changed in 2 files:
Dont load dynamic libraries containing module code until the module is instantiated. Users can turn off this behaviour to enfore the old way by setting SCIRUN_LOAD_MODULES_ON_STARTUP to true
9 lines of code changed in 2 files:
Rearrange scirunrc reading so that it works if /home/callahan/.scirunrc does not exist.
22 lines of code changed in 1 file:
Minor cleanup, formatting, make non-exported functions static.
73 lines of code changed in 1 file:
eliminated spew
1 lines of code changed in 1 file:
check if it's time to radiate on every patch
11 lines of code changed in 1 file:
Hopefully fixing Jims compilation error
1 lines of code changed in 1 file:
Corrected the destructor, this fixes a memory leak when working with multi-resolution data.
6 lines of code changed in 1 file:
Make 'operator==' a const function
2 lines of code changed in 2 files:
multihvb.cc
spherefile.cc
Added attach_display calls for the displays.
tstdemo.cc
Removed unneeded CatmullRomSpline include.
1 lines of code changed in 4 files:
cut down on the spew from table interpolation
3 lines of code changed in 1 file:
Changes for testing advector imp amr ice problem
1 lines of code changed in 1 file:
Script that will take an existing index.xml and adjust the <timestep href
entries to a user prescribed set. Usage: adjust_index_xml -b # -e # will
create a new index.xml that only has the entries going from b index to
e index. A backup copy of the original index.xml is created. This is
helpful in creating movies of large datasets where you only want to load
in a subset of the data at any one time.
85 lines of code changed in 1 file:
FIX to have the MatlabEngine run on OSX Tiger, it turns out matlab is dumping error messages into stderr. These error messages are probably related to OSX 10.4, as I do not see them under 10.3. As a result the MatlabEngine detected errors being written to stderr and hence refused to launch the matlab engine (an error had occured). To fix this for the moment the MatlabEngine allows Matlab to write error messages to stderr
0 lines of code changed in 2 files:
Bug fixes to improve stability of applications run externally (in this case matlab)
0 lines of code changed in 2 files:
small change in SteadyBurn
58 lines of code changed in 1 file:
Fixed SGI comiler error. Use math.h instead of cmath. Also used Abs/Max from SCIRun/Core/Math/MiscMath.h.
8 lines of code changed in 1 file:
Fix SGI compiler error. Kurt, please verify my fix (and fix it better). Turned off bogus SGI compiler warnings from stl includes.
8 lines of code changed in 1 file:
Cosmetics. Removed compiler warning.
0 lines of code changed in 2 files:
Added superlu lib to Hypre for 1.9
8 lines of code changed in 2 files:
bug fix for running on multiprocessors
51 lines of code changed in 1 file:
HVolumeVis.h
Put a cap on the max depth. We don't want infinite recursion.
ObjReader.h
Comment added.
Scene.cc
Don't add null displays.
VolumeVis.h
You can now have intersections when the ray origin is inside the
box. The next phase will be to get nested volumes to work.
glm.cc
glm.h
Comments and variable changes.
0 lines of code changed in 12 files:
Added discontinus diffusion L-shaped-like model problem
0 lines of code changed in 2 files:
added mechanism to only perform radiation calculation based on either
a time interval or number timesteps. Use
<calcInterval> </calcInterval>
42 lines of code changed in 2 files:
updated model
147 lines of code changed in 1 file:
Fixed radiation source for solid. Now it is zero inside the
solid. changed some hardcoded values to increase precision.
S6 DO has some weird constants. FIxed requires for vol_frac.
25 lines of code changed in 9 files:
Changes to make Uintah build on purple. Added function declarations for functions that were previous delcared only as friends. Added a configure variable IS_AIX instead of checking against the compiler for aix specific configure options.
132 lines of code changed in 15 files:
Needed pre-processing directive before multi-texture is used
17 lines of code changed in 1 file:
Correctly set subnet geometry when loading networks. Eliminates bug causing main network editor to redraw all over the place when loading a network with multiple subnets
6 lines of code changed in 1 file:
bug fix for Temp_CC and vol_frac_CC
4 lines of code changed in 1 file:
bug fix for particle search
10 lines of code changed in 1 file:
combined some repeated calls into the draw_level_outline
20 lines of code changed in 2 files:
added software controls
0 lines of code changed in 4 files:
Improved the outlining capabilities for multi-level fields, added the ability to choose color
235 lines of code changed in 4 files:
software rendering control for FlowRenderer. Hardware bugs still not worked out
51 lines of code changed in 3 files:
added override - not merged from branch
12 lines of code changed in 2 files:
Turn off the OREN switch.
1 lines of code changed in 1 file:
Add <cmath> and std::abs().
2 lines of code changed in 1 file:
Move the testing of new_init_delt != old_init_delt (which is a byproduct of a
component switch) to the if statement of if (needRecompile). This was done
to get the correct delt that is passed to the finalizeTimestep() via
the recompile(). When switching, output would not be generated if you used
a <outputInterval>. With the change, output is now restored.
14 lines of code changed in 1 file:
Remove unused #includes that are no longer present in X.org 6.8.2
0 lines of code changed in 2 files:
GUI/TimestepSelector.tcl
Changed the default position of the time value.
Moving the node now changes the location of the time value.
Modules/Selectors/TimestepSelector.cc
Modules/Selectors/TimestepSelector.h
Changing the node position in the GUI now makes a change in the
display. Attemping to make better use of handles instead of
unmaintained pointers.
39 lines of code changed in 3 files:
added global variable d_table_or_ice_temp_density
computeProps()
- cleaned up some confusing/buggy computes/requires logic.
56 lines of code changed in 2 files:
AMG seems to work without crashing, matrix looks ok. Need to double check results of 2-level implicit AMR ICE example problem with Todd.
278 lines of code changed in 18 files:
Matrix is now symmetric, corrected a few bugs at C/F interface matrix construction. But C/F fluxes taken from ICE are still mis-scaled and should be fixed next.
85 lines of code changed in 1 file:
Put #ifdefs around FAC only so that CG and Hypre 1.7.7 are supported. Not clear if AMG and 1.7.7 supported yet.
56 lines of code changed in 12 files:
Working on getting the matrix to be correct in AMRSolver. Added solver component TODO list file.
156 lines of code changed in 12 files:
Core/Geom/GeomText.cc
Core/Geom/GeomText.h
Added moveTo function to move the current rendering position.
Packages/Uintah/Dataflow/GUI/TimestepSelector.tcl
Added a canvas that allows you to move the position of the
timestep. This is a work in progress, but shouldn't affect previous
behavior.
Packages/Uintah/Dataflow/Modules/Selectors/TimestepSelector.cc
Packages/Uintah/Dataflow/Modules/Selectors/TimestepSelector.h
Added update_timeposition function (doesn't do much yet). Added
tcl_command function to allow the GUI to update the location of the
timestep.
154 lines of code changed in 6 files:
Revert puts for switch_label, earlier commit broke mpi runs.
2 lines of code changed in 1 file:
Store switch label in a "level-less" way. Switcher.cc
Add computation for time derivative of heatFluxSum. SteadyState.cc
14 lines of code changed in 2 files:
Fix some compiler warnings about signed/unsigned comparisons and unused variables. Annotate commented code.
60 lines of code changed in 6 files:
AMG solver produces results but diverges and corrupts sp_vol_fracX_FC
180 lines of code changed in 10 files:
Added Hypre sstruct libraries to configure
5 lines of code changed in 2 files:
Bryan & Oren changes to scheduleSolver of new hypre solver
15 lines of code changed in 1 file:
Added C-F, F-C connections to graph, matrix, and FAC, AMG solver interfaces
1551 lines of code changed in 25 files:
Fix SGI compilation. The name of one of the function parameters was used twice in the .h file. Also, made names match in .h and .cc files.
24 lines of code changed in 2 files:
Should not try to link against MPM lib as it is not needed.
0 lines of code changed in 1 file:
Now consistent in printData flags
changed all
switchDebug<task name>
to
switchDebug_<task name>
^
43 lines of code changed in 5 files:
Add scheduleInitialize() virtual function.
0 lines of code changed in 2 files:
Made the switching criteria EXACTLY the same as the ignition criteria in
SimpleBurn.
15 lines of code changed in 3 files:
More realistic values for the max. CO2 and H2O concentrations
4 lines of code changed in 1 file:
Add a steady state switching criteria. Currently broken since I can't
figure out a way to pull old_dw info into it.
233 lines of code changed in 5 files:
Add a scheduleInitialize for d_switchCriteria components (ImpMPM and MPMICE).
Remove switchTest() and extraneous criteria for switchTest in MPMICE.
8 lines of code changed in 3 files:
fixed a couple typos
3 lines of code changed in 1 file:
Update for changes to getPort and code cleanup.
212 lines of code changed in 21 files:
Code cleanup.
0 lines of code changed in 10 files:
Update for changes to getPort.
729 lines of code changed in 10 files:
Use last package file name when processing imports.
1 lines of code changed in 1 file:
Add all libraries that are needed for linking.
8 lines of code changed in 1 file:
Untabified all files.
M Volume/Colormap2.cc
Fixed a typo that seems may have been causing a lot of problems:
>>>> value_range_(value_range_) <- Notice the '_' on both vars...
M Volume/CM2Widget.cc
Fixed numerous compiler warnings. Fixed broken compilation on inferno
(linux) and SGIs. Don't know what will have if you actually try to
run this on those platforms... Added a "not implemented statement".
McKay, please take a look at this when you get a chance.
M Volume/TextureRenderer.cc
Indented #if statements so I could try to follow them.
M Volume/CM2Widget.h
Removed "using std::string" from the .h file. Removed many compiler
warnings. Added "not implemented" statements.
1232 lines of code changed in 5 files:
Globally:
incorporated solid and gas MaterialSubsets (mss_G, mss_S)
cleaned up cout_doing statements
added bool d_hasAbsorbingSolid
-initialize()
deleted cellType initialization
-added set_cellType() task
incorporated if(vol_frac_solid > 0.5) cellType = 1.0
-computeCO2_H2O()
using ExtraCell iterator instead of Cell iterator. Makes visualization easier
-computeProps
added if(vol_frac_solid> 0.5) abskg[c] = 1.0
intensitySolve()
pulled weeds
using cell iterator instead of triple nested fortran loops
scheduleComputeStableTimestep()
moved it to the bottom of the pile.
325 lines of code changed in 3 files:
After consulting Micheal, I decided to make the String.h datatype a pure container with only a get and set function
0 lines of code changed in 2 files:
expanded to allow ITK Fields
60 lines of code changed in 2 files:
removed cerr debug messages
0 lines of code changed in 2 files:
Changed name for clarity of which min/max is being requested
10 lines of code changed in 5 files:
Remove file not checked in from build
0 lines of code changed in 1 file:
Major rewrite of the two different texture builders and associated
files to now use:
-dynamic compiling
-type descriptions
-vector interface for min/max
-allow for different fields/nrrds
-fixed state bugs
1503 lines of code changed in 14 files:
moved compile type into the nrrddata
1 lines of code changed in 1 file:
moved compile type into the data
55 lines of code changed in 2 files:
Core/Datatypes/FieldInterface.h -
Core/Datatypes/FieldInterfaceAux.h -
Add a vector magnitude comutation into the vector interface
Dataflow/Modules/Fields/VectorMagnitude.h -
Removed extra semi-colon
Dataflow/Modules/Visualization/RescaleColorMap.cc -
Allowed VectorField for rescaling colormap
77 lines of code changed in 4 files:
added CCVariable<int> to -varsummary option
0 lines of code changed in 2 files: