- Nov 07, 2012
-
-
Lars Bilke authored
See scripts/cmake/SubmoduleSetup.cmake for details.
-
- Oct 26, 2012
-
-
Lars Bilke authored
-
- Oct 18, 2012
-
-
Lars Bilke authored
-
- Sep 26, 2012
-
-
Lars Bilke authored
OGS_VERSION_AND_PERSONS => x.x.x (author names) OGS_VERSION => x.x.x
-
- Sep 24, 2012
-
-
Lars Bilke authored
-
Lars Bilke authored
-
- Sep 21, 2012
-
-
Tom Fischer authored
-
- Sep 14, 2012
-
-
Lars Bilke authored
-
- Sep 13, 2012
-
-
Lars Bilke authored
-
Lars Bilke authored
-
- Sep 06, 2012
-
-
Lars Bilke authored
Conflicts: BaseLib/Configure.h.in
-
- Sep 05, 2012
-
-
Lars Bilke authored
-
- Sep 04, 2012
-
-
Lars Bilke authored
-
Lars Bilke authored
-
Lars Bilke authored
-
Lars Bilke authored
-
- Aug 21, 2012
-
-
Lars Bilke authored
-
- Aug 20, 2012
-
-
Karsten Rink authored
integrated new mesh-classes into gui, rewrote some methods because everything is much shorter and easier now; some fem-related files and adaptions are still missing
-
- Aug 14, 2012
-
-
Lars Bilke authored
-
Lars Bilke authored
-
- Jul 03, 2012
-
-
Lars Bilke authored
-
Lars Bilke authored
-
- Jun 26, 2012
-
-
Tom Fischer authored
[BaseLib/BuildInfo.h.in] - copied file from OGS-5 and modified it a little bit [SimpleTests/MatrixTests/MatVecMultNDPerm.cpp] - program prints build and executing host information
-
- Jun 11, 2012
-
-
Lars Bilke authored
-
- May 15, 2012
-
-
Karsten Rink authored
added XmlIO; added FemEnums + Info-objects; added ProjectData; currently compile errors due to changes in PointVec
-
Lars Bilke authored
-
- May 10, 2012
-
-
Tom Fischer authored
in order to make the name of libraries, namespaces and directories more consistent the Base directory is know named BaseLib
-
- May 09, 2012
-
-
Karsten Rink authored
added test application for mesh reading, fixed some bugs, reading and creating a mesh is working now; Mesh is (for now) a friend of Node, this should be fixed soon.
-
- May 08, 2012
-
-
Karsten Rink authored
changed size_t to unsigned; included a few (yet unimplemented) methods for mesh-consistency checking
-
- May 07, 2012
-
-
Lars Bilke authored
git-subtree-dir: Base/logog git-subtree-split: 9f14a8af27b0c2cfe4299d0b823798a0e3bb6198
-
- May 02, 2012
-
-
Karsten Rink authored
-
- Apr 26, 2012
-
-
Lars Bilke authored
Added doc make target for doxygen documentation generation. See http://ufz.github.com/devguide/configure-cmake-options for details.
-
- Apr 25, 2012
-
-
Lars Bilke authored
git-svn-id: https://svn.ufz.de/svn/ogs/trunk/sources@10691 3895a583-e809-0410-9bb6-aa9463026377
-
Lars Bilke authored
Squashed commit of the following: commit 898329fc2815068adbf5b939d057f9b1fead5854 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Apr 25 09:55:50 2012 +0200 Bumped version number to 5.3.0 commit 7e4617a89adc8d3b450c1f1e3bfd6357e82a1108 Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Apr 24 12:17:44 2012 +0200 fixed warnings and optimised treemodel for meshes a little bit commit 1495e376738c6ad1d6b9033577370c25921a79e9 Merge: 1377212 f5785ce Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Apr 24 11:22:44 2012 +0200 Merge branch 'master' of vismac02.intranet.ufz.de:+ff-devs/ogs5/ff-sources commit f5785cedc5acce373bfb42157d19178b18279be2 Merge: ebb2de2 983cb25 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Apr 24 12:06:55 2012 +0200 Merge branch 'master' of vismac02.intranet.ufz.de:+ff-devs/ogs5/ff-sources Conflicts: Qt/Gui/mainwindow.cpp commit ebb2de2a3dcd35afc40fef25bafe2f9142c4ec52 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Apr 24 11:45:54 2012 +0200 class GMSHAdaptiveMeshDensity: - added method getSteinerPoints() - added method getQuadTreeGeometry() in debug mode - inserts the QuadTree object into the GEOObjects instance class GMSHPolygonTree - added method writeAdditionalPointData() class Polygon: - substituted method getIntersectionPointPolygonLine() by method getNextIntersectionPointPolygonLine() class QuadTree: - removed some commented code (method getQuadTree()) - added method getMaxDepth() - added a getter method for depth of QuadTree node class MeshGrid: - added method createMeshGridGeometry() in debug mode class CFEMesh: - added getter method for attribute _mesh_grid that is an instance of class MeshGrid files MathLib/MathTools.{h.cpp} - inlined the sqrDist() function commit 13772126635febfee03dd19ada3b1b5bd8b0ed40 Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Apr 24 11:20:57 2012 +0200 optimised meshsource a bit (meshes load faster now) commit 983cb2595a772e3a455a82d069a23dadd3ca1bfa Merge: 72e2912 451c841 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Apr 23 18:14:05 2012 +0200 Merged Dima's changes. Merge commit 'refs/merge-requests/1' of git://vismac02.intranet.ufz.de/ogs5/sources into merge-requests/1 * git://vismac02.intranet.ufz.de/ogs5/sources: Comment on possible SEGV. Emit warning when creating surface from open polyline. Correct function names in dbg output. Conflicts: FileIO/OGSIOVer4.cpp commit 72e2912d8cea3b72bbd65a5d2e880fe5030f05ac Merge: c1d018d 7f85f7a Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Apr 23 17:47:00 2012 +0200 Merge remote-tracking branch 'upstream/master' * upstream/master: git-svn-id: https://svn.ufz.de/svn/ogs/trunk/sources@10682 3895a583-e809-0410-9bb6-aa9463026377 a few fixes. some number adjustments will follow. retry. switch to direct curve derivative, rather than iterative. small changes. allow dpcdsw=0 for richards. correct ouput schemes for secondary vars with two time slots. git-svn-id: https://svn.ufz.de/svn/ogs/trunk/sources@10664 3895a583-e809-0410-9bb6-aa9463026377 thermal expansion was off! also fix to MFP outputs. Clarity for screen outputs with RSM. fix to PP. Possible fix to PI. fixes pcs without time control Fixes momentum (past error) and mass tran for multiple components. Include the FEMEnums header instead of forward declaring an enum. switched error methods enums to .num. quick bugs. version 5.2.09 Conflicts: FEM/rf_num_new.h FileIO/MeshIO/LegacyVtkInterface.cpp commit 612abcbe9c6452b51dbbda5c41646105c641ebb3 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Apr 23 13:05:00 2012 +0200 moved MshLayerMapper into MSH dir commit c1d018db2d960ee1e590deff7119071892c25a8c Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Apr 23 10:21:51 2012 +0200 added missing files commit 9fa363bb9b66013411b284fa995204429df35ab0 Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Apr 20 16:49:08 2012 +0200 included file converter into OGS-Tools menu commit 94d49c03881503b7722f67ddc8f562826401e1d7 Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Apr 20 12:33:48 2012 +0200 fixed index error in fem condition visualistion commit ed99be8234971d02228b5840c115655c7212a01a Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Apr 19 18:09:44 2012 +0200 fixed call sequence in FEMConditionSetupDialog commit 754bfdc64410b0a56d8ce9dd10b6c616603d6ff4 Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Apr 19 17:37:42 2012 +0200 corrected direction of surface normals for prism elements in msh layer extrusion commit b721c022956ce3a8bb9e7beec8810b09836d1ff8 Merge: efac021 cd79a64 Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Apr 18 17:44:07 2012 +0200 Merge branch 'master' of vismac02.intranet.ufz.de:+ff-devs/ogs5/ff-sources commit efac0211fed5c7553df1965d2c9651a1455a520e Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Apr 18 17:43:47 2012 +0200 FEMConditions can now be edited from GUI commit 530fa8d2adccd61aca1f8c38826ff81eddf18f30 Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Apr 18 12:48:13 2012 +0200 added functionality and dialog for setting up arbitrary linear conditions commit cd79a64caa904310bf3a0b3cccdfe673e4752b2c Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Apr 17 16:37:52 2012 +0200 another change due to test point in polygon functionality commit f49c4c2f50d3739bd4552066a093e594c9c674cb Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Apr 17 16:26:25 2012 +0200 due to the modification of the test criterion for the point in polygon test it was necessary to modify the TestPointInPolygon program commit 94efdac7ec75e9fe3349b76bf70ecc2bbd778a61 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Apr 17 16:11:46 2012 +0200 removed old code from GMSHInterface commit 8bbbddd98cbf15998e8d2def8786c0105b7d7d96 Merge: 0521b47 f6a1c2e Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Apr 17 15:55:54 2012 +0200 Merge branch 'master' into GMSHInterface Conflicts: FileIO/XmlIO/XmlGmlInterface.cpp UTL/MSHGEOTOOLS/mapGeoToDEM.cpp commit f6a1c2ee85ac25c10189f16a023801c6591c9be0 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Apr 17 15:33:21 2012 +0200 fixed a small compiling bug commit f32766c69ce1d224643bd4f5c1b344a6562fff94 Merge: 9a4e019 d8cf171 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Apr 17 15:15:32 2012 +0200 Merge branch 'master' of vismac02.intranet.ufz.de:+ff-devs/ogs5/ff-sources commit 0521b47c00718646b0d387d5e2878829125f6af3 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Apr 17 15:09:10 2012 +0200 - correction of GMSHPolygonTree::insertPolyline - added documentation to class GEOObjects - added documentation to class Polygon - added method getAllIntersectionPointsPolygonLine() to class Polygon - removed some debug output from method Polyline::insertPoint() commit d8cf171633f32114236f3f2cc0a5490bd7cd876b Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Apr 17 11:22:14 2012 +0200 fixed casting error in linux commit 1e4d40681fa4e0f1c00571807cc60c2ba236661e Merge: 4064f83 8572862 Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Apr 17 11:12:28 2012 +0200 Merge branch 'master' of vismac02.intranet.ufz.de:+ff-devs/ogs5/ff-sources commit 4064f83e1df70b35e001dde8a5dd33aa99e948b5 Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Apr 17 11:12:07 2012 +0200 direct conditions are now integrated into file converter commit 857286272fa34274696ab08013f06573c4bd1a9c Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Mar 30 13:41:25 2012 +0200 README code indention. commit f383fda08a9dfa960a0c5ed88d8a3577e76b6fae Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Apr 16 17:59:31 2012 +0200 direct source terms from cnd-files are now pretty seamslessly integrated, direct st's from ascii files still works (lots of changes while reading) but requires a lot of extra code and should be removed asap commit 451c841de0ace2b602c2d650e6588c3df079a64e Author: Dmitri Naumov <dmitri.naumov@ufz.de> Date: Mon Apr 16 11:44:33 2012 +0200 Comment on possible SEGV. Signed-off-by:
Dmitri Naumov <dmitri.naumov@ufz.de> commit b15002811fc4768c143dcec12626962b45bf614d Author: Dmitri Naumov <dmitri.naumov@ufz.de> Date: Mon Apr 16 11:43:53 2012 +0200 Emit warning when creating surface from open polyline. Signed-off-by:
Dmitri Naumov <dmitri.naumov@ufz.de> commit 22f33cd29b6acbd9670098869825c4b6ad3c2d68 Author: Dmitri Naumov <dmitri.naumov@ufz.de> Date: Mon Apr 16 11:43:32 2012 +0200 Correct function names in dbg output. Signed-off-by:
Dmitri Naumov <dmitri.naumov@ufz.de> commit 65eb0e02f739124a15515ec512bb0152d5624d59 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Apr 16 12:31:28 2012 +0200 changed structure of distribution-storage in FEMCondition commit 6fda771d82ef866b1bf6ef0503b52c0a5bbcaedf Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Apr 13 14:59:51 2012 +0200 added cnd2bc conversion to OGSFileConverter commit 3fee6d046ba77391afc3f5702358e24070236f11 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Fri Apr 13 14:52:03 2012 +0200 backup of daily work - still errors within the code commit eb74a5afe4760db54fe0a59617c83c3347cf6a9e Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Apr 13 11:50:54 2012 +0200 fixed error management in XmlGmlInterface - writer commit 9a7f91ccb536dc2546c325eec86f38ac38baf3c2 Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Apr 13 11:35:48 2012 +0200 added ASCII-Conditions to XML-Conditions Conversion to ConversionTool; added/extended error management in GeoIO commit 9b28b754bac7ff68c8f9c1d166d7fefbf89e4f7a Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Wed Apr 11 16:34:57 2012 +0200 backup of work commit c09619c33971b3da6acf4be6d110dcf6eac87d9f Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Apr 4 17:26:35 2012 +0200 started implementation of OGSFileConverter (incl. GUI) for conversion of xml-format to legacy formats and back. geometry conversions are implemented in both directions, condition conversions are still missing. commit 9a4e019856c72cce1d0eab1d857a02bdb1ef614e Merge: a8671b1 b6c984e Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Wed Apr 4 12:30:13 2012 +0200 Merge branch 'master' of vismac02.intranet.ufz.de:+ff-devs/ogs5/ff-sources Conflicts: FileIO/MeshIO/OGSMeshIO.cpp commit 1420f6b0f31039502b9a737ea99e85674197f594 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Wed Apr 4 12:26:00 2012 +0200 rewrote GMSHInterface - still not complete (inserting stations is missing) - backup commit b6c984e24976c7ad4e6b30469ffd05d25a39c9a7 Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Apr 3 12:59:37 2012 +0200 re-implemented generation of mapped multi-layer meshes and removed old method; implemented method to get surface-mesh from a multi-layer-mesh; changed input and output of distribution information in XmlCndInterface (part of ongoing changes for universal handling of fem-conditions) commit 3c1170979e360820cf0a85955a4e5cd3ebe8c028 Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Mar 28 16:53:45 2012 +0200 removed changes specific to the rappbode-demo commit b2671cdd375dc16df8b3dea5ab620c1bce454042 Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Mar 28 11:28:10 2012 +0200 more adaptions for rappbode-simulation-demo commit fea8c8904d33364f63abe484010faa7710deca24 Merge: 31fb422 4a96f39 Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Mar 28 08:31:53 2012 +0200 Merge branch 'master' of vismac02.intranet.ufz.de:+ff-devs/ogs5/ff-sources commit 31fb4227a47f7f1f241a50fe25172f4fdadc9a3b Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Mar 28 08:31:38 2012 +0200 fixed some performance issues (pvs-studio), special visualisation changes for bode-boatpath commit 4a96f39d7589cf396b0485110d3b207d4b862f57 Merge: 444f604 2624e59 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Mar 26 11:33:34 2012 +0200 Merge branch 'master' of vismac02.intranet.ufz.de:+ff-devs/ogs5/ff-sources * 'master' of vismac02.intranet.ufz.de:+ff-devs/ogs5/ff-sources: removed last remnants of old mapping code, fixed initialisation issue in FEM-Cond-Setup commit 444f604aea5ad92467beca8dc077478d5e290ab3 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Mar 26 11:33:21 2012 +0200 Fixed building of utils on Linux. commit 2624e59cd05f3b3efb5d189eb63ed2f0d69dca27 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Mar 26 10:27:37 2012 +0200 removed last remnants of old mapping code, fixed initialisation issue in FEM-Cond-Setup commit eb6e3dccc0744a08131a000edcd9a36c0777fd25 Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Mar 21 09:26:56 2012 +0100 integrated new interpolation scheme into MshLayerMapper commit efd9aa53dba0c6a66a6cf3a941083a2dd8216cff Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Mar 20 14:00:35 2012 +0100 GL_COMBINE is not available on Windows, GL_MODULATE gives the same results. commit 3715583bcefd3bc462f9b9376062a118b0a2ec53 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Mar 20 12:26:13 2012 +0100 One more missing include. commit 9aee41d450810bde2fed9bc64b4d1c90a59ff490 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Mar 20 12:07:14 2012 +0100 Added missing include. commit 760340711a8ec416577d7ee0cce361ba575283ff Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Mar 20 11:20:02 2012 +0100 OpenSG-exported textured objects are now correctly lit. Set EnvMode to GL_COMBINE in vtkOsgConverter's texture chunk. commit 1089d95ca25c41e9e65bb1ea66d0c1a318a78f92 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Mar 19 11:11:39 2012 +0100 Added a comment how to apply default colored lut to a grayscale texture. commit cff2ff75b91f5bef7bcc209717751a619fe317aa Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Mar 14 15:16:03 2012 +0100 Cloning the lut is not needed in the ParaView OpenSG Exporter. commit 0b3e51128518ea69a8cd3fd5e073cc2681bd0cba Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Mar 16 11:41:24 2012 +0100 fixed an issue with TIFF palette selection; added method for assigning borehole profiles to station objects commit 5e2be90424a7ee2a98153cdce6251b685839784f Merge: 1169ad1 4b1207b Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Mar 14 10:35:20 2012 +0100 Merge branch 'master' of vismac02.intranet.ufz.de:+ff-devs/ogs5/ff-sources commit 1169ad1d5dd6b6c8ecbd36a99ea2e49867434e5e Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Mar 14 10:35:04 2012 +0100 updated mapGeoToDEM-Tool to also map station data commit 4b1207b43392e63c6e7ea69008c63e331fb00497 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Mar 13 12:09:57 2012 +0100 Fixed overriding of compiler flags on not debug builds. commit c3c9b57e28bec625e5da33a2c2278d2e11055c68 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Mar 12 16:54:17 2012 +0100 Add lut now remembers its directory. commit 26ba0869bd9f537e91b52ff1d81cc771c73ffd3f Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Mar 12 16:46:29 2012 +0100 Fixed lut bug in OpenSG converter. commit 5042591c6a581a8c18b8841aa98e86c242ede51e Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Fri Mar 9 12:43:27 2012 +0100 save work - version of GMSHInterface does not work! commit 3cff111140a618c832a0daa16ce94c5d2dff4680 Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Mar 8 18:13:22 2012 +0100 fixed issue with precision in mesh-output; added GridAdapter Copy-Constructor; added extendable removeMeshNodes tool to remove nodes and adjacent elements according to given keywords commit d456c0f844d057a78fe77a373935a1de330cf2d6 Merge: 83c8eb2 a8671b1 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Mar 8 12:30:51 2012 +0100 Merge branch 'master' into GMSHInterface commit a8671b18ca1dea76c0d0ce92e87b4c7f76dc9f3a Merge: 038b128 54ec3a4 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Mar 8 12:30:26 2012 +0100 Merge branch 'master' of vismac02.intranet.ufz.de:+ff-devs/ogs5/ff-sources commit 038b128fc47af610d3c92715be97f68d43345025 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Mar 8 12:29:02 2012 +0100 changed the output precision for writing mesh node coordinates inserted some debug code in equation_class.cpp commit 54ec3a4746621468714b71d25a27e70461754a26 Merge: f67be01 dd0f8f9 Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Mar 6 18:20:11 2012 +0100 Merge branch 'master' of vismac02.intranet.ufz.de:+ff-devs/ogs5/ff-sources commit f67be017cb5dfb12f17b22b16272801407cef0db Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Mar 6 18:19:08 2012 +0100 fixed array initialisation error for mesh-construction from double array (i.e. netcdf) commit 09cdd146156fa8614da399dc2dbca90852dcaa3a Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Mar 6 15:20:57 2012 +0100 fixed index error in coordinate-output for mesh elements commit 20124e4d67818f828329476d4900a3e476cc4db5 Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Mar 6 15:11:41 2012 +0100 fixed index error for strat-index in borehole-source-object commit 83c8eb211c5ac1e60d139907da14ab50aa7a5604 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon Mar 5 16:07:52 2012 +0100 some improvements in GMSHInterface - not yet finished - under very heavy construction! commit dd0f8f9223c6932d3d820438f4de5e99f77e28e3 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Mar 5 12:09:03 2012 +0100 Added a directory for every file type which is loaded to QSettings. commit 9042ca6f2e2a7cf167b4eba0fe39eae39a7f7cb8 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Mar 5 11:57:25 2012 +0100 Refactord pipeline item remove code. VtkAlgorithmProperties has a new member _removable which should be set to false in a derived class which should be not removable from the pipeline view. commit 4053333b095205d17cde76e902b51b869ab0b748 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Mar 5 11:28:48 2012 +0100 OpenSG Export works so far. Cell data is converted to point data. To correctly export meshes comment out line 104-115 in vtkOsgConverter. commit 634300e426439ea1b2fba76810d43b0c10a6688b Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Mar 2 17:14:25 2012 +0100 WIP: getting OpenSG export to work properly. commit c744aec853bdc14b63d1550b905e4bf9287c0489 Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Mar 2 17:13:45 2012 +0100 Moved VtkAlgorithmProperties to base class VtkVisPipelineItem. Fixed getting the right VtkAlgorithmProperties in VisPipelineView::contextMenuEvent(). commit 3f2fc6ecb9780282107825fdd74adf5b1a010c56 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Mar 1 16:09:25 2012 +0100 Fixed a bug where entering zero into the z-scale field hides the data permanently. commit b1de459fd44988c2ebb7192037e5eece5911ecf3 Merge: 31238be 85cbb30 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Mar 1 14:04:14 2012 +0100 Merge remote-tracking branch 'upstream/master' * upstream/master: updated version to 5.2.08 merged OGS-GEM-MT changes into trunk Recovery GetElementFaceTri..Quad bug fix for benchmark H2/LabGasInjec Conflicts: FileIO/MeshIO/LegacyVtkInterface.cpp commit 22d2f7ef9af77d5cdd9cde8dac9f49e97ffff729 Merge: 2c455fa 31238be Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Mar 1 12:49:09 2012 +0100 Merge branch 'master' of vismac02.intranet.ufz.de:+ff-devs/ogs5/ff-sources commit 2c455fabac630b0359a613f076983798bc85b416 Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Mar 1 12:48:45 2012 +0100 fixed issue with layer mapping due to to transition to VtkRaster commit 31238be45cd410ad16bfcc34d45741f8bbe0e4d0 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Mar 1 12:39:48 2012 +0100 Added warning when lut can not be applied. commit cb897f5e872f585d893eee6c7b77b905d23975c6 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Mar 1 12:33:57 2012 +0100 Fixed setting lut on tubes. commit 09fe6aa96ed78eea71922ec7877b7f10741b68d6 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Mar 1 12:10:38 2012 +0100 Revert images should not be interpolated. commit eb5079092069c935e55e672117d47f2598cc2b64 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Mar 1 11:38:41 2012 +0100 Removed OGSRaster. Refactored VtkBGImageSource which is used for exporting raster data to OpenSG to be used similar to VtkTextureOnSurfaceFilter. commit c9db2e3e289476472ebbc8c756362a999ce5cc1b Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Mar 1 10:20:26 2012 +0100 - fixed a compile error within UTL programms - fixed some warnings commit 7eafc3b3b2722409d9a22efb83d7bc2d574542a3 Merge: 56a2948 c9372d4 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Mar 1 09:52:29 2012 +0100 Merge branch 'master' of vismac02.intranet.ufz.de:+ff-devs/ogs5/ff-sources commit 56a29485b5ab55730fed9be5faf9b2d327ae9cf9 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Mar 1 09:51:04 2012 +0100 commented some debug messages in class OctTree added MeshGrid algorithm to the testMeshSearchAlgorithms program commit c9372d47a444c741bb552997eba6c0238d04cfcf Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Feb 29 16:16:42 2012 +0100 Finished Surfer-Import, removed old OGSRaster-class everywhere except in OpenSG-Raster Export and replaced with VtkRaster commit 00114568b69db6744e4000d0471e554d3ab79fc5 Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Feb 29 15:37:01 2012 +0100 added import for Surfer-ASCII raster files commit a564cb0b0dbad136202ea30d0ef52d1dff23cde5 Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Feb 29 12:57:15 2012 +0100 added optional station_value attribute to station objects commit 7d26180b78bafae0cbba9d3c662507c3a4e0ca79 Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Feb 29 11:38:18 2012 +0100 removed color-attribute from stations (not needed) commit e20ac6a636d8a56a8817a81cb9fa41361f3e57e1 Merge: 353b36e dcf274e Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Feb 29 11:29:20 2012 +0100 Merge branch 'master' of vismac02.intranet.ufz.de:+ff-devs/ogs5/ff-sources commit 353b36e90b73d0c783ac75ca4330ae2f17d19e09 Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Feb 29 11:05:14 2012 +0100 more work on creating, saving and loading of DIRECT terms commit abefb68b8666104f11ffd64a95a408c69edc50ee Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Feb 28 15:16:18 2012 +0100 changed output precision for gml files in rotateMesh programm some changes in class CNode in order to make it possible to use it with class template OctTree changes in the testMeshSearchAlgorithm programm commit 8654b1b9737db7d535b38e3a3550a2655ae3e386 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Feb 28 13:12:32 2012 +0100 - added test programm for mesh search algorithms - changes due to changes in the interface of the XML classes commit dcf274ee6e018f0b889b291cc1aff451f950c25a Merge: 50f3233 e6ea6a3 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Feb 28 12:17:33 2012 +0100 Merge branch 'master' of vismac02.intranet.ufz.de:+ff-devs/ogs5/ff-sources Conflicts: UTL/FileConverter/generateMatPropsFromMatID.cpp commit 50f3233ed1080a1672ac9edd46b5885159a1300e Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Feb 28 12:12:25 2012 +0100 - implemented class OctTree for faster search - will be tested soon - added access operators to CNode (access to coordinates) - modifications in utility programms GMSH2OGS.cpp, generateMatPropsFromMatID.cpp, mainModifyMeshProperties.cpp and rotateMesh.cpp due to changes in class FileIO::OGSMeshIO commit e6ea6a3041e595e4172969c83dcde643a78a04d5 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Feb 27 16:41:02 2012 +0100 Fix for subverison cmake script. commit bf0bd61ca5cb31542b4c78f6414b90230f4fc9aa Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Feb 27 14:51:50 2012 +0100 Fixed FindMsysGit^. commit dfaa87841493a96a42a152c45d95229da8b44678 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Feb 27 12:43:54 2012 +0100 Some CMake improvements: msysgit unix tools will be used on Windows. commit 9cbfe842f71d1d35b3b973c6f81d499259a58caf Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Feb 27 09:51:41 2012 +0100 Fixed CMake include order. commit 5ccee0ec9720a236715fefced48e6fe821344127 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Feb 27 12:10:40 2012 +0100 finished conversion of xml-classes into new hierarchy, adapted tests + tools commit 8f0577eeedb9781dc552483fc361cc2e6b904323 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Feb 27 11:23:06 2012 +0100 derived all xml-classes from Writer-class commit 563a4212b6cac1c460ebf93d56fc250a9c00ffb5 Merge: e961cab 4728f1b Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Feb 27 09:17:25 2012 +0100 Merge branch 'master' of vismac02.intranet.ufz.de:+ff-devs/ogs5/ff-sources commit e961cab2f3946ed62e94859a2b78cbcd2cade1f5 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Feb 27 09:17:18 2012 +0100 integration of direct st generator into gui (not yet finished) commit 4728f1bd3b7a3700f66882861592f03d8ce1b11c Merge: d1813d5 ac93e47 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Feb 27 09:15:01 2012 +0100 Merge branch 'fileio_baseclass' * fileio_baseclass: Moved write method to protected. WIP: Reader. Refactored OGSMeshIO to use the new Writer base class. Added output parameter to QtTestrunner. Removed wrong method. Added Writer base class. commit ac93e47021e8a5ad0976818c45bb2c34b878c475 Merge: 62d0313 d1813d5 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Feb 27 09:13:56 2012 +0100 Merge branch 'master' into fileio_baseclass * master: (48 commits) Threshold filter gets the right range. Added missing include. Mapper automatically uses the range from its associated lookup table. Fixed threshold filter color lookup. Fixed threshold filter lookup table coloring. Added -o switch for additional CMake options. fixed a bug in rotateMesh program (deleted an object twice) fixed a normalisation thingy changed distance computation in quadtree fixed a compile error in OGSError - Changed reading gli files, the function returns now a std::vector<std::string>. In this vector of strings possible error messages are catched and can be desplayed later on. - Changed test if point is already in quadtree. just some cosmetic changes... Reovery MarkInterface_mHM_Hydro_3D() for marking nodes on the top surface Fixed empty VtkAlgorithmProperties in point set item. added an "epsilon" to the search of mesh nodes within surfaces Correct the getElementFaces... some fixes for surface integration via GUI added an optional parameter to rotateMesh program Fixed css link on doxygen. Removed debug output. modified rotation programm ... commit 62d0313968f97f72e2228778d03628cc5576304e Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Feb 27 09:13:30 2012 +0100 Moved write method to protected. commit d1813d5a56af4e2fccd8a95dd3040735d10bfae4 Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Feb 24 11:44:14 2012 +0100 Threshold filter gets the right range. commit 96116a1c753412f82241088ed7311a5b3a26b886 Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Feb 24 09:00:17 2012 +0100 Added missing include. commit 3b6c606acc322821349d7285c9511f15529ca161 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Feb 23 17:59:34 2012 +0100 Mapper automatically uses the range from its associated lookup table. Simplification of lookup table code. Fixed VtkCompositeImageToCylindersFilter table range property. commit 01a5b01759568f1d69fd4f1966da8736f1fbb021 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Feb 23 16:50:11 2012 +0100 Fixed threshold filter color lookup. TODO: Get contour filter to work with color lookup. commit 46ba4f9beb8d28074c00f88f449c773b7270ffe5 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Feb 22 14:38:09 2012 +0100 Fixed threshold filter lookup table coloring. Fixed order of initialization steps in VtkVisPointSetItem. Extracted method getScalarArrayNames() from VtkVisTabWidget to VtkVisPipelineItem. commit 6fdf6e2f57ceb230418f51cb5299fff18056d338 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Feb 22 14:36:22 2012 +0100 Added -o switch for additional CMake options. commit 8ee83bc47538d9e4af58fdbd060a19eb12b21094 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Wed Feb 22 15:24:47 2012 +0100 fixed a bug in rotateMesh program (deleted an object twice) commit 2821effa909e75be126de2fe47e54fcc14fd682e Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Feb 22 09:42:38 2012 +0100 fixed a normalisation thingy commit 12b72da924db3f785fdf9900c3faa4b321a44261 Merge: e9c22d5 ddd8d3e Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Feb 21 14:12:01 2012 +0100 resolved conflict commit ddd8d3e74380b6dcb747f182f1c936171d30e9c6 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Feb 21 13:57:00 2012 +0100 changed distance computation in quadtree fixed a compile error in OGSError commit d3a98155b49c86c6b293c0f9d02ccc4b1a726772 Merge: 490999f b1ae64c Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Feb 21 13:20:46 2012 +0100 Merge branch 'master' of vismac02.intranet.ufz.de:+ff-devs/ogs5/ff-sources commit 490999f4558f19accc59b76b00eaab1a468c6350 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Feb 21 13:18:03 2012 +0100 - Changed reading gli files, the function returns now a std::vector<std::string>. In this vector of strings possible error messages are catched and can be desplayed later on. - Changed test if point is already in quadtree. commit e9c22d54900b8f7cb473f46e0b47235383b91627 Merge: 52493ed b55ee92 Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Feb 21 12:14:12 2012 +0100 Merge remote branch 'svn/master' commit 52493edf0750d520190677f13fab83590e732253 Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Feb 21 12:13:07 2012 +0100 just some cosmetic changes... commit b1ae64cb83fa95f2482852835378d64a8103490e Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Feb 20 12:38:07 2012 +0100 Fixed empty VtkAlgorithmProperties in point set item. Signed-off-by:
Lars Bilke <lars.bilke@ufz.de> commit e27eb60168b84f59cedb9b6df3c4288348368f63 Merge: a63e01f c0c4b77 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Feb 20 12:20:33 2012 +0100 Merge branch 'master' of vismac02.intranet.ufz.de:+ff-devs/ogs5/ff-sources commit a63e01f0a51a4cce364440d8903655dea3e39bb0 Merge: 3f5e071 5b7edb6 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Feb 20 12:16:49 2012 +0100 merged commit c0c4b7775bf9b6a1a4e084fc29ff79419ee8e473 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon Feb 20 11:58:09 2012 +0100 added an "epsilon" to the search of mesh nodes within surfaces commit 3f5e071a698aec09da73506447fa4c956e4e5875 Merge: bceced0 20bb3e1 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Feb 20 10:09:26 2012 +0100 Merge branch 'master' of vismac02.intranet.ufz.de:+ff-devs/ogs5/ff-sources commit bceced04225588064698167f71bd06c0f69470c2 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Feb 20 10:09:05 2012 +0100 some fixes for surface integration via GUI commit 20bb3e1f8411cb9067b5575571685d9ead7dcac0 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon Feb 20 09:08:41 2012 +0100 added an optional parameter to rotateMesh program commit 589087cd343d38234a67c5905f13b138d178fa7f Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Feb 17 11:48:06 2012 +0100 Fixed css link on doxygen. commit b7eceeaad9b1b39f5eee3742b829cc259fabe751 Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Feb 17 10:23:01 2012 +0100 Removed debug output. commit 0940bdf4ed24015be3779c4e75c4b3d4518c1365 Merge: 6613ccd f7103f1 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Fri Feb 17 13:37:27 2012 +0100 Merge branch 'master' of vismac02.intranet.ufz.de:+ff-devs/ogs5/ff-sources Conflicts: UTL/MSHGEOTOOLS/CMakeLists.txt commit 6613ccd022b7a31059251a457c91398da7ee2173 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Fri Feb 17 13:18:41 2012 +0100 modified rotation programm commit f7103f1ed56e2728b99ced82b353fd36703cdcd3 Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Feb 17 09:55:10 2012 +0100 Refactored geotiff library inclusion. commit c38f395249a17c1f6eb0df0d6c4f4753c42dc1ef Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Fri Feb 17 08:39:52 2012 +0100 fixed compilation error and removed some warnings commit bf687438c60074bccc68ae4cc200c4cbabb8d106 Merge: a75f51f 64e0f8b Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Feb 16 18:09:24 2012 +0100 Merge branch 'master' of vismac02.intranet.ufz.de:+ff-devs/ogs5/ff-sources commit a75f51f710f24ce4488fdee9d74dad63767eff6d Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Feb 16 18:09:07 2012 +0100 fixed yet another colour-lookup-table bug; implemented first attempt for surface integration of direct source terms (based on WW code, not tested yet) commit 64e0f8b2f252bbcdb5209e848b0eb43436d4fa63 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Feb 16 16:31:37 2012 +0100 Fixed crashes which occurred when wildly clicking in a tree view happened. commit c9f56a5f15001e681947178bab4addcc59cdc9e1 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Feb 16 14:52:35 2012 +0100 Fixed ConvertGliToVtk compile error on older boost version. commit 58d5e805bcc7059d011a236e598fbc7fb79b889e Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Feb 16 14:24:30 2012 +0100 Remember directory for lookup table. commit 286a6a229dbb90ae1ff839e92c68499a83d8d920 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Feb 16 15:48:20 2012 +0100 removed some warnings commit 5eb90f77724a8c498f00d557d17b0c2c690bd616 Merge: 40ec71e 354a0d6 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Feb 16 15:27:30 2012 +0100 Merge branch 'master' of vismac02.intranet.ufz.de:+ff-devs/ogs5/ff-sources commit 40ec71ec99eba7c5baad3bf5c5f5c6225ff6eae7 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Feb 16 15:26:33 2012 +0100 improved search mesh nodes in (geometric) surfaces commit 354a0d6a4693c7747fa77b04bf3b2e03e070732f Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Feb 16 10:28:07 2012 +0100 Fixed coloring of assigned textures in VtkTextureOnSurfaceFilter. .# Please enter the commit message for your changes. Lines starting commit 1fcc6bf496930d56cddc7794b50f112d3db8354f Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Feb 16 10:27:29 2012 +0100 One more fix for correctly creating lookup tables in VtkVisPointSetItem. commit db2eb96ff72d2e12303e80c7f5b5f0ef62148f25 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Feb 15 16:37:19 2012 +0100 Fixed a bug in FindMKL.cmake on *nix 32-bit. commit 8af412911be9338561d39b0b25500c3c74964bcc Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Feb 15 17:37:05 2012 +0100 fixed an issue where colourlookuptables wouldn't work correctly if the offset was far from 0 commit 9d6acd2cbd0471ad0a918e26f42d40dff408f2b4 Merge: 8310dda 62da5e0 Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Feb 15 12:21:01 2012 +0100 Merge branch 'master' of vismac02.intranet.ufz.de:+ff-devs/ogs5/ff-sources commit 8310dda681322979b296588651497b03e65df5cc Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Feb 15 12:20:43 2012 +0100 adjusted colour table scaling commit 62da5e0810b84210aad4c92e284024d47e39b32c Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Feb 15 11:09:11 2012 +0100 Fixed UTL build on Mac. commit f39f15a96f19a22d2fd7a524e48dab114efdaea2 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Feb 15 11:09:00 2012 +0100 Missing file. commit 1aca305cb6e62c62cc3bf329893ccd3dc12b29b9 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Feb 15 09:51:45 2012 +0100 Split VtkAlgorithmProperties into header and source file. commit a30fe0cd68c150f0fe96c5ae33d1972241696fb5 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Feb 14 17:26:05 2012 +0100 Removed _activeAttribute from VtkVisPointSetItem. The active attribute is stored in VtkVisPointSetItem::_vtkProps. commit 18a36f0187d8fecc8ffbd1f58254f6c5534a4c1a Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Feb 14 17:13:00 2012 +0100 Fixed color lookup table functionality. commit a52ae05242c40e7d24583d44aa33f3fb07be1545 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Feb 15 11:42:57 2012 +0100 Fixed building of UTL. commit bae9625408a6a311f54a3a667520ef32800e1f86 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Feb 13 17:48:44 2012 +0100 fixed another small thing concerning borehole depth initialisation commit 75f8b113ddd90d44cbe5ece1a2b1fe2ade1e67fa Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Feb 13 17:22:54 2012 +0100 WIP: Reader. commit ecb255fd2c1073219d3ccf17370ba7e9169e4e70 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Feb 13 16:34:21 2012 +0100 Refactored OGSMeshIO to use the new Writer base class. commit 8c51dce8868b030be2ed3fe774e653655f43f856 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Feb 13 16:33:00 2012 +0100 Added output parameter to QtTestrunner. When this parameter is given the output of a failed test is written to tests/results/. commit 079d4c4dfaaba79d4cafe8bf8f4248cb902c6dcd Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Feb 13 16:25:14 2012 +0100 Removed wrong method. commit a9323b6ec1ebf20ceda611909a6418f586268598 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Feb 13 16:23:55 2012 +0100 Added Writer base class. commit 503f5230093701a7b6911fbc20e78f02f838b011 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Feb 13 12:49:11 2012 +0100 fixed bug were vtk visualisation (lines to tubes) would produce false results if borehole had soil layers with thickness 0 commit 1fbe37e72758d77f1891ef558d37a8a6d723f3ee Merge: 4612a75 cf48800 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Feb 13 10:40:41 2012 +0100 Merge branch 'master' of vismac02.intranet.ufz.de:+ff-devs/ogs5/ff-sources commit cf48800a11f3583030a0dac777e0272d323fd8c4 Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Feb 10 15:40:55 2012 +0100 Fixed some small bug in vtk output. commit e58e14908d9aac29f3bce7236de4c531bfc2bff9 Merge: 9939d3b 2829668 Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Feb 10 09:48:19 2012 +0100 Merge branch 'vtk_tensors_output' * vtk_tensors_output: Some formatting. Fixed non VTK build. Added Option OGS_DONT_USE_VTK. Implemented eigenvector vtk output of tensors with vtkMath class. Removed Eigenvectors functions. Added Eigenvector calculation from vtk. Bumped minimum cmake version to 2.8.3. commit 28296684675f6275d2c720a7da263e2174bb2c83 Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Feb 10 09:46:41 2012 +0100 Some formatting. commit 49b080140f73a1bfe9265625bb9ffb89343a4516 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Feb 9 18:10:44 2012 +0100 Fixed non VTK build. commit 2f8fdaf66725260a425d9694f00d0faf31e8a90a Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Feb 9 18:05:51 2012 +0100 Added Option OGS_DONT_USE_VTK. commit 82c3241ea73a9dcf807544036f427053d5c95f13 Merge: 94f865d 9939d3b Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Feb 9 17:16:00 2012 +0100 Merge branch 'master' into vtk_tensors_output * master: Reversed order in EQ_ASSERTS. commit 9939d3b7ecdef4885341f7c1f617be0330ce6fd6 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Feb 9 17:10:39 2012 +0100 Reversed order in EQ_ASSERTS. commit 94f865d16d147df4be1d78736df67940a5008f18 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Feb 9 17:07:28 2012 +0100 Implemented eigenvector vtk output of tensors with vtkMath class. The eigenvectors are normalized and then multiplied by their eigenvalues. In *.out file the output array names must be in that order: *_XX *_XY *_YY *_ZZ *_XZ *_YZ commit 4f37bb1426099b6ea4f627015ec32321c3760652 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Feb 9 17:06:09 2012 +0100 Removed Eigenvectors functions. commit 4612a75af5666acad9e646adc69cebdfccdf63b1 Merge: 44f7008 852573b Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Feb 8 18:05:24 2012 +0100 Merge branch 'master' of vismac02.intranet.ufz.de:+ff-devs/ogs5/ff-sources commit 44f7008794ed5e60df142d66d4ad2ed545a812a4 Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Feb 8 14:34:59 2012 +0100 added tool to map elevation of points in gml-files according to DEM commit f904321eecd01f63a8be0d60d55ef4d27cca591a Merge: 32e8975 852573b Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Wed Feb 8 13:45:31 2012 +0100 Merge branch 'master' of vismac02.intranet.ufz.de:+ff-devs/ogs5/ff-sources commit 32e897574dab665da37ec540f76cd18b83f4600b Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Wed Feb 8 13:43:48 2012 +0100 - rotateMesh - added functionality - first try to improve geometry-mesh-search commit b74bdd71724b717c42598e51cea43de9e6286670 Merge: 4317f8d 852573b Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Feb 8 12:06:08 2012 +0100 Merge branch 'master' into vtk_tensors_output * master: (119 commits) QtDataView must be built before VtkVis. Reintroduced getter methods on VtkGeoImageSource. Fixed two warnings. resolved various issues with netCDF import; NetCDF data can be imported as raster (and texture) now; ImageAlgorithms can be created from data arrays now; textures now use VTKRaster class; textures are currently using a default colour table - this should be prevented Fixed image to lines filter. Added backface culling option under Visualization Settings. - introduced a new nodes search algorithm (class MeshGrid) - TetGen export does not work as desired :-( fixed image translation by half a pixel image origin and spacing are now managed via image import; raster to mesh is working again; applying color table to images is working again; bar-chart filter ist still NOT working correctly; issue with floating value to material id conversion in raster-to-mesh-conversion images are now read directly via vtk, automatically scaled and noData values are transparent (for asc, tif, png, bmp and jpg); image-based filters do not yet work again Georeferenced image positioning fixed. Fixed path. removed QImage and tried to replace functionality entirely by VTK ... not working atm Fixed some doxygen warnings. Fixed typo. Added benchmark coverage script. Added benchmark_coverage target. Added parameter passing to testrunner. Refactored CMake include directories to use absolute paths. Exclude tests directory on coverage. ... commit 852573b95e60a2d52eaf34a61c285f8fa70a546d Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Feb 8 11:53:34 2012 +0100 QtDataView must be built before VtkVis. This fixes a compile error on *nix. commit 79c2f6b5dd58f2261ec6772df3746dd37a1fab74 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Feb 8 11:10:26 2012 +0100 Reintroduced getter methods on VtkGeoImageSource. commit ffeb4276ebf350da09ea2cff831d06f053369edc Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Feb 8 11:10:09 2012 +0100 Fixed two warnings. commit fe52e67350fde31c4d4e5b8ce4a1bd1d6b9be0c0 Merge: 5241fbb 7c893e7 Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Feb 7 17:55:51 2012 +0100 resolved merge conflict commit 5241fbb3374b8aab7cd1f2a468193e9b257c99c9 Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Feb 7 17:51:47 2012 +0100 resolved various issues with netCDF import; NetCDF data can be imported as raster (and texture) now; ImageAlgorithms can be created from data arrays now; textures now use VTKRaster class; textures are currently using a default colour table - this should be prevented commit 7c893e7e6c28759974aad57a88cf03a3e58fcb3a Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Feb 7 17:30:45 2012 +0100 Fixed image to lines filter. TODO: Image to bar chart filter (colors missing). commit 36a92129abf81a47e1b6e9fc6f024dbbf8247f39 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Feb 7 16:08:57 2012 +0100 Added backface culling option under Visualization Settings. commit e53b5e5287ec1bb067547c2b10b68679457e3ffb Merge: eea0bcb bdc5ba4 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Feb 7 12:25:28 2012 +0100 Merge branch 'master' into TetGenOutput Conflicts: CMakeLists.txt commit bdc5ba43c8700893efc0436e9eb2c4db3459e52b Merge: 7a07d21 7525ef0 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Feb 7 12:19:35 2012 +0100 Merge branch 'master' of vismac02.intranet.ufz.de:+ff-devs/ogs5/ff-sources commit 7a07d212d51c492b5b954d34b055c9b96d2aa4e8 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Feb 7 12:17:37 2012 +0100 - introduced a new nodes search algorithm (class MeshGrid) - TetGen export does not work as desired :-( commit 7525ef0c52ee769f92a23c61e08a13f8f10dceb6 Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Feb 7 09:50:26 2012 +0100 fixed image translation by half a pixel commit 68e2f8c2ab0cf181f14d31b980afba2c2d20166f Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Feb 6 17:25:38 2012 +0100 image origin and spacing are now managed via image import; raster to mesh is working again; applying color table to images is working again; bar-chart filter ist still NOT working correctly; issue with floating value to material id conversion in raster-to-mesh-conversion commit 66c62b381cafe7dc5d7fc8dfc54596278757f420 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Feb 6 14:36:16 2012 +0100 images are now read directly via vtk, automatically scaled and noData values are transparent (for asc, tif, png, bmp and jpg); image-based filters do not yet work again commit dee84eb876cece67b67283869f70c8254c0b47fb Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Feb 3 14:21:57 2012 +0100 Georeferenced image positioning fixed. commit 6ee0693e37f8f6e217f86c225d8f1fb7ec45e2c6 Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Feb 3 10:16:46 2012 +0100 Fixed path. commit ed3103b64c193123e10c94eda6d4eae97744adea Merge: 0fc50ab b20210d Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Feb 2 17:52:00 2012 +0100 Merge branch 'master' of vismac02.intranet.ufz.de:+ff-devs/ogs5/ff-sources commit 0fc50abbf2a8b2220d06191efb81366a209634e3 Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Feb 2 17:51:43 2012 +0100 removed QImage and tried to replace functionality entirely by VTK ... not working atm commit b20210d2b8a0e640f2e5dfc2e5b0f87b743e925c Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Feb 2 17:37:05 2012 +0100 Fixed some doxygen warnings. commit 8aea6867f4928bfac0dfb749ebc019548ab844ab Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Feb 2 16:22:55 2012 +0100 Fixed typo. commit 18815a618fd3814850bdedefa82bbde8ce4fe881 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Feb 2 14:03:55 2012 +0100 Added benchmark coverage script. commit 8217b59b9554dc3deefa01090c974a6c4e487105 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Feb 2 13:55:19 2012 +0100 Added benchmark_coverage target. commit 6b18a1d6ad5d880e850ed76e629ee9adb93dc498 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Feb 2 13:53:37 2012 +0100 Added parameter passing to testrunner. commit 928fb7c12e02e83a70b5ae7b7e8445d4699f2282 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Feb 1 17:02:46 2012 +0100 Refactored CMake include directories to use absolute paths. On one hand this makes the CMake files better readable and on the hand this will fix the presentation of code coverage reports on Jenkins. commit ba6f049521598da9154e11a61a7962b27512b418 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Feb 1 16:01:09 2012 +0100 Exclude tests directory on coverage. commit e16d6f39ff20ad8938962d37ece805b8449bb74e Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Feb 1 15:49:13 2012 +0100 One more fix. commit 14c4c86b3b7375e3f4b348a6ada6f4374b9340ac Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Feb 1 15:40:51 2012 +0100 Fixed Jenkins build. commit 4ac18ea6bacae1053beb9c917633f7757b51a1f9 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Feb 1 12:34:18 2012 +0100 Added coverage build script. commit 036d257ca8d9e008cf1c56405460883a238c5d07 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Feb 1 12:33:26 2012 +0100 White space fixes. commit 918b016a22ce47f265a8f787d3c3f7ac3205120a Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Feb 1 12:31:14 2012 +0100 Code coverage on Jenkins. commit f9e91a6f38138af760548a111f12dcf3981ded4c Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Feb 1 12:30:57 2012 +0100 SOme small fixes. commit a4fa6aedb49f995208710122c95f71d6578a2fd4 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Feb 1 12:29:36 2012 +0100 VRPN extension is only build when option is set. commit b3d57f0186ce059cddbd7cd63aeea3c5ea5e08c7 Merge: fdb2140 e2c1ce2 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Feb 1 10:49:09 2012 +0100 Merge remote-tracking branch 'upstream/master' * upstream/master: HS Fix PTC update Fix bugs in van Genuchten permeability model for two-phase flow. From now on, index 43 stands for wetting phase and 44 for gas phase Squashed commit. PTC_FLOW, updated commit fdb214047a3c5eda5545d594b2d565014865f0c4 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Jan 31 17:29:33 2012 +0100 Cobertura code coverage report generation with gcovr added. commit b7a372789917c58426c9c2e769c82187c71cef64 Merge: 3330389 96a51e3 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Jan 31 16:08:57 2012 +0100 Merge commit '96a51e34b5ebe66ab23778541a69fd56eeaada06' * commit '96a51e34b5ebe66ab23778541a69fd56eeaada06': Squashed 'cmake/' changes from 85fb0c61..b27f8064 commit 96a51e34b5ebe66ab23778541a69fd56eeaada06 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Jan 31 16:08:57 2012 +0100 Squashed 'cmake/' changes from 85fb0c61..b27f8064 b27f8064 Fixed typo. git-subtree-dir: cmake git-subtree-split: b27f8064 commit 333038961f2f287b03c5d6d05301e12567e4da97 Merge: 59146e0 48b2c75 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Jan 31 12:28:40 2012 +0100 Merge commit '48b2c75b69a4bce3c991a2adf861eb865712033d' * commit '48b2c75b69a4bce3c991a2adf861eb865712033d': Squashed 'cmake/' changes from d77e35cf..85fb0c61 commit 48b2c75b69a4bce3c991a2adf861eb865712033d Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Jan 31 12:28:40 2012 +0100 Squashed 'cmake/' changes from d77e35cf..85fb0c61 85fb0c61 Some renaming. git-subtree-dir: cmake git-subtree-split: 85fb0c61 commit 59146e00508b405513433f67b366af0740b03db3 Merge: 8d8eef6 f51df6c Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Jan 31 12:19:37 2012 +0100 Merge commit 'f51df6c8368c3d8032e9592c720e38337c44b0cc' * commit 'f51df6c8368c3d8032e9592c720e38337c44b0cc': Squashed 'cmake/' changes from 2c1a3532..d77e35cf Conflicts: cmake/CodeCoverage.cmake commit f51df6c8368c3d8032e9592c720e38337c44b0cc Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Jan 31 12:19:12 2012 +0100 Squashed 'cmake/' changes from 2c1a3532..d77e35cf d77e35cf Merge commit 'ace8b6e9' ace8b6e9 Code coverage with lcov module. f068b6d2 This is version 5.2.07 by LB / TF / KR. 6507faca Squashed commit of the following: git-subtree-dir: cmake git-subtree-split: d77e35cf commit 8d8eef679283c9596aa158e54cbd26cd7f61f565 Merge: f34517e 088aa7f Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Jan 31 12:03:22 2012 +0100 Merge commit '088aa7f4b2e891b41f3e6aefc6fe496417a21fc7' * commit '088aa7f4b2e891b41f3e6aefc6fe496417a21fc7': Squashed 'cmake/' changes from 6773a13f..2c1a3532 Conflicts: cmake/FindMSVCRedist.cmake commit 088aa7f4b2e891b41f3e6aefc6fe496417a21fc7 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Jan 31 12:01:29 2012 +0100 Squashed 'cmake/' changes from 6773a13f..2c1a3532 2c1a3532 Moved some CMake modules to cmake/. e63887f1 Moved some CMake modules to cmake/. 6c559784 Updated README for pushing. 903e318b Added missing cmake module. git-subtree-dir: cmake git-subtree-split: 2c1a3532 commit f34517e1157a8b3bde47bd2c4466c9ec19ae1946 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Jan 31 12:00:22 2012 +0100 Some renaming. commit 468a316efbb4ab04d0cb12a65c78795b5463eb69 Merge: 0b96faf fc9d5ab Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Jan 31 11:56:13 2012 +0100 Merge branch 'gcov' * gcov: Code coverage with lcov working. Code coverage with lcov module. commit fc9d5ab6b51bdce71338b5875adbddb5a23ed4b0 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Jan 31 11:54:01 2012 +0100 Code coverage with lcov working. Enable it with OGS_COVERAGE=ON and then make the gtests target. commit 87caa3677157d57c4856f3c1578bcfee620e8d48 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Jan 31 11:53:48 2012 +0100 Code coverage with lcov module. commit 2d628996057a92b7df42f00e5d6935daca0becbf Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Jan 30 18:46:51 2012 +0100 added missing file commit 0bd22a28dd9589882bf0d0a3e359234cc7a7e8e7 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Jan 30 18:46:14 2012 +0100 ogs now uses xml-color-lookup-tables (same as paraview), colour tables can now be applied to images commit eea0bcb47f9e2818d405e7074f20128b2173b0bc Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon Jan 30 15:18:22 2012 +0100 added a programm that rotates 2D meshes into the x-z-plane commit 0b96faffadc59eebe485e03a408e50b22c634c00 Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Jan 27 11:35:24 2012 +0100 Fixed include (including cpp's is not allowed). commit 092295b83cf240a23d5e9325323566974f5d76d2 Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Jan 27 11:34:12 2012 +0100 Marked CTAGS and BBEdit CMake vars as advanced, commit 5ad7ba014f8386a9492fc43bb9a35e5f31e35899 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon Jan 30 08:45:05 2012 +0100 added test dir in CMakeLists.txt commit 9911f4b5c1294c2e855c0a39d681e9904557190b Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Jan 23 17:59:16 2012 +0100 Jenkins commit url test. commit ebfc6dae3393b5e1f3de0aa83ee3d4d7cd32b5eb Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Jan 23 17:38:22 2012 +0100 CMake dependency not needed here. commit 5490e352d3a5c7c0ddbbd99237fb6089c55e157d Merge: 8c1c0b9 4c167b7 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Jan 23 17:07:19 2012 +0100 Merge branch 'ff' * ff: (95 commits) Forgot file. Forgot that gdiff depends on Qt Refactored GEO tests. Moved gdiff to tests/. Refactored QtTestrunner to use googletest instead of QTest. Fixed creating first reference file. Added some QCOMPARE example usages. Added Qt definitions as stated in http://developer.qt.nokia.com/quarterly/view/using_cmake_to_build_qt_projects added testGMSHFromGeo Fixed false interpretation of test diffs and added possibility to update reference files. Added code completion file generation with ctags. fixed index error in FEMConditionSetupDialog removed test funcionality fixed an index error in meshfromraster fixed a bug in mesh writing fixed error in TestRasterFromMesh Fixed one folder mistake and simplified test make targets. Fixed gdiff building on Windows. All test targets are now organized in a Testing folder in Visual Studio. made interface of OGSMeshIO::write() more general ... commit 4c167b7511f3afcdd41f346a566de4d55a2beb6b Merge: 2f6e020 8c1c0b9 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Jan 23 17:03:35 2012 +0100 Merge branch 'master' into ff * master: Fixed Windows packaging on Visual Studio 2010 Win XP x32. back git-svn-id: https://svn.ufz.de/svn/ogs/trunk/sources@10001 3895a583-e809-0410-9bb6-aa9463026377 PTC has updated w.r.t. EOS Squashed commit. Squashed commit. commit 2f6e0207a7e16c0db5cb7f28dd8e9fada9b7a439 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Jan 23 13:45:28 2012 +0100 Forgot file. commit ed00775a2bf5d9c584a7a8331075f3af5299c080 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Jan 23 12:42:52 2012 +0100 Forgot that gdiff depends on Qt commit 97b9ca7b5e1139590da28c15890069fb242a3036 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Jan 23 12:38:21 2012 +0100 Refactored GEO tests. Moved input file to testdata repository. Made TestPointInTriangle googletest although it needs some test assertions. commit f2ca760a39118dcae882522b22e6052c332cf980 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Jan 23 11:55:56 2012 +0100 Moved gdiff to tests/. commit 484140750dff86c62fb2d22152b0775b11f923d5 Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Jan 20 17:44:17 2012 +0100 Refactored QtTestrunner to use googletest instead of QTest. This is because when using QTest ther must be one executable per test to function properly. This would make it more complex to write tests. commit 984c77a7e0b96cb68ec2efa98035d7df037793b6 Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Jan 20 14:49:48 2012 +0100 Fixed creating first reference file. commit f25cff6538fe4bed976607b64a399879c3eda8fa Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Jan 20 14:26:10 2012 +0100 Added some QCOMPARE example usages. commit 67d202c646637de0f6558ffc6c0618f1df081c58 Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Jan 20 14:24:38 2012 +0100 Added Qt definitions as stated in http://developer.qt.nokia.com/quarterly/view/using_cmake_to_build_qt_projects commit b9e731246447af1eb99be283fe5ac36170b2ca2e Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Jan 20 14:18:20 2012 +0100 added testGMSHFromGeo commit 95f5a95584dcaa94563a5b2e969c3b5283ec1c1f Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Jan 19 15:07:03 2012 +0100 Fixed false interpretation of test diffs and added possibility to update reference files. To update a reference file run QtTestrunner with a test function name, e.g. bin/QtTestrunner testMeshFromRaster commit bc0c6274367e7f7248318c188c3e05f667c919ed Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Jan 19 12:24:10 2012 +0100 Added code completion file generation with ctags. See http://ctags.sourceforge.net/ctags.html or http://www.cellcortex.com/2011/02/vim-ctags-for-qt-development-on-osx.html for details. commit e731caea5cf676ebbc3f34aa5ef20c22abf638e5 Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Jan 19 12:33:53 2012 +0100 fixed index error in FEMConditionSetupDialog commit f9a5f7f47f4cb06dc7f7fae76c10a283896f3fc1 Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Jan 19 11:55:30 2012 +0100 removed test funcionality commit ce89b6605752476de0a4a3b13549f672398824ea Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Jan 19 11:54:28 2012 +0100 fixed an index error in meshfromraster commit ed4e7ad6d81f6059ef710434dbf059431686ada8 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Jan 19 11:55:55 2012 +0100 fixed a bug in mesh writing commit 81b5adc0e9e0dd60e78c6713b4a5de4f5e55e1c6 Merge: b424d17 dd65b87 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Jan 19 11:46:30 2012 +0100 Merge branch 'ff' of vismac02.intranet.ufz.de:ogs5/sources into ff commit dd65b87edd705248835877ec424be879cf75f445 Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Jan 19 10:16:56 2012 +0100 fixed error in TestRasterFromMesh commit b424d17f5b22f399e5d61179191ad5959abd8701 Merge: 4e388ac 9b51868 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Jan 19 08:29:09 2012 +0100 Merge branch 'ff' of vismac02.intranet.ufz.de:ogs5/sources into ff commit 9b51868b9ab4bac97d8c9acec5256f4e64dc3b9c Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Jan 18 17:41:26 2012 +0100 Fixed one folder mistake and simplified test make targets. commit 9767d945583921880d7bb4f19b7e18ffcad80c48 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Jan 18 17:24:19 2012 +0100 Fixed gdiff building on Windows. commit e907c68cdad7ff97343a624785e35d7bc4b84fcf Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Jan 18 17:18:50 2012 +0100 All test targets are now organized in a Testing folder in Visual Studio. commit 4e388ac2f5833f4c7d8da728f66b72888b0d2e0e Merge: 163db50 7cfbe6f Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Wed Jan 18 16:30:29 2012 +0100 Merge branch 'ff' of vismac02.intranet.ufz.de:ogs5/sources into ff commit 163db503cb0f75aceaf0c5cee31c5ba4889df17d Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Wed Jan 18 16:29:51 2012 +0100 made interface of OGSMeshIO::write() more general commit b972e4dedba107f6d1a24e614a019a4148cd3bfd Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Jan 18 16:27:04 2012 +0100 Introduced new make targets gtest and qtest and renamed CTests for them. commit e54b96b4257bfba3c3f931de286467a31a992ccb Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Jan 18 16:26:45 2012 +0100 Added correct return code. commit 7cfbe6fd0fa5039065ae1d41dde593954e386a21 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Jan 18 15:28:15 2012 +0100 Nun aber! commit 6ab90350a84a982f4357e1e62d8f64f407ca92ae Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Jan 18 15:28:18 2012 +0100 fixed a few warnings commit 24bcf66d4f7ea57a69d9b8366dd76072de216cae Merge: ea7ca6c f4b52e1 Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Jan 18 15:05:58 2012 +0100 Merge branch 'ff' of vismac02.intranet.ufz.de:ogs5/sources into ff commit ea7ca6cb8b67ff5178e5425568cd89cd65b84bb6 Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Jan 18 15:05:21 2012 +0100 FEM Conditions can now be set on all points of a given polyline or surface commit f4b52e13eea9a8327b9f0c6fdba0c259648261c7 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Jan 18 15:03:41 2012 +0100 Benchmark script considers new Qt tests. commit e199a73395860ec805750d08aebcd2bb5a00863d Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Jan 18 15:03:24 2012 +0100 Fixed CMake variable. commit 006425970ff5f3c2ccf6e2e05869ada9f6ae46f0 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Jan 18 14:48:30 2012 +0100 Fixed diff output url path. commit be169ca368715dd6d13e2002a80679917efc27db Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Jan 18 14:34:20 2012 +0100 Added link to the diff output on failed tests. commit e12b875b600c2976e10de5bb37d1cedcd3fa1636 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Jan 18 12:19:18 2012 +0100 WIP: Just testing a link in the test output. commit 2bc88687ae80db1c53473034a2da98e77c112b60 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Jan 18 11:54:52 2012 +0100 Changed QtTestrunner to a non-gui app because of Jenkins testing. A Jenkins Linux slave does not have a X server running. commit 1e7aa4402f404cd09c2eea9c21444c7bc278adb4 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Jan 18 11:36:10 2012 +0100 Fixes a linker error on dev2. commit 1aa7a6db960673d8a98ace09b58966791f53bbe8 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Jan 18 10:57:16 2012 +0100 Enabled testing in build script. commit 893ecba9287fa1789049e63313da6ced7b0658fe Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Jan 18 10:28:35 2012 +0100 QtTestrunner is now also a ctest with QtTests. If run through ctest it outputs to build/testsQtTestrunner.xml. commit 83ba5e9772e4c3cda85e648966ac5f1fa218bee7 Merge: 17f8a97 3c2d3c5 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Jan 17 15:16:10 2012 +0100 Merge commit 'e8de161' into ff * commit 'e8de161': Finished first working version of Qt / Vtk testing. Moved test data to its own repository testdata. Forgot this. First implementation of the QTest based Qt/Vtk testing. Added a mesh write method which works with stringstreams. Removed time from build time stamp because this enforces a rebuilt. Fixed CMake build path. Renamed TestMeshFromRaster. * commit '3c2d3c5e6c3bf37b44c2168e784413e9d2c9e562': Finished first working version of Qt / Vtk testing. Moved test data to its own repository testdata. Forgot this. First implementation of the QTest based Qt/Vtk testing. Added a mesh write method which works with stringstreams. Removed time from build time stamp because this enforces a rebuilt. Fixed CMake build path. Renamed TestMeshFromRaster. commit 3c2d3c5e6c3bf37b44c2168e784413e9d2c9e562 Merge: 883c1df 17f8a97 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Jan 17 15:06:06 2012 +0100 Merge branch 'ff' into HEAD * ff: Removed old and unused LIB_DIR CMake variable. Removed unnecessary OGS_USE_NETCDF CMake variable. fixed a few inlude-issues Bumping required VTK version to 5.8 Added ncvalues.h from vtknetcdf source to DataView to fix compilation on *nix. renamed local variables for NetCDFDialog, included initialisation list and removed warnings fixed path-error under linux fixed bug concerning colour-table assignment; fixed bug concerning source term conversion NetCDFDialog: enter name of nc-object NetCDF Import Interface * commit '17f8a977ad03b11a19da7bd2593dab1df0828086': Removed old and unused LIB_DIR CMake variable. Removed unnecessary OGS_USE_NETCDF CMake variable. fixed a few inlude-issues fixed a bug creating Steiner points in GMSHInterface Bumping required VTK version to 5.8 Added ncvalues.h from vtknetcdf source to DataView to fix compilation on *nix. renamed local variables for NetCDFDialog, included initialisation list and removed warnings fixed path-error under linux fixed bug concerning colour-table assignment; fixed bug concerning source term conversion NetCDFDialog: enter name of nc-object NetCDF Import Interface commit 883c1dfe6b2267c9c385784c9a57bb1a43557ae8 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Jan 17 15:01:51 2012 +0100 Finished first working version of Qt / Vtk testing. These tests depend on the existence of the new testdata repository. See tests/Qt/Vtk/TestMeshFromRaster.h for an example test. commit 1a9f55cf534a72b04a0cc003047eaf4fa403b04b Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Jan 17 14:10:07 2012 +0100 Moved test data to its own repository testdata. Url: http://vismac02.intranet.ufz.de:8080/ogs5/testdata commit 17f8a977ad03b11a19da7bd2593dab1df0828086 Merge: 5df482c d00085f Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Jan 17 11:07:23 2012 +0100 Merge branch 'ff' of vismac02.intranet.ufz.de:ogs5/sources into ff commit d00085f151d8f622666c667c3d7cd8711745b416 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Jan 17 09:54:32 2012 +0100 Removed old and unused LIB_DIR CMake variable. commit 9bfd3a8bea6c24eb1906a7c58e96178166b7e03e Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Jan 17 09:53:43 2012 +0100 Removed unnecessary OGS_USE_NETCDF CMake variable. commit e1d006c7706b6f5c9f9cad421755afbaa64ee6fe Merge: 983342e 24ce539 Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Jan 17 09:29:19 2012 +0100 Merge branch 'ff' of vismac02.intranet.ufz.de:ogs5/sources into ff commit 983342e170be75d5fca6571af216b4d743ba233c Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Jan 17 09:29:00 2012 +0100 fixed a few inlude-issues commit 5df482c00ce4c345fe12381c6ad1a05cb4c1387f Merge: 9f62d33 24ce539 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Jan 17 09:11:25 2012 +0100 Merge branch 'ff' of vismac02.intranet.ufz.de:ogs5/sources into ff commit 9f62d33f05ddcca6ea215bd99fa36c71a8834dbf Merge: 5fc38bd d98c980 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Jan 17 08:06:28 2012 +0100 Merge branch 'ff' of vismac02.intranet.ufz.de:ogs5/sources into ff commit 5fc38bd240e8dc98a3e99b3f3e4d1182ef1553bc Merge: ba59846 810e680 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Jan 17 07:58:41 2012 +0100 Merge branch 'ff' of vismac02.intranet.ufz.de:ogs5/sources into ff commit ba59846d2ef460d7c2a238e6a225383f04e437cb Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Jan 17 07:57:59 2012 +0100 fixed a bug creating Steiner points in GMSHInterface commit 24ce539346a5ada6352d2ed9e8bf8b712c6bce2b Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Jan 17 07:37:16 2012 +0100 Bumping required VTK version to 5.8 commit d98c980b8d65442353c24c9ed80d1c184d50e68d Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Jan 17 07:00:59 2012 +0100 Added ncvalues.h from vtknetcdf source to DataView to fix compilation on *nix. This is a temporary bugfix for a VTK bug. The header is not installed by VTK but is needed from the vtknetcdf_cxx library. On Windows this is not the case because VTK is not installed but only built. See http://www.vtk.org/pipermail/vtkusers/2012-January/120994.html for more details. commit 937f6a43cb8125db801662fe2ee7f4b306dedfb0 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Jan 16 17:26:06 2012 +0100 Forgot this. commit 7a1573990d1f217d837f87815d5d252e2ea8f3b4 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Jan 16 17:24:34 2012 +0100 First implementation of the QTest based Qt/Vtk testing. commit 17a580277948166ffc8cfd0b3cd8a6fa3f87cabb Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Jan 16 17:23:23 2012 +0100 Added a mesh write method which works with stringstreams. commit c4af45d10dcb9d509ad2da00ee0c0295638ca217 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Jan 16 17:22:27 2012 +0100 Removed time from build time stamp because this enforces a rebuilt. commit 7b1f1dd8d6f329c32e9dde4634c4ead6842d843e Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Jan 16 17:22:05 2012 +0100 Fixed CMake build path. commit 198d475c1b8ff827d534169836e97892c9429757 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Jan 16 17:21:33 2012 +0100 Renamed TestMeshFromRaster. commit 810e680c23c7c812413f1fe4168e131ac12482d3 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Jan 16 16:10:58 2012 +0100 renamed local variables for NetCDFDialog, included initialisation list and removed warnings commit d0312aaea849b7f0e005c0f5a161274c86e7222f Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Jan 16 15:53:26 2012 +0100 fixed path-error under linux commit c4bc8ccecb43de347889de8990586b2ba92184ea Merge: 094a00a 0949419 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Jan 16 15:28:02 2012 +0100 Merge remote branch 'caro/ff' into ff commit 094a00a01562ef2549c05a59829d6f4fe2325809 Merge: 18313ed e034505 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Jan 16 15:25:58 2012 +0100 Merge branch 'ff' of vismac02.intranet.ufz.de:ogs5/sources into ff commit 18313ed9f4237684650199aa0ae94bf7b54774a7 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Jan 16 15:08:43 2012 +0100 fixed bug concerning colour-table assignment; fixed bug concerning source term conversion commit e03450592ce5e6a65b4629188977eb44445d0128 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Jan 16 11:41:31 2012 +0100 Removed UTL/Vtk from CMake. commit 86c0ba241a09be91bb4ef8bb816f53ed0486d9a8 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Jan 16 11:03:22 2012 +0100 Fixed build script and moved testMeshFromRaster to tests/. commit 3d1914177ab324ab9548a9d98231edb7799517c3 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Jan 16 10:16:57 2012 +0100 fixed cmake issues under MSVS commit 4a517e9c1b2cfdef7135d0ac327d410c33b5bc06 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Jan 16 10:05:21 2012 +0100 Added Visual Studio folder grouping. Visual C++ Express users must explicitly turn this feauture OFF with CMAKE_USE_FOLDERS=OFF. commit cb6c2767589f5ab59e224a089331c16044d40e3e Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Jan 13 15:28:20 2012 +0100 Added googletest source code and removed external library dependency. commit a1e5864aaaf846a27c0d4936deaa0d11210a94bb Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Jan 11 11:40:06 2012 +0100 Bumped minimum cmake version to 2.8.3. commit 58086349d86add39ab1e1b8f404061bb9efeeb10 Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Jan 13 15:54:51 2012 +0100 added documentation for testMeshFromRaster commit f62a437c33c19b2a60f6e8c6579876b07a2ac5dd Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Jan 13 12:08:59 2012 +0100 fixed cmake file commit 3f453cd67e9e0339247308e99522813a306120fc Merge: 4b7f0bb 128406e Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Jan 13 11:53:38 2012 +0100 Merge branch 'ff' of vismac02.intranet.ufz.de:ogs5/sources into ff commit 4b7f0bbb576c8aa1c5f9f3c70f097fa126ebd5cc Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Jan 13 11:53:16 2012 +0100 added test for raster-to-mesh conversion; some efficiancy-changes in condition-source commit 128406e1ad82d6d653eb8326d994f2251a181822 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Jan 12 09:52:58 2012 +0100 fixed a small bug, which prevents compilation with linux commit d869386a6b51d287d645f029390f40c7be6d8000 Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Jan 11 18:13:23 2012 +0100 added missing dialog files commit 681308ecbd6ccd750910e15fcaa1dff3c29a7828 Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Jan 11 18:12:32 2012 +0100 all (simple) femconditions can now be converted to the old fem objects, fem conditions can now be saved to file via a special dialog that allows to select various options commit 4317f8d2e35a6bc6239c92627b0d7e3af3b61d65 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Jan 11 17:45:36 2012 +0100 Added Eigenvector calculation from vtk. commit 09494199598fc56d3e93e20971f4f1e50b79be1f Author: Carolin Helbig <carolin.helbig@ufz.de> Date: Wed Jan 11 17:11:19 2012 +0100 NetCDFDialog: enter name of nc-object commit 70e141e06ceec179772e87003c2f22d76f91ec5e Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Jan 11 11:40:06 2012 +0100 Bumped minimum cmake version to 2.8.3. commit f0ba97174b020eb47757d2cb7b6292a1628d63a0 Author: Carolin Helbig <carolin.helbig@ufz.de> Date: Wed Jan 11 15:31:52 2012 +0100 NetCDF Import Interface commit bf3d26b3670dc02f3ae0bca4aeb490a91b4d13ed Merge: 0cfdd15 683bf2c Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Jan 11 12:41:18 2012 +0100 Merge branch 'ff' of vismac02.intranet.ufz.de:ogs5/sources into ff commit 0cfdd1526099461c5960da300cfb2ad66fcbb180 Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Jan 11 12:41:01 2012 +0100 added CBoundaryCondition(BoundaryCondition*)-Constructor, fixed bug with incorrect names for surfaces from old geometry-files commit 683bf2cbb0d14cf8df8fa31cbb37598e59bd0ea5 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Jan 10 10:14:44 2012 +0100 Fixed Windows packaging on Visual Studio 2010 Win XP x32. commit 83d09e4ea6dffba06b2bd071895db5869f76703e Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Jan 9 13:02:48 2012 +0100 Typo. commit 3410f4dfe822c9ab56477365a6435b7009d35ff2 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Jan 9 17:31:20 2012 +0100 removed debug-output commit 2de554b6cc645dd211bced36a9a58047a9220f9d Merge: 974dd04 20983a0 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Jan 9 17:26:57 2012 +0100 Merge branch 'ff' of vismac02.intranet.ufz.de:ogs5/sources into ff commit 974dd0422313ded313c5ee773825c4b7037d1c70 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Jan 9 17:26:25 2012 +0100 restructured VtkConditionSource such that only geometry-points that are actually needed are port of the object ... this also resolves the issue with incorrecct visualisation of DIRECT conditions and non-surface points commit 550b471042113ab67deebca0e48b6b827f69cba7 Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Jan 6 14:14:43 2012 +0100 back before trying something new commit 20983a04a117ed5e495078a68bbdb8829b603b02 Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Jan 6 14:02:22 2012 +0100 Corrected cmake message when profiling. commit d75a441195b8ec8e9f97a378533bb52417664aea Merge: 84b4d74 5e98368 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Fri Jan 6 13:44:43 2012 +0100 Merge branch 'ff' of vismac02.intranet.ufz.de:ogs5/sources into ff commit 84b4d74ee58350743c101f09f23c3f5ce854373d Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Fri Jan 6 13:44:00 2012 +0100 fixed a serious bug in vtk output commit 838d57d8841d36b8445c1a02af562eaa61bcc5a6 Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Jan 6 12:29:01 2012 +0100 refined direct-st generation (only surface nodes are used now) commit 5e98368ab52601a9ec1c05654cea43647875c9e3 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Jan 5 11:18:41 2012 +0100 Updated gprof2dot to rev cbf7da383d79. commit 24ed192f6ffc7d02d588f7f497bf16a52b1330f1 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Jan 5 10:48:21 2012 +0100 Forgot gprof call when configured with OGS_PROFILE=ON and running CTest. commit b11a8c92a626bb35cd2b391586c0738ee986a34f Merge: 13d4b9c 71e7531 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Fri Jan 6 07:50:46 2012 +0100 Merge branch 'ff' of vismac02.intranet.ufz.de:ogs5/sources into ff commit 13d4b9cd1d7011b6ebe914f7227c12eb42abbb2a Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Jan 5 16:20:28 2012 +0100 fixed some typos commit 71e753199f07cd52e3f0023ef1420c9ad3bf6632 Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Jan 5 15:34:40 2012 +0100 Fixed a few memory leaks commit f51c852138c824e7f8efd92ed7b79036a88f5918 Merge: 6a909a7 1ea2ff5 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Jan 5 15:16:55 2012 +0100 Merge branch 'ff' of vismac02.intranet.ufz.de:ogs5/sources into ff commit 6a909a72148d16f05829e9ecc845b1c5fae1e677 Merge: e0dc6e7 f86f8ac Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Jan 5 15:07:17 2012 +0100 Merge branch 'ff' of vismac02.intranet.ufz.de:ogs5/sources into ff commit e0dc6e722affb92e6e2be106c9e08ccf4c2a6aa9 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Jan 5 15:06:04 2012 +0100 some changes to transform an old GeoSys4 Surface type 4 into a surface that can be described by GEOLIB::Surface class commit 1ea2ff5454d41a5f79e23764c44b22cd9d612515 Merge: ef3a63f f86f8ac Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Jan 5 14:13:05 2012 +0100 Merge branch 'ff' of vismac02.intranet.ufz.de:ogs5/sources into ff commit ef3a63f484849f7576caab5d9bd69e12fef7b37b Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Jan 5 14:12:36 2012 +0100 added first test to create direct source terms from raster files commit f86f8ac1027cda53ab76621748c4e9409f8a21bd Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Jan 4 15:05:51 2012 +0100 Once again testing hooks. commit f4d6cad5b59d1f60220d6cdc9e59d431a02e9e9b Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Jan 4 15:00:41 2012 +0100 One more whitespace fix. I am just testing the gitorious post-receive hooks. commit 85dbbbc46444a54bfef39fd21ce7c27e79973c7f Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Jan 4 14:35:32 2012 +0100 More whitespace fixes. commit 410d595cc6fbca8fbff26e768f079d2ec2b47711 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Jan 4 14:21:26 2012 +0100 Some whitespace fixes. commit 82defb95e803f28f31511f7409465e90b9116e52 Merge: 6510d2a 7b9a29d Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Jan 4 10:31:25 2012 +0100 Merge branch 'ff' of vismac02.intranet.ufz.de:ogs5/sources into ff commit 6510d2afa438ea62c8637b2982a68c9b09f4a8c1 Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Jan 4 10:31:14 2012 +0100 some small changes commit 7b9a29df25ea188d5b0a9cfff8611bc2618d3c56 Merge: 303c939 93d5173 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Jan 4 09:58:27 2012 +0100 Merge branch 'remove_wget_deps' into ff * remove_wget_deps: Revert md5. Fixed Typo. Fixed md5 for shapelib makefile. Fixed paths and added output which file is downloaded. Added mkdir bin. Removed wget dependency for setup scripts on Windows. Added bash function to download a file with cmake. commit 93d517323b12606dcdbb2eb385fe8851e2b99fc7 Merge: 32edc97 303c939 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Jan 4 09:57:41 2012 +0100 Merge branch 'ff' into remove_wget_deps * ff: commit 32edc97b97ab1dc5a902b92aba37c6604b21c952 Merge: 7c896b8 0fd3063 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Jan 4 09:56:55 2012 +0100 Merge branch 'master' into remove_wget_deps * master: Removed old SetupLibs.bat script (and also test the subversion sync again). Squashed commit of the following: Squashed commit of the following: commit 7c896b8be1f6a125d549a5080f1eb82166dd0615 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Jan 4 09:27:42 2012 +0100 Revert md5. commit 27b578cf40dd2792d9b9e5a4c35c6116798f9224 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Jan 4 09:23:48 2012 +0100 Fixed Typo. commit d00d6e695541e9398981a8be8ade7a53add576af Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Jan 4 09:21:42 2012 +0100 Fixed md5 for shapelib makefile. commit 303c9398234bdb8017b278e9a0aad64f9b460ae7 Merge: 6fc2296 0fd3063 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Jan 3 15:11:58 2012 +0100 Merge branch 'master' into ff * master: Removed old SetupLibs.bat script (and also test the subversion sync again). Squashed commit of the following: Squashed commit of the following: commit d82599b0a0fc1a2e69252da9492b30d7888155e0 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Jan 3 15:10:16 2012 +0100 Fixed paths and added output which file is downloaded. commit 37155c4d4af7fd375ac9b8260b1beeb667d3c79d Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Jan 3 14:44:03 2012 +0100 Added mkdir bin. commit 4581d932f831d99bf844a4c7e4c2820932745624 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Jan 3 14:36:30 2012 +0100 Removed wget dependency for setup scripts on Windows. commit b000e0ea91949b37ca9e625c23f051321aec3a1b Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Jan 3 14:15:03 2012 +0100 Added bash function to download a file with cmake. commit 6c3894471012e03079e8ff87fd42179c927db60b Merge: 4c2e288 6fc2296 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon Jan 2 08:21:00 2012 +0100 Merge branch 'ff' of vismac02.intranet.ufz.de:ogs5/sources into ff commit 4c2e288b5dc380d4720e182557caa3bf0072132c Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon Jan 2 08:20:33 2012 +0100 fixed warnings in FEM/vtk.cpp commit 6fc2296e4d9d3ba9c53d975d283fa95a5a4428c2 Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Dec 21 15:56:58 2011 +0100 optimized GridAdapter to CFEMesh conversion (and vice versa) a bit commit 18b42f4dfa78421266be239b424e11e592252f76 Merge: 70b218c be08f78 Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Dec 21 15:35:20 2011 +0100 Merge branch 'ff' of vismac02.intranet.ufz.de:ogs5/sources into ff commit 70b218cea3192205114bb8031a022289a6985d74 Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Dec 21 15:34:55 2011 +0100 changed VtkMeshConverter to work with GridAdapter instead of CFEMeshes; changed MshModel to a more GridAdapter-centered approach; fixed bug in MshLayerMapper
-
- Feb 17, 2012
-
-
Lars Bilke authored
-
- Feb 01, 2012
-
-
Lars Bilke authored
-
- Jan 19, 2012
-
-
Lars Bilke authored
-
Lars Bilke authored
-
- Jan 06, 2012
-
-
Lars Bilke authored
-
Lars Bilke authored
-