Squashed commit of the following:
commit 77f4a872a59ccba14defca9978db4bfff188a681 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Oct 11 11:02:18 2011 +0200 removed some unnecessary files commit 5f5b941fa5f7c82a6c861d03ff91ff65ddf72ecb Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Oct 11 09:45:54 2011 +0200 Added some missing includes. commit 7ad1a4f3154e37d2decb24972593f4b5de348bce Merge: bf66348 7abc82a Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Oct 11 09:20:25 2011 +0200 Merge branch 'style' into ff * style: Formatted Qt/ according to the styleguide. Formatted UTL/ according to the styleguide. Formatted OGSProject/ according to the styleguide. Formatted OGS/ according to the styleguide. Formatted MathLib/ according to the styleguide. Formatted MSHGEOTOOLS/ according to the styleguide. Formatted MSH/ according to the styleguide. Formatted GEO/ according to the styleguide. Formatted FileIO/ according to the styleguide. Fixed includes due to include reordering on code formatting. Formatted FEM/ according to the styleguide. Formatted Base/ according to the styleguide. Conflicts: FEM/fem_ele_std.cpp FEM/matrix_class.cpp FEM/matrix_class.h FEM/rf_REACT_GEM.cpp FEM/rf_REACT_GEM.h FEM/rf_mfp_new.cpp FEM/rf_pcs.h FEM/rf_st_new.cpp FEM/tools.cpp commit bf66348cd7423e81bbd79f6568909934809f09f8 Merge: 11e399c c408127 Author: git@dev2 <lars.bilke@ufz.de> Date: Mon Oct 10 16:23:14 2011 +0200 Merge branch 'master' into ff commit c408127d7b91437f3a0b79863ac8877685bed55e Merge: 3a00638 53ceb1e Author: git@dev2 <lars.bilke@ufz.de> Date: Mon Oct 10 16:22:47 2011 +0200 Merge branch 'master' of /home/git/ogs_sources_svn Conflicts: scripts/process_benchmark_job/bench_info.rb commit 11e399c59289be43d0394752159fbc705a55a6d7 Merge: acadc2e 3a00638 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Fri Oct 7 10:01:25 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit acadc2e641b68493a8d041e332400e43912e323c Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Fri Oct 7 10:00:23 2011 +0200 some changes due to switching between fastpow and pow commit 3a00638539972da1a4c1d67092b11045b2d10195 Merge: cde073d 66dda12 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Oct 6 16:19:32 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff * 'ff' of 141.65.6.106:ogs_sources: moved class SparseMatrixDOK into file SparseMatrixDOK.h and SparseMatrixDOK.cpp commit cde073df14ade077d3490aae3d5ac94048d928bb Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Oct 6 16:19:11 2011 +0200 Change version number. commit 66dda12b535523288bf5829b7df045e52f0018b6 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Oct 6 14:37:01 2011 +0200 moved class SparseMatrixDOK into file SparseMatrixDOK.h and SparseMatrixDOK.cpp commit 7abc82ab48d5c57d9442f91db21f59cf32444440 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Oct 6 14:28:48 2011 +0200 Formatted Qt/ according to the styleguide. commit c073b87ba1aa9015e88e23084e63bf70e1e7f4f0 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Oct 6 14:10:38 2011 +0200 Formatted UTL/ according to the styleguide. commit 1b140e31e11a1f77ee6593c1fa0b80f004dec8c9 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Oct 6 14:09:22 2011 +0200 Formatted OGSProject/ according to the styleguide. commit ea6c726d7f2556bf9d41592f78de7b826a003813 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Oct 6 14:09:01 2011 +0200 Formatted OGS/ according to the styleguide. commit 574a6c40dac0e96d67ad9f8b9940187c6dbce56c Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Oct 6 14:08:20 2011 +0200 Formatted MathLib/ according to the styleguide. commit f589c78bfc50faa43033b77c28bb38b9ee1ed831 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Oct 6 14:07:51 2011 +0200 Formatted MSHGEOTOOLS/ according to the styleguide. commit cea6552c359b43bc259aad010392c153590523f9 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Oct 6 13:50:38 2011 +0200 Formatted MSH/ according to the styleguide. commit 01f964f2f5d758e333809d77bb272328a65deac3 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Oct 6 13:26:04 2011 +0200 Formatted GEO/ according to the styleguide. commit 8d9879dd0e011f3101bb2fb42abe0b7a8961caa8 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Oct 6 13:24:58 2011 +0200 Formatted FileIO/ according to the styleguide. commit 9e93cca005eeb0603ab5f3a533adb3f7413baac5 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Oct 6 14:15:38 2011 +0200 Fixed includes due to include reordering on code formatting. commit 26d58d2c9872888f806560d44d1b298f83ab9294 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Oct 6 11:01:36 2011 +0200 Formatted FEM/ according to the styleguide. commit 4c9e780690b9f1b39452534558ce4dff9de765d4 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Oct 6 10:24:26 2011 +0200 Formatted Base/ according to the styleguide. commit e0acf35cbfef0eb197326ce5b4dab0df71da5400 Merge: 79837d5 3bb4942 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Oct 5 14:41:24 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff * 'ff' of 141.65.6.106:ogs_sources: removed geometric type COLUMN removed all remaining warnings from vtkvispipelineitem fixed a warning commit 79837d5c51afb076b0df1d96c87ec1dbb6aa0ea4 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Oct 5 14:41:13 2011 +0200 Changes smtp server. commit 3bb4942ea0a8806554644ce76608137ab4662626 Merge: 9d14c54 d16a3db Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Wed Oct 5 13:57:08 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit 9d14c54477f6796bc7fbe2d9e5647feb974ddc4c Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Wed Oct 5 13:56:42 2011 +0200 removed geometric type COLUMN commit ca3ef3f58ac9becaeac63c7a65ac2f96d6f15221 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Oct 5 11:52:49 2011 +0200 Added python diff script from http://docs.python.org/library/difflib.html. commit 8fc7690a48e2b17564fd0d6284c54aacd133d3a8 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Oct 5 11:49:49 2011 +0200 Removed builtin cmake file compare commit d16a3db2b8cdb516918c92f985b38b8a18fd5ad1 Merge: 296344e 71d62d0 Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Oct 5 11:20:50 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit 296344e414eab998a5c997d3e9d79ea8ae7043af Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Oct 5 11:20:40 2011 +0200 removed all remaining warnings from vtkvispipelineitem commit 71d62d0975547e078396c428ce1f4f5ae5c2aac5 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Oct 5 11:17:30 2011 +0200 Reenable email notification after benchmark runs. commit a2216d17b83218264736bd54dbb8b884147f635d Merge: 98a0d8b cf21002 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Oct 5 10:32:15 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff * 'ff' of 141.65.6.106:ogs_sources: fixed compile error in BRNS and GEMS config fixed some warnings fixed a few warnings - made vector of connected nodes in class CNode private, wrote two access methods - substitutions of public access to CNode::connected_nodes commit 98a0d8b7180927157bd96e84449a36825ec866ee Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Oct 5 10:32:02 2011 +0200 bench_info.rb hopefully working now. commit c8102445ae26ab407f74efd44e115dba3197367a Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Wed Oct 5 10:19:07 2011 +0200 fixed a warning commit 4fbd29d28ce0131dc7484149e5e7e60c5485a90b Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Wed Oct 5 10:06:21 2011 +0200 fixed compile error in BRNS and GEMS config commit 442960d504952e7b507eb0b99f0a95b53ac28734 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Wed Oct 5 09:53:55 2011 +0200 fixed some warnings commit cf21002a73233f151e8d665e77bdebeece99efd4 Merge: b9e69c6 4fbd29d Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Oct 5 09:07:52 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit b9e69c67aa950f9a45f8dd098962f5ec59c628aa Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Oct 5 09:07:37 2011 +0200 fixed a few warnings commit 35eeeaf9fcbc1cf7bdaa1896dea87d425c8a92be Merge: b83393f 93bc1ed Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Wed Oct 5 08:30:56 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit b83393f428b748ee157c543f21632d86c3f1594a Merge: 9e0d016 714eece Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Oct 4 16:27:40 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit 9e0d016677a095276422455cfcfb39659c7d8c56 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Oct 4 16:26:01 2011 +0200 - made vector of connected nodes in class CNode private, wrote two access methods - substitutions of public access to CNode::connected_nodes commit 93bc1ed011ac86c412a936c728a474650182f791 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Oct 4 16:24:27 2011 +0200 Take only 12 digits and more verbose output. commit 4701217e4194cf63b7113089476f56820eebe35b Merge: 17cc4a7 bdbb4bb Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Oct 4 15:43:37 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff * 'ff' of 141.65.6.106:ogs_sources: removed osg scene manager next try (again) next try fixing OSG bug commit 17cc4a7e6edaf733d0070a00aefcc81e925d1195 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Oct 4 15:43:13 2011 +0200 More verbose output when on the same revision. commit bdbb4bbfe4ac38cc3492742cbd13738a776cdc7a Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Oct 4 15:39:16 2011 +0200 removed osg scene manager commit 00a29696af16a07b096e014bb54eb0019183d7f4 Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Oct 4 15:32:55 2011 +0200 next try (again) commit 714eecee8e1c8139869307fe9203bbde64ca3d88 Merge: 03a1cac 1a38a56 Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Oct 4 15:24:48 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit 03a1cacae951dc6a36db6f42cd6fecc3ff9ec204 Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Oct 4 15:24:43 2011 +0200 next try fixing OSG bug commit 1a38a56b7333c31b4f0c8968bc609d90000c7812 Merge: 00ace9f ff1e82f Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Oct 4 15:00:37 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff * 'ff' of 141.65.6.106:ogs_sources: removed OSG-related error (hopefully) split up VtkVisPipelineItem into two classes for better usability commit 00ace9fd070d4e4f142dd2808c994dacbdddc087 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Oct 4 15:00:23 2011 +0200 Fixed forgotten .revision on bench_info.rb. commit ff1e82f9a4bb6236f9bef2249618af1685e65ab9 Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Oct 4 14:58:11 2011 +0200 removed OSG-related error (hopefully) commit 70f3b8caa7d84d43965e4c7ab149bd46e13c7f8a Merge: 608826a 92fbf66 Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Oct 4 14:27:01 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit 608826a1a714a59a14f1216e96ce65850afefd5d Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Oct 4 14:26:53 2011 +0200 split up VtkVisPipelineItem into two classes for better usability commit 92fbf66b6bd9601d1ab6cc52c4162bc77b1c4bf9 Merge: 5bd9212 c0d3526 Author: git@dev2 <lars.bilke@ufz.de> Date: Tue Oct 4 13:14:27 2011 +0200 Merge branch 'master' into ff Conflicts: FEM/rf_REACT_GEM.cpp commit c0d35267e6f8e59ae8ca0c05f2ff90a1f3b3a442 Merge: b7fecd9 95c408d Author: git@dev2 <lars.bilke@ufz.de> Date: Tue Oct 4 13:11:50 2011 +0200 Merge branch 'master' of /home/git/ogs_sources_svn commit 088805dab204187b59ac9c797ae19a337e659224 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Oct 4 12:41:53 2011 +0200 some small changes commit 5bd9212383f0dcf615713d9d20a3cffb24528db1 Merge: ee063e8 088805d Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Oct 4 11:44:40 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit ee063e82cd3f45fc3528e04904dafcda50a1792b Merge: 211fbac b9adece Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Oct 4 10:42:30 2011 +0200 resolved conflicts commit 211fbac295fe515019f274aae6c3b5626fe5718b Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Sep 28 16:19:51 2011 +0200 fixed by bug concerning combined scaling and translation of vispipeline-items commit b9adecee9bb225c358a084d1cf61d5e63b517a39 Merge: 1c3c209 1404bf4 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Sep 27 17:13:56 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff * 'ff' of 141.65.6.106:ogs_sources: Fixed merge mistake. commit 1c3c209494bec7198ba2103c6287a31472582b8c Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Sep 27 17:12:58 2011 +0200 Fixed a bug concerning git commits in process benchmark. commit 1404bf43ef70d1dfd7c90a1faa18f2809019b08f Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Sep 27 15:38:43 2011 +0200 Fixed merge mistake. commit 9b42e38ef79cbb232a6f6e29b6f06b16ce80783b Merge: 2bd340d b7fecd9 Author: git@dev2 <lars.bilke@ufz.de> Date: Tue Sep 27 15:18:43 2011 +0200 Merge branch 'master' into ff Conflicts: FEM/rf_st_new.cpp FEM/vtk.cpp FileIO/OGSIOVer4.cpp commit b7fecd986f7ec71d2c96c0d729babda562a8cfeb Merge: 9764011 9c2d41b Author: git@dev2 <lars.bilke@ufz.de> Date: Tue Sep 27 15:04:13 2011 +0200 Merge branch 'master' of /home/git/ogs_sources_svn commit 2bd340d3ab6d2bede1f4ce306107d32554208924 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Sep 27 11:19:20 2011 +0200 Fixed a bug where XmlInterface does not compiled when QtXmlPatterns.lib is not existent. QXmlSchemaValidator depends on existence of QtXmlPatterns.lib and not on the Qt version. commit c5105c2db7bb8e16e147116cab40a05b8d99415b Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Sep 27 10:57:49 2011 +0200 modeltest.cpp is not needed for compiling commit e337caeef7c237e289e2ec66fe8c71c0ae5492af Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Sep 27 09:06:46 2011 +0200 Taking less digits to create the primary key on git commit in process benchmarks. commit 95e8ab49080d43fbcd3f970cb95482c9fb9b6cf1 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Sep 26 21:04:03 2011 +0200 Fixed path. commit 57e7bc07e012471c7ace9ad62241bf039013e09a Merge: 3b278f5 3acf0ff Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Sep 26 17:14:56 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff * 'ff' of 141.65.6.106:ogs_sources: - removed method X(), Y() and Z() from class CNode substituted fastpow(x,2) by x*x - made CNode::X(), CNode::Y() and CNode::Z() avaiable again fixed some warnings - removed methods X(), Y() and Z() from class CNode - please use instead method getData() to get a const access to the coordinates - many changes due to removing methods from class CNode commit 3b278f554df4e9d52c6ffb5e509cdecb74d5757c Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Sep 26 17:13:11 2011 +0200 Adapted path. commit bd3a4fe7892f8dee9aaabf76e5754bcec1e4ff5d Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Sep 26 17:06:03 2011 +0200 Moved all files belonging to process benchmark job to subdirectory. commit 196c62f91a2792a9c632b2fe6235d3738933ac0b Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Sep 26 17:47:28 2011 +0200 Database migration scripts added. commit 2a47b329fa4114909d41b45d22578a80282d5fe6 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Sep 26 17:46:37 2011 +0200 Process benchmarks script seems to work. commit 3acf0ffb5916755b422c5b30a070d24d103c65f5 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon Sep 26 15:06:34 2011 +0200 - removed method X(), Y() and Z() from class CNode commit 0c95c996371613af1b5ccc730e8e25f21ce9b65b Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Sep 26 12:16:33 2011 +0200 Refactored ruby scripts which process the benchmark outputs. Added Git support. commit 6de00330c3026cdcb43e76937695d45bdb3793ac Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon Sep 26 10:00:21 2011 +0200 substituted fastpow(x,2) by x*x commit b35ccc1d4c7a38716f95cbc5a7898f2db7fdc8a8 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Fri Sep 23 10:41:53 2011 +0200 - made CNode::X(), CNode::Y() and CNode::Z() avaiable again commit 84d1cddd19f194965a01ed7a67d90a0cbf81110b Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Fri Sep 23 09:35:16 2011 +0200 fixed some warnings commit 9208e164c12dd111b05aee535a91e185e4113395 Merge: 9d54ef7 506f0a8 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Fri Sep 23 08:29:24 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit 9d54ef74c0032ce7d65c63d4a4423928d5031ccc Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Fri Sep 23 08:23:15 2011 +0200 - removed methods X(), Y() and Z() from class CNode - please use instead method getData() to get a const access to the coordinates - many changes due to removing methods from class CNode commit 506f0a849505ef0a009081899a6c324df885e226 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Sep 21 15:30:08 2011 +0200 CMake options created with OptionsRequires() are OFF by default. commit 2799c0dc4d42c3a108703384d12b7e7cecf15ada Merge: f671241 cbb652d Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Sep 21 15:01:46 2011 +0200 Merge branch 'refactor/cmake-modules' into ff * refactor/cmake-modules: Refactored the OpenSG conversion. Release build configurations in scripts. Reset build configurations. Set default build type to Debug. Removed unnecessary #include "Configure.h". Delete CMake module because it exists already in CMake. Moved some CMake modules to cmake/. Moved some CMake modules to cmake/. Removed many entries in Base/Configure.h.in. Removed some CMake find scripts because they are in the new cmake-modules or are part of CMake itself (FindVTK.cmake). Getting rid of downloading FindGit.cmake because it is now part of CMake. Getting rid of unnecessary Visual Studio Solution extension. Getting rid of unnecessary Visual Studio Solution extension. Simplifying ADD_DEFINITIONS CMake calls. Using option_requires for dependent CMake options. Updated README for pushing. Added missing cmake module. Squashed 'cmake/' content from commit 6773a13f commit f6712416399eca0b69c9d0b9f089e8209cbc9595 Merge: 7cad473 c370afb Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Sep 21 14:57:17 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit 7cad473248368e71f2bd9a76673519afce06e5c8 Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Sep 21 14:57:07 2011 +0200 just some small changes commit c370afbfa0848c7b145c1fa77cf1353dafec0281 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Wed Sep 21 12:50:19 2011 +0200 fixed some include issues commit 97a05059212017d38ffa30fe828ba01b8fa247b0 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Wed Sep 21 12:34:32 2011 +0200 changes due to substitution of pow(x,some-integer) with MathLib::fastpow(x,some-integer) and pow(x,0.5) with sqrt(x) commit 121c686726f3bb10b31b4131d8acb324190445c7 Merge: 79a149f 4d1133d Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Sep 20 18:20:25 2011 +0200 resolved conflicts commit 79a149fcff439b1a62e8e8234751f5a62a3b4cd7 Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Sep 20 18:15:48 2011 +0200 removed bug from gmsh-interface where meshing of stations within polygons located in other polygons would not work correctly. added creation auf quad tree and generation of steiner points to gmsh-interface, resulting in much more suitable meshes. commit 4d1133dcb332c3673a303b2b4aef16beb71aaa5a Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Sep 20 16:52:35 2011 +0200 - moved functionality from GMSH2MSH into GMSHInterface - changed signature of function FEMRead in order to make WW multi mesh read avaiable commit f420e25b01ade7f76062b24f7543069b631e878a Merge: 9513a38 0c64023 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Sep 20 12:11:51 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit 9513a383f4d5a0a8479603878f3171b9308ec34c Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Sep 20 12:10:09 2011 +0200 - substituted pow(x,some_integer) by MathLib::fastpow(x, some_integer) in FEM/rf_REACT_GEM.cpp - removed some useless warning message commit 0c64023842963ae6a91dcf0c0f6326ecfeb08f1c Merge: 02f1e34 567b603 Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Sep 20 11:11:43 2011 +0200 resolved conflict commit 02f1e3471d8843c48ad8999dd2cae7f19a1f4a46 Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Sep 20 11:09:04 2011 +0200 included tranlation option into GUI; removed multi-mesh from FEM Read and re-inserted adding the mesh into global mesh vector into files0.cpp commit 567b6038d544494b4e1540fc78155964f1ab3b0a Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Sep 20 07:30:01 2011 +0200 - substituted pow(x,0.5) by sqrt(x) and pow(x,some_integer) by MathLib::fastpow(x, some_integer) in FEM/rf_msp_new.cpp and FEM/rf_pcs.cpp - changed warning message in FileIO/OGSIOVer4.cpp commit d9de158fa2ade5a4718814e4eecebd8e9cc03c0f Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon Sep 19 13:22:23 2011 +0200 - substituted pow(x,0.5) by sqrt(x) and pow(x,some_integer) by MathLib::fastpow(x, some_integer) in FEM/rf_mmp_new.cpp - fixed a small bug in VtkCompositeSelectionFilter.cpp commit 0c60857040744e68a1427d823f8df2d046e8c933 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon Sep 19 12:12:38 2011 +0200 substituted pow(x,0.5) by sqrt(x) and pow(x,some_integer) by MathLib::fastpow(x, some_integer) in the changed files commit b013faa485ae7f4f92a7fba108a3d6f2ae03676b Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Fri Sep 16 13:46:30 2011 +0200 - removed a bug from MathLib::fastpow - substituted pow(x,some-integer) by MathLib::fastpow(x,some-integer) and pow(x,0.5) by sqrt(x) commit 2f186b65840e8951793bcea8ba9eb161672af49c Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Fri Sep 16 11:00:36 2011 +0200 - substituted some pow(x,2) with x*x wich should be faster commit 7c4ce896317d801a23311bdf1623c9c7a38f47a3 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Fri Sep 16 10:27:51 2011 +0200 - removed method CNode::Coordinates() that made always a copy of the data - use instead CNode::getData() wich returns a constant double pointer -> that gives you a faster (read only) access to the data - in most cases you only need read only access - improved method that used previous CNode::Coordinates() [methods GetNodePoreVelocity, GetPhaseVolumeAtNode in class CKinReadt; method ReactDeactPlotFlagsToTec in class CKinReactData and method IncorporateBoundaryConditions in class CRFProcess] - made method CElem::GetGravityCenter const - users from outside are not able to make changes to the gravity center - the remaining changes are consequences of the previous changes commit 7441b688bb60592c283c6b328a867f775c23d806 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Sep 15 12:37:02 2011 +0200 - fixed a warning in rfmat_cp.cpp (unused variable) - fixed a bug concerning parsing the path of the data under MS windows commit 5ff58c7f9b05dee8df3d1b215c4463bebbe58867 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Sep 15 10:36:34 2011 +0200 fixed a bug in TetGenInterface detected by Ms compiler - I wonder why gcc does not detect it commit 174950cbfbe832d8443c4f71d5b1a6b8631cf36a Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Wed Sep 14 16:20:16 2011 +0200 added some comments to TetGenInterface.h commit 7ff97240617aa591fb7191491c0602b6b97e9b1a Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Wed Sep 14 15:53:44 2011 +0200 add tetgen mesh input class TetGenInterface - now we can read tetgen-node and tetgen-ele files commit 0015947371df17bdbe7fb0fce325ea9d790a110a Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Sep 13 14:59:19 2011 +0200 removed two warning from files0.cpp commit 55593206e9509a131867c2484520305754dc9b5e Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Sep 13 14:55:37 2011 +0200 - removed two warnings concerning return value in class Quadtree - the distance vector in class MeshNodesAlongPolyline now contains also the distances to the higer order nodes commit b378a2c3b5544298355e5b8008e40aa1dfa08b9f Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon Sep 12 17:27:47 2011 +0200 fixed a bug in function readNonBlankLineFromInputStream commit 682bc1a0760dc65fa92b172e33133652becd5347 Merge: 77ede5e 0292a84 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon Sep 12 17:22:36 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit 77ede5e0a14bf494d0daf5ad4d705924a1e502b1 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon Sep 12 17:21:19 2011 +0200 mesh generation improvements class GEOLIB::Raster creates a Raster file from a surface description commit cbb652d66a7e17c0d4b92186c04974088d2a63a1 Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Sep 9 11:52:55 2011 +0200 Refactored the OpenSG conversion. Replace vtkOsgActor by vtkOsgConverter from https://github.com/bilke/pv_opensg_plugin. Removed many OpenSG-related #ifdefs. Removed OsgWidget because it was not used anymore. commit fd82fb778a180354d5baea0e41f1e57de22e91b0 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Sep 8 15:40:51 2011 +0200 Release build configurations in scripts. commit 148b6985f119dcc258ac4126168d3acef7c3185d Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Sep 8 15:38:15 2011 +0200 Reset build configurations. commit 018d9b28c957831720b5ce8d64d7d0ca0761eda9 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Sep 8 15:36:27 2011 +0200 Set default build type to Debug. commit 5536a5d6812c7419df625d4c284122c96fa7771b Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Sep 8 15:11:10 2011 +0200 Removed unnecessary #include "Configure.h". commit c4e293696701b14356219db354ecd6170c2da68f Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Sep 8 14:09:10 2011 +0200 Delete CMake module because it exists already in CMake. commit 7f83656e23dc7d3518438f0d77b0ec4e197edcdd Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Sep 8 14:07:12 2011 +0200 Moved some CMake modules to cmake/. commit 1078abdde93422e3e75b0afcfc34237d631c27bb Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Sep 8 14:05:48 2011 +0200 Moved some CMake modules to cmake/. commit ff8f4b97ae874ad0b89e86798b5d0ef50bf966b0 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Sep 8 13:10:18 2011 +0200 Removed many entries in Base/Configure.h.in. Replaced those entries with corresponding ADD_DEFINITIONS() calls. This will significantly reduce rebuilding when changing the configuration. commit bfc8be191b709405046fbc23531c975583bb06fd Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Sep 8 11:52:05 2011 +0200 Removed some CMake find scripts because they are in the new cmake-modules or are part of CMake itself (FindVTK.cmake). commit 0f06908f6d06b0b4c88db291b998b4523ffc0f69 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Sep 8 11:23:12 2011 +0200 Getting rid of downloading FindGit.cmake because it is now part of CMake. commit 1f7e5971b8e515be78b5a4164d7d4313ae1dc0c9 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Sep 8 11:17:30 2011 +0200 Getting rid of unnecessary Visual Studio Solution extension. commit 6e00e67a52902b0163cb5dcadf90a0f557206111 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Sep 8 10:11:21 2011 +0200 Getting rid of unnecessary Visual Studio Solution extension. Note: When merging this into the trunk also modify the build scripts. commit 11aa61480026ea0b1c76c64d99206fe664512393 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Sep 8 10:05:24 2011 +0200 Simplifying ADD_DEFINITIONS CMake calls. commit 243b92c79dbc8ad02af836198922ea635e365076 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Sep 8 09:43:48 2011 +0200 Using option_requires for dependent CMake options. commit 9764011e35c9c1e783dd088dbbfbba0194604db3 Merge: 71eb281 b9c779c Author: git@dev2 <lars.bilke@ufz.de> Date: Wed Sep 7 19:07:52 2011 +0200 Merge branch 'master' of /home/git/ogs_sources_svn Conflicts: CMakeLists.txt FEM/files0.cpp FEM/files0.h FEM/rf_react.cpp FileIO/readNonBlankLineFromInputStream.cpp commit 48f854159fc985c86098635fd527e4c7227a846d Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Sep 7 18:37:46 2011 +0200 Updated README for pushing. commit 4b3d3072a1423433f5b35596a5e7791d97c676d8 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Sep 7 18:34:33 2011 +0200 Added missing cmake module. commit cd3e82475e5d36b16b2c77d10f9829574fabc989 Merge: 0292a84 7a1df8f Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Sep 7 18:29:09 2011 +0200 Merge commit '7a1df8f6347b769b04c27555a040d1a08edb7d13' as 'cmake' commit 7a1df8f6347b769b04c27555a040d1a08edb7d13 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Sep 7 18:29:09 2011 +0200 Squashed 'cmake/' content from commit 6773a13f git-subtree-dir: cmake git-subtree-split: 6773a13f commit 0292a842bdfdbcdf8deb395c798f6a0534f70528 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Sep 7 18:22:16 2011 +0200 Fixing bad merge. commit 71eb28125a952a31e1f20dc3e3ba2a0f8a1f0171 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Sep 1 16:22:00 2011 +0200 removed some dummy functions from files0.[h,cpp] and applied some changes to function signature fixed a bug in readNonBlankLineFromInputStream commit 5f4c62a537e07c253046ae8f27900ab22f1c2b3e Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Sep 1 14:51:39 2011 +0200 fixed some file reading bug commented some test functions out commit 9b676dfa569b258f0b8eb90185e9df987ff616ca Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Sep 1 13:49:28 2011 +0200 fixing a bug while fixing a bug ... commit dc882128f07aded07c507bf20a21a9801a6cbb4b Merge: 10e64f3 fa9fa3c Author: git@dev2 <lars.bilke@ufz.de> Date: Thu Sep 1 13:39:00 2011 +0200 Merge branch 'master' into ff commit fa9fa3c051323824e69af3843ee4901f9450e1c8 Merge: 3a4e1ad 4c1d45a Author: git@dev2 <lars.bilke@ufz.de> Date: Thu Sep 1 13:38:50 2011 +0200 Merge branch 'master' of /home/git/ogs_sources_svn commit 10e64f3591fd65d4f123e5730698a1f50bdfb806 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Sep 1 13:36:21 2011 +0200 fixed a bug while fixing a bug commit 4047912cffab5f52f4125d0ab425f3a719068747 Merge: 3c6c639 4e32d30 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Sep 1 13:19:36 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit 3c6c63969f680b1d65951650c6a924c5190c465c Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Sep 1 13:19:20 2011 +0200 fixed some warnings commit 4e32d302b2b691340b090aea3b0edb97e38f5f37 Merge: 2e4df70 3a4e1ad Author: git@dev2 <lars.bilke@ufz.de> Date: Thu Sep 1 13:11:51 2011 +0200 Merge branch 'master' into ff commit 3a4e1ad9ceea86f3b2a293f70df5d0b025ebfd11 Merge: 7e6c4f1 38cd244 Author: git@dev2 <lars.bilke@ufz.de> Date: Thu Sep 1 13:11:31 2011 +0200 Merge branch 'master' of /home/git/ogs_sources_svn commit 2e4df70b172f3a92904fdc1a57b7f4ad9648f790 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Sep 1 11:48:06 2011 +0200 solved conflict commit 5c8cd0bc0712a0ebfcc3719132892c318f614d01 Merge: 62b059f 49d5e57 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Sep 1 11:44:51 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit 62b059fccdf056fba828139bc3c4957575f0155b Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Sep 1 11:44:08 2011 +0200 removed a global variable from OGSIOVer4.cpp that was not introduced by me commit f9b15d8466cd321f1e3e8d6985f17f8d8e8c5814 Merge: 9ed9c95 7367f72 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Sep 1 11:26:52 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit 9ed9c956860a20873c86fdc21a054afe1b6bc5b6 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Sep 1 11:24:31 2011 +0200 split files DistributionInfo.[h,cpp] into files DistributionInfo.[h,cpp] and LinearFunctionData.[h,cpp] - do not implement more than one class per file! fixed a warning in FileIO/GeoIO/Gmsh2GeoIO.cpp commit 7e6c4f1cc316569a39e39fb5d60c3e43c2a2a6b1 Merge: aeabcf6 56d89e6 Author: git@dev2 <lars.bilke@ufz.de> Date: Thu Sep 1 10:51:36 2011 +0200 Merge branch 'master' of /home/git/ogs_sources_svn commit 49d5e57d7dc0f93dd25da7b5b3fde247d04c54f7 Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Sep 1 10:40:48 2011 +0200 fixed a final warning commit 7367f7238166622b7e9fd6db6a45a7a26a7b18ab Merge: 27a0b09 3fabec6 Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Sep 1 10:23:28 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit 27a0b09665c373b3506e4f2647c7e7bfb5c2af44 Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Sep 1 10:23:20 2011 +0200 fixed some warnings commit 3fabec69defe5157db95568b5a0d942a529fd671 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Sep 1 09:58:32 2011 +0200 Fixed merge mistake. commit 4c37b1c7c2fb0782083991ca84a5e34891ccfa28 Merge: a460d36 7e6c4f1 Author: git@dev2 <lars.bilke@ufz.de> Date: Thu Sep 1 10:53:45 2011 +0200 Merge branch 'master' into ff Conflicts: FEM/rf_bc_new.cpp commit 1cf2ee23e178ebc0d0afcf28af9aa52c3cc17d83 Merge: 08ff693 aeabcf6 Author: git@dev2 <lars.bilke@ufz.de> Date: Thu Sep 1 09:55:41 2011 +0200 Merge branch 'master' into ff Conflicts: FEM/Eclipse.cpp FEM/FEMEnums.h FEM/fem_ele_std.cpp FEM/matrix_class.cpp FEM/matrix_class.h FEM/pcs_dm.cpp FEM/problem.cpp FEM/rf_bc_new.cpp FEM/rf_bc_new.h FEM/rf_ic_new.h FEM/rf_pcs.cpp FEM/rf_react.cpp FEM/rf_st_new.cpp FileIO/FEMIO/GeoIO.cpp MSH/msh_elem.cpp MSH/msh_mesh.cpp MSH/msh_mesh.h MSH/msh_node.h OGS/rf.cpp Qt/DataView/MshTabWidget.cpp Qt/Gui/mainwindow.cpp commit a460d3652bdbe18fb39fead158eff98c225b5b8c Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Sep 1 09:17:54 2011 +0200 Fixed merge conflict. commit 4acadccb5297b334363b694ae9d1c9eaa1e71b81 Merge: 2cf53df 1cf2ee2 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Sep 1 09:16:14 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff * 'ff' of 141.65.6.106:ogs_sources: (65 commits) fixed linker problem fixed warnings in mshlayermapper * OGSMeshIO::loadMeshFromFile() - changed parameter from call by value to call by (const) reference - changed parameter name according to style guide fixed error concerning vtk texture filter Fixed some typos. added error message Reverting Wenqings changes from rev 9121. To configure with mpi run cmake like this: cmake -DOGS_FEM_MPI=ON -DCMAKE_C_COMPILER=/opt/openmpi-1.4.1/bin/mpicc -DCMAKE_CXX_COMPILER=/opt/openmpi-1.4.1/bin/mpic++ .. Another patch to 5.2 with a linear function input for IC, BC and ST Merge branch 'trunk' fixed a compilation error in Linux GUI. I cannot understand why it makes an error.. Giving size_t type argument an initial value causes problem. fixed compilation errors Merge branch 'trunk' fixed compilation error in MSVC2010 fixed a bug for a case that Qt is not used moved the FEFLOW interface in the old GUI to the new GUI. and some improvement such as importing geometry. Fixing lis config. Doing linking right (hopefully). Simplifying. Fix typo. ... commit 2cf53df440062619e6c9cae171bb7d233926ce32 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Sep 1 09:16:10 2011 +0200 should work on dev2 commit 08ff69384f6db44268d66573902a42d08a357b67 Merge: 9419d73 4cc5ea0 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Wed Aug 31 15:18:44 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit 9419d73f58e561a7f4269ae5049931c064103294 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Wed Aug 31 15:18:25 2011 +0200 fixed linker problem commit 4cc5ea02786b9aa2e9724e9d1de3f840401322e3 Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Aug 31 11:52:23 2011 +0200 fixed warnings in mshlayermapper commit c14e15c0b8c75cd1e3df1bc8b21440ef412d2d07 Merge: 840879c 5e907ef Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Wed Aug 31 10:31:09 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit 840879cd450532da4a722a06ba5e8235de5ac241 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Wed Aug 31 10:29:43 2011 +0200 * OGSMeshIO::loadMeshFromFile() - changed parameter from call by value to call by (const) reference - changed parameter name according to style guide FileIO/OGSIOVer4.cpp * writeGLIFileV4() - fixed bug writing surface GEO/GEOObjects.cpp * GEOObjects::mergeGeometries() - added functionalities for merging surfaces MSHGEOTOOLS/ExtractMeshNodes.cpp * ExtractMeshNodes::getTopMeshNodesAlongPolylineAsPoints() - removed some debug output commit 07f53beffdca9ce909f6fd54cea2621e39b776de Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Aug 31 09:52:17 2011 +0200 fixed error concerning vtk texture filter commit aeabcf6a337b7729467e373a6ff74feecbababee Merge: 86a39b9 cce436e Author: git@dev2 <lars.bilke@ufz.de> Date: Tue Aug 30 18:07:53 2011 +0200 Merged from svn commit 5e907ef3aa1be0b4bbc458302a90b4a71989d932 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Aug 30 16:53:08 2011 +0200 Fixed a crash which happened when a filter removed point and/or cell data. commit 64baacd6d750db69245cd6b029ac874113255d51 Merge: a0a0317 0a95df1 Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Aug 30 11:30:17 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit a0a03179ebacd721dddd3771bfa3731c39cb460f Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Aug 30 11:29:53 2011 +0200 split up femcondition and derived classes commit 0a95df1ea19365db27e4de71885ff262f11b4850 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Aug 29 16:04:03 2011 +0200 Disable process_benchmark_job.rb on non-svn checkouts. commit f9ce297036f704e08478b4d301a1889092cec10d Merge: 41011cc 9cd55b1 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Aug 24 14:08:48 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff * 'ff' of 141.65.6.106:ogs_sources: fixed all ff-related warnings modified visualisation of direct source terms; split up gridadapter and vtk-mesh-converter commit 41011cc9f964210cd4f2c0ea1d99785d7cb4014d Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Aug 24 14:08:41 2011 +0200 Maybe fixing packaging? commit 9cd55b1e3bd1262b436d1ffc4718bc7608265892 Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Aug 24 08:37:14 2011 +0200 fixed all ff-related warnings commit 93fb7ccf177ba4494ed24134413dad7f91ae7e48 Merge: 06bc322 86bd0f4 Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Aug 23 17:48:49 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit 06bc3226958100a9df63be0d3d33ac187491df78 Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Aug 23 17:48:19 2011 +0200 modified visualisation of direct source terms; split up gridadapter and vtk-mesh-converter commit 86bd0f48cd8faa105c3f5f4284bb8f726ab450d0 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Aug 23 10:49:50 2011 +0200 ProcessorCount warning when not detectable. commit 4b931b7ec2f53509b3cf7911bfb01d058263f66b Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Aug 23 10:42:31 2011 +0200 ProcessorCount script from CMake 2.8.5 added. commit 4f3529d1ef8946efbdca0b33fae000985cc437d9 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Aug 23 09:38:15 2011 +0200 Deselecting a cell in 3d view when selecting (picking) outside of that object. commit 745259666430af3a8b0c4350eb363572af9d2a8f Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Aug 22 17:48:55 2011 +0200 vtk contour filter is more or less working now commit fb4623acb526082d450e39670a741080f04a3275 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Aug 22 15:39:05 2011 +0200 fixed linux casting problem commit 6ff9ff5fed7f913ae8975e7ed8e8231788d1a5ff Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Aug 19 16:37:04 2011 +0200 fixed linux casting error commit 166571148ebc6ff651eb8b8f26c17028708d3623 Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Aug 19 16:15:44 2011 +0200 fixed small error commit b575ca1721b0b90a62a1af6c47bd38cce82ce60e Merge: 80efe5d 0f81578 Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Aug 19 16:06:28 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit 80efe5d4ed8a17ec244b20182809f3d89350967b Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Aug 19 16:06:03 2011 +0200 added support for DIRECT source terms commit 0f81578f89c9651590f8ba723af883f7382be65f Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Aug 16 12:53:58 2011 +0200 small fix concerning the remove of source terms and initial conditions commit d9cd16f60822f8ba09f5fec6c13d209b543f8599 Merge: fe18dfb 7e376ff Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Fri Aug 12 10:34:52 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit fe18dfb6eb5903fce580d377271ed7ca48817143 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Fri Aug 12 10:34:32 2011 +0200 fixed an include issue commit 7e376ffe0732642dac09a4d01378397755989d10 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Aug 8 16:59:33 2011 +0200 stations can now be integrated into geometry when exported into gmsh-geo-files commit 4a941431a94fcd4a412fbf2dbf06cbada2edf567 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon Aug 8 12:30:25 2011 +0200 implemented merge functionality into class GEOObjects commit dffd81be4c0c564ec9499e2006e599d261636b98 Merge: c345601 4a94143 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Aug 8 11:48:36 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit c3456017953dd096caa0c5e40a8ab98f4ca4d4d8 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Aug 8 11:48:20 2011 +0200 added contour filter commit 37551b1a3afd7358d3d93cf4f2ff485ce40d6162 Merge: cc11ad2 ad4322a Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Aug 2 13:59:49 2011 +0200 resolved conflict commit cc11ad226322c1a1148649a9bbc80fd5fad641af Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Aug 2 13:53:00 2011 +0200 flipped image on loadImage() commit eb7f5423949189b79ea86e74c1e731310a57384f Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon Aug 1 11:46:02 2011 +0200 changes in test function - should not have consequences to the GUI commit ad4322a279611a6ca4d750aa3b7762241c7547d5 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Jul 7 16:56:46 2011 +0200 Enable mirroring when loading raster files as poydata. commit 219ced6b374c7e93de5a4b2f9ca2931fb8c24226 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Jul 7 14:16:47 2011 +0200 OpenSG build scripts commit 00365b940c30884be1f2ee23d801dbe28e13efe1 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Jul 7 13:50:04 2011 +0200 OpenSG build scripts commit 7457e7b3dd5f17c98917f051ed3268604af43a8f Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Jul 1 15:26:25 2011 +0200 material ids are now displayed in element view commit 231e1d61701a1434b12b9cecade89eb5e7eee832 Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Jun 30 16:32:58 2011 +0200 fixed error concerning normals in surface triangulation, fixed error concerning correct initialisation of station/borehole objects, geometry save routine to gmsh-geo-files is changed, allows now for holes in polygons, maybe there are some other minor changes... commit c237f2cc2ea829f3e87091fe9b769767019d73e0 Merge: 0a31a3f 28f7fa1 Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Jun 28 11:30:18 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit 28f7fa133d723337486c44f4379a57697d7bc33e Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Jun 28 12:20:38 2011 +0200 fixed bug in QuadTree::addPoint() commit 0a31a3f14b32745a317db7155d0345eb0a768618 Merge: b50bab8 f1f882f Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Jun 28 10:32:07 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit b50bab84f6ea98ec1eece8c380629cf029a74cfc Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Jun 28 10:31:49 2011 +0200 fixed issue with reading and writing borehole-dates in xml files commit f1f882f2e78471a574aa60a3cbba29d7c8ebe0da Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Jun 28 10:24:48 2011 +0200 forget to return the result from fastpow - fixed commit 2f8cc02be807d74456f48ffb855083ef153a2ee9 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Jun 28 09:49:19 2011 +0200 implemented a fastpow function and used it in QuadTree::addPoint commit 0cc056e199b60b6a355f619e2fc7b97d0178511c Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Jun 28 09:18:13 2011 +0200 Quadtree::addPoint: add test if quadtree contains the given point already commit 66e160b664d1666a8dc56e88a1cb27e7260c20b7 Merge: 7c11a3b 2175706 Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Jun 24 14:22:21 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit 7c11a3bddcb0f467af9615311dc38dfebb7cfbae Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Jun 24 14:21:30 2011 +0200 fixed a few warnings commit 21757060626b15b181f21d8003f3ede3805d934b Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Jun 24 12:59:26 2011 +0200 Jetzt aber. commit fcc5430c8f2a8bd2591f01b421092538520e1220 Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Jun 24 12:48:18 2011 +0200 Ich weiss gar nicht was du hast, Karsten. Geht doch alles. commit e180355442531b4cccc91496f2bd7bddb26e69c1 Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Jun 24 11:29:58 2011 +0200 small change in cmakelists commit 1c76b6c3b2f3dd863573974c90dc65af686c2410 Merge: 96ebcae ed7102d Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Jun 24 11:03:34 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit 96ebcaef08b3d368b62fa16d94eba997818fd533 Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Jun 24 11:03:08 2011 +0200 moved diagram prefs to solve linux compile problem commit ed7102d04f8e6ecffcc869b0502caae86d8816bc Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Jun 23 16:58:22 2011 +0200 Added uic generated header file caused build time dependency commit e591f7c86b39fed7386b2cc3b65d39c76010b324 Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Jun 23 16:28:03 2011 +0200 fixed error in cmakelists commit 1091fb970dfcf8ed560e01ca7d7c53d03f69c473 Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Jun 23 16:15:01 2011 +0200 adjusted copy constructor for mesh class to be a correct copy-constructor in the c++ sense; fixed various memory issues with diagram view; added option that allows to add data to diagram view commit 32ae88d25fa2bc7887b2fca1c33169e1d62d4afd Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Jun 22 17:13:11 2011 +0200 fixed errors in node removal during layer meshing, removed computation of minimum edge length in ConstructGrid commit 4dc35a676d273ae2dbad127e129bdf302a4487b1 Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Jun 21 17:03:55 2011 +0200 added some documentation commit b0dc3a16148b7a7b5890152979abd60bffb915db Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Jun 21 16:46:23 2011 +0200 fixed some warnings commit 600b51b11d7a2035b2c78d37f907ddffcac48875 Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Jun 21 16:42:00 2011 +0200 diagram view now allows selection which curves should be visualised, diagram view can be called from tools-menu commit 6d961a181b3e115fa1e787cf90f2c91c00a54799 Merge: 1a0b737 8d264ae Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Jun 21 13:59:47 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit 1a0b737fc100ba9eda739c508d5ea9f03fb6be7e Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Jun 21 12:47:46 2011 +0200 adapted diagram view so files generated by logger db can be read (at least in principle) commit 8d264aebc72d2188a0ce82b4a18db491bc40cb07 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Jun 21 08:48:15 2011 +0200 fixed an include issue under windows commit f71919eb614a11dd39826a6ae3793d036b424bb7 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon Jun 20 17:24:56 2011 +0200 fixed include issue commit 56169e54e3256caf45541af50dd6b1996cd156ba Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon Jun 20 15:53:27 2011 +0200 fixed an include error commit 086277ce6f45683b61e6da9d55d73e38563da64c Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon Jun 20 16:32:15 2011 +0200 fixed error in class Polyline commit ddd08d30011bc19d5e2e310cea259a601f82db74 Merge: 9987cc6 1a61e95 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon Jun 20 16:22:11 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff Conflicts: FileIO/SHPInterface.cpp GEO/PointVec.cpp commit 9987cc6a39c270f29ef0f664d0b396ee795cebd5 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon Jun 20 14:53:58 2011 +0200 - CBoundaryConditionsGroup::Set substituted GetNODOnSFC - SHPInterface: improved reading polylines - AxisAlignedBoundingBox: added parameter epsilon to method containsPoint - PointVec: corrected bug in id mapping - Polygon: using other constructor in method splitPolygonAtIntersection() - Surface and Triangle: changed attributes according to the style guide - CEdge: changed method name Length() -> getLength() - CFEMesh: added method computeMinEdgeLength() commit 1a61e95be235ec3adfded42cd3350bebf5f9e1d2 Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Jun 17 16:51:39 2011 +0200 Jenkins documentation builds with diagrams. commit 33c1198f56237b687dc06331e3e6f5f36a4052a9 Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Jun 17 16:10:21 2011 +0200 Fixed doxygen output path commit a510996fa97629241832f6b4f4c3095e676d1495 Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Jun 17 15:48:43 2011 +0200 Undo last commit. Fix potential latex-doxygen error commit 71a564dc8520d14bc74448ea9c243abd868bd204 Merge: a348fe6 17f3b35 Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Jun 17 15:22:13 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff * 'ff' of 141.65.6.106:ogs_sources: fixed small error added missing files option added where in mesh layer mapping nodes located at NoData values will be removed from the mesh thresholding works for all scalar arrays now, order of nodes for meshsource has been changes in order to avoid inverted normals commit a348fe635ddcd81f64eb17780d2379b770722b47 Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Jun 17 15:20:35 2011 +0200 Enable doc generation on build_gui.sh commit 038f602ee998a98c085103396a4ce3134b1eb5bd Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Jun 17 15:15:27 2011 +0200 New CMake option: DOCS_GENERATE_COLLABORATION_GRAPHS "Generate collaboration graphs.". commit 9263a2cd6015de1229e89424b03dace108f3884a Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Jun 17 14:51:50 2011 +0200 Documentation is now a build target (doc). Moved doxygen configuration file and made it CMake-configurable. Two new CMake options are introduced: - DOCS_GENERATE_DIAGRAMS "Use the DOT tool to generate class diagrams." - DOCS_GENERATE_CALL_GRAPHS "Generate call dependency graphs." To generate the documentation build the doc target. commit a795981dd65d4f24005f287198427f58725f171f Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Jun 17 12:51:52 2011 +0200 Doxygen mainpage. Brief set to first sentence. commit fafb21a0a64d70ae6ee0e5949c25dec398f620d8 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Jun 16 14:59:20 2011 +0200 Fixed some doxygen warnings commit 86f6b9131791f2ae542b1b68c1da4b6ee117d117 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Jun 16 13:52:03 2011 +0200 Documentation enhancements commit 17f3b3521648d590b9f4b74076e2422a08a3b0a2 Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Jun 16 11:06:35 2011 +0200 fixed small error commit 4b31077126100c63a9725bd2537a88271ce15ceb Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Jun 16 11:00:54 2011 +0200 added missing files commit ae75130d1b1418facb8d88e5653a50c6e7a79fd0 Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Jun 16 10:46:39 2011 +0200 option added where in mesh layer mapping nodes located at NoData values will be removed from the mesh commit 8e82fc6b6a61ef4c659fced47076151d581e617a Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Jun 14 17:48:46 2011 +0200 thresholding works for all scalar arrays now, order of nodes for meshsource has been changes in order to avoid inverted normals commit 39d967ab78013f9f0416710024a2b7caabae0de0 Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Jun 8 16:25:40 2011 +0200 cleaned up changes commit 9c15764e83f51ff5a540e0ec77ea5cb14f0e8f72 Merge: 3138103 eb3ac91 Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Jun 8 16:21:17 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit 313810340eb591c784bba79be5469c3bfdedc834 Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Jun 8 16:20:58 2011 +0200 fixed bug in index mapping of duplicate points, changed import of polylines in shp-interface so it is way faster now, fixed bug in gms-interface where ogs would crash when no valid object was found in file. commit 86a39b9daa2b9c9368c90301a7d9299c92a5de3e Merge: 4316df3 7081f35 Author: git@dev2 <lars.bilke@ufz.de> Date: Mon Jun 6 11:44:37 2011 +0200 Merge branch 'master' of /home/git/ogs_sources_svn commit eb3ac918bc1f2936492ed6cccafaa2edf82effd1 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Jun 6 11:10:08 2011 +0200 Fixed new warnings from svn trunk commit 670990ac990a4a1cc883f41d5ddc9fdf733ac782 Merge: 91b3d7c 8109eff Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Jun 6 10:45:39 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff * 'ff' of 141.65.6.106:ogs_sources: switch on the counting switch off the counting for now fixed compilation erros with gcc added Gauss point averaging method in extrapolation methods to support pyramid elements. supprot shape functions and integration rules of Pyramid elements in FEM assembler added shape functions and integration rules for Pyramid elements into mathlib added Pyramid elements to the mesh library and IO functions. renamed member variables of vec class for debugging purpose with MSVC2005. Some debug features are not available if variales and functions have the same name. never integer fixed a bug setting a linear solver type for FLUID_MOMENTUM. modified log messages about PARDISO don't create a file if no KinReaction data are loaded update version info for better visualization of RWPT fix fix Global PTC_FLOW and MASS_TRANSPORT COUPLING: a kind of new non-isothermal compositional gas flow which is far accurate that previous one Enabled FEM_LIS compilation on windows. Fix commit 8109eff71d9348d54ffaf39f38b4c5431449ff53 Merge: d07abc8 86a39b9 Author: git@dev2 <lars.bilke@ufz.de> Date: Mon Jun 6 11:45:08 2011 +0200 Merge branch 'master' into ff commit 91b3d7c2078db825fe5c88f6a5c09195e5846601 Merge: 1c1fa5c d07abc8 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Jun 6 09:11:14 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff * 'ff' of 141.65.6.106:ogs_sources: Fixed layer mapping bug commit d07abc8dd6b510d0598050ba021aa064e8e3ed5e Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Jun 1 11:23:10 2011 +0200 Fixed layer mapping bug commit 1c1fa5c820f2390480db67697a8b9f282f44548c Merge: eafa677 87036b6 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon May 30 12:50:34 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff * 'ff' of 141.65.6.106:ogs_sources: fixed config error removed another bunch of using directives next batch of config errors added missing changes fixed some missed vars for various configurations removed using-directive from various header files commit 87036b629a4e57bd104e65e0169d1e60cb12a95e Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri May 27 12:57:19 2011 +0200 fixed config error commit 39b25c42c3850f023405c469bfb041bf428391f3 Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri May 27 12:51:43 2011 +0200 removed another bunch of using directives commit d33eb43832fa2d2e8e914707dcb9675b71a47131 Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri May 27 12:07:23 2011 +0200 next batch of config errors commit 6ea63a7fe8c899c2c404af4cc42eb2fc80d55389 Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri May 27 11:59:51 2011 +0200 added missing changes commit a02e22c8fa76ed74a69abba01e35ce0b8f0c5851 Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri May 27 11:52:00 2011 +0200 fixed some missed vars for various configurations commit cc6ec34482fcfbd71168d09f3b1ecbb2cbc020ba Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri May 27 11:42:33 2011 +0200 removed using-directive from various header files commit eafa6777f6ca7aec1236b8bc8ae111462ecc8816 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu May 26 14:05:39 2011 +0200 Added .gitattributes: enabled style hook for source files. commit cc234c0662b9ffb230769e29d7ecfe1ccec33d41 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed May 25 15:59:17 2011 +0200 Fixed warning. commit eb9245fc9a9973dd49bc834e42678d72d816f454 Merge: b730586 1009d76 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed May 25 15:34:26 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff * 'ff' of 141.65.6.106:ogs_sources: - fixed memory leak in MathLib/AnalyticalGeometry.cpp - fixed memory leak in FileIO/OGSIOVer4.cpp - changes in triangulation of surfaces that are read by gli reading functions - changes in method Surfae::createSurface() - the given polygon is now split into simple polygons substituted class CPointData_DuMux with class PointDuMux PointDuMux is a well designed class that - is derived from GEOLIB::Point - has only private attributes - has const get methods for its attributes - has set methods for its attributes commit b7305864909f11deae8dac06a29b26f53a54e92a Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed May 25 15:34:17 2011 +0200 Added compiler warning -Woverloaded-virtual and fixed occuring warnings. commit 1009d76a68cb36e6afdbdaad2c2a2fbf11a89d85 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Wed May 25 12:47:24 2011 +0200 - fixed memory leak in MathLib/AnalyticalGeometry.cpp - fixed memory leak in FileIO/OGSIOVer4.cpp - changes in triangulation of surfaces that are read by gli reading functions - changes in method Surfae::createSurface() - the given polygon is now split into simple polygons commit 61cfe464e38badd7ca8f2eb90e96b75942c56cd8 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue May 24 10:17:22 2011 +0200 substituted class CPointData_DuMux with class PointDuMux PointDuMux is a well designed class that - is derived from GEOLIB::Point - has only private attributes - has const get methods for its attributes - has set methods for its attributes commit b02ef20709f3299907edbd90c2e6d6822963dd11 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon May 23 15:12:55 2011 +0200 file DUMUX.h / cpp - removed using namespace std; from DUMUX.h since this polutes the global name space - changes due to removing using name space std in DUMUX.cpp commit 83f684265ffb9d89b5c44f912dd45df81355f70d Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon May 23 13:54:41 2011 +0200 changed name of namespace Mesh_Group to MeshLib commit 6c84618b5300ffe6133c79d905dc47fb0db6bbab Merge: 9a2600a 2cf0294 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon May 23 13:25:39 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit 9a2600af60c15764f0164189d823368cd2f36221 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon May 23 13:25:17 2011 +0200 changed name of namespace MATHLIB to MathLib commit 2cf029490bc7673122fc590098bb1886511406e8 Merge: 9cc6a2c 968cb83 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon May 23 11:33:42 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit 9cc6a2c7aa8884369134f158c4e7ebceb4ecd236 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon May 23 11:33:22 2011 +0200 changed output file format for particle files in random_walk commit 968cb8388d3518c29b5452c24558f5c30a717b30 Merge: ea3fbf1 fbc9ecf Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon May 23 11:30:32 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit ea3fbf12d58989329a780f6492d95224760e7018 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon May 23 11:30:17 2011 +0200 class CECLIPSEData - commented out method double CalculateDistanceBetween2Points(double Point1[3], double Point2[3]) since we have already functions for computing distances between points (see function sqrDist ()) - changed access to the coordinates from a mesh node (used existing and documented method CNode::getData() instead of the new introduced method CNode::GetCoordinates()) class GEOObjects - changed signature of method appendPointVec() - changed implementation of method appendPointVec() class PointVec - changed signature of method push_back () that returns now a size_t - changed implementation of uniqueInsert class Polygon - added another constructor class CNode - removed method GetCoordinates() - use getData() instead class ExtractMeshNodes - added some documentation - changed signatur of getPolygonFromPolyline() - added some more methods class GEOModels - changes due to changes in class GEOObjects commit fbc9ecf1eb333d66407bb4639beac82787bf21cc Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu May 19 13:56:48 2011 +0200 removed some warnings commit 8acc9da6440faef08fc3b2e26af3f97290c33c52 Merge: dee8111 23ae1a1 Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu May 19 13:50:45 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit dee8111a081cbf9b617e863a69ad452bed004017 Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu May 19 13:50:21 2011 +0200 changes to msh-elem initialisation commit 4316df309fbd4c93017952e182fceb8641856403 Merge: 10ae0b0 47bc2bb Author: git@dev2 <lars.bilke@ufz.de> Date: Tue May 17 16:59:15 2011 +0200 Merged with svn commit 23ae1a12ea713353ef48e554883325939ac4930c Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue May 17 16:43:24 2011 +0200 Fixed typo. commit f0cf84ba212144bdeb092ffe9d7b31228f330bb6 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue May 17 16:26:58 2011 +0200 Fixed some merge mistakes commit f385e1a4f01f1994983178856f47a45b292b7f1d Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue May 17 16:12:58 2011 +0200 Fixed some merge mistakes commit 6492f86c2b7248e2bba9e3fbec4c4e6dd5a979e1 Merge: cc57158 4316df3 Author: git@dev2 <lars.bilke@ufz.de> Date: Tue May 17 17:03:04 2011 +0200 Merged with svn commit 0945059252553d7a5ea69c627bf36ed13cbc2abb Merge: b7a9a18 cc57158 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue May 17 07:28:28 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit b7a9a1877ee3fe23e02478a092c824a955dcf53d Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue May 17 07:26:51 2011 +0200 small change in ConvertGliToVTK commit cc57158fdd327ef56361bf638fb6c50315527fb2 Merge: f4d00e0 fe6d367 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon May 16 10:13:00 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit f4d00e022b215c199df77a7fa5acdfb9367eb6a5 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon May 16 10:12:29 2011 +0200 fixed a few bugs (element model, global super elevation, grid construction on vtkmesh conversion, etc.) commit fe6d36734d13d181e0bc0dd7aaf77c7768e93ac7 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon May 16 09:36:17 2011 +0200 included the header algorithm in ExtractMeshNodes commit b7152209d45a0c1f18fc859b2a798c42dc8027b1 Merge: 83643b4 f532b12 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon May 16 09:14:32 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit 83643b4008ed069d6e6fdfeee96ab53f93e41942 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon May 16 09:12:51 2011 +0200 - moved class ExtractMeshNodes from UTL/MSHGEOTOOLS to MSHGEOTOOLS - some very small changes in OGSMeshIO and Polyline commit f532b12d0117ecd8e80955be5450bbcb71c61b36 Merge: 7d057a2 7f0050d Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu May 12 14:38:45 2011 +0200 Merged with origin ff commit 7d057a21a29c1e92b8362943a2a20db0de24c875 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu May 12 14:36:02 2011 +0200 Fixed wrong return type. commit bb1a49ba9ed716419ff471492b0e1e5536fca28b Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu May 12 14:05:07 2011 +0200 Fixed errors and warnings when using the clang compiler on mac. commit 44b6184b8a985f24263a0372d08a709467e4d1ba Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu May 12 13:04:20 2011 +0200 Fixed errors and warnings when using the clang compiler on mac. commit 7f0050d2449b5dda66caa9ba5fa7bf53cff064db Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu May 12 09:50:15 2011 +0200 small changes to mesh lib commit 5142c60387e01912aa8bb5de7f05f96aaed6ccef Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed May 11 17:45:43 2011 +0200 reversed some changes from last commit commit 19ad0a62497862a458c09b2f2440c149732dd4b3 Merge: 101c86f d0a9007 Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed May 11 16:17:51 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit 101c86fa9ef9bdb4b5dafcb47449385bb0026b1b Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed May 11 16:17:34 2011 +0200 element information is displayed upon picking, mesh view has been cleaned up commit d0a9007e8fc27f6b885d83811cd51070b6ea3410 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed May 11 12:57:38 2011 +0200 Automatic image generation of profiling results with gprof2dot.py script. Added timeout on benchmarks (30 minutes or 1 day->exceeding). commit af497c8c02fb340416ac11bc15fb09079c872e6d Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri May 6 14:29:43 2011 +0200 Added converter from gli to vtk (atm only points). commit dfcb0e18222dd18a258af4ba6d056036064d650b Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon May 2 12:16:52 2011 +0200 cleaned up code commit 4666d2a8aa7efc705c9c650a138972a361e241e5 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon May 2 11:16:23 2011 +0200 removed -selected- keyword in msh_node and all uses commit a1fc60979878e260bfdad22ebc8250b8cf123a77 Merge: bb97a0f accbb62 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Fri Apr 29 09:43:12 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit bb97a0f3735740c1b4d754bcc8aa1e7defe04fcf Merge: eb6defb 8ff3839 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Fri Apr 29 08:57:02 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit eb6defb532d66dbe146ba0796e392c0996553a6d Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Fri Apr 29 08:55:47 2011 +0200 first step to exchange GetNODOnSFC using class GEOLIB::Surface commit accbb62a80cd7faa9b11ea6ca0920a9efe598e93 Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Apr 28 15:47:10 2011 +0200 Fixed a few warnings commit 8ff3839f48f5bb012238b218b148f559427d9675 Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Apr 28 12:12:07 2011 +0200 Cleaned up code for FEMCondition and derived classes commit 3cdb429aab53210b1d225c69bbfaa9658c07d365 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Wed Apr 20 15:34:05 2011 +0200 made OGSMeshIO::write() a static method removed CFEMesh::write method classes XMLInterface, MshTabWidget and function MSHWrite use now method FileIO::OGSMeshIO::write instead of method CFEMesh::write commit 145996b150c1ff970aaada3eac447d6e6cf4fb5f Merge: 5beccf4 10ae0b0 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Wed Apr 20 11:53:48 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit 5beccf452d2b4fceb5a418e82fe680edb0e07f11 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Wed Apr 20 11:52:53 2011 +0200 - rewrote the function for reading a non blank line from given input stream (GetLineFromFile1 -> readNonBlankLineFromInputStream) - substituted occurences of GetLineFromFile1 in read methods of CBoundaryCondition and CSourceTerm - wrote class ProcessIO that reads process info from files (used in read methods of CBoundaryCondition and CSourceTerm) - substituted part of read method of CBoundaryCondition (employing class GeoIO) commit 10ae0b0258c489abe6c65df0db9ec3b619326c70 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Apr 19 12:37:21 2011 +0200 Removed ogs de manual submodule commit 38fe3e16209f86d4b7a090a0c5406653bbb3895d Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Apr 19 12:07:03 2011 +0200 Bumped version number to 5.1.02 commit c5b5b9985e9491cf13a6ccd5a139e98d984d3055 Merge: b6cb31b ace3de9 Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Apr 19 11:18:05 2011 +0200 merge commit b6cb31b4f4f6a0a3fe03d0c9b21398f4fb6bb441 Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Apr 19 11:10:45 2011 +0200 changes to conditionsource commit 8bbbf52b70fcc81033eece5c7300f6823d0f7b1a Merge: 742a549 ace3de9 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Apr 19 10:00:15 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit ace3de9357961c90099320f05a7f9b62f6025442 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Apr 19 08:58:23 2011 +0200 fixed warnings commit 742a5493b4d869a56030fcde122e71ce51330043 Merge: e5de11a f9ec710 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Apr 19 08:31:47 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit f9ec71034abed725beac6ab1c7a354a836149b3a Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Apr 18 14:57:01 2011 +0200 Removed vtk prefix when exporting to vtk because the right file ending is already appended. commit ae43b4789e3ebe78485a3c075d962aa0044d4fe1 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Apr 18 12:14:46 2011 +0200 Fixed deadlock when clicking cancel on loading raster files commit 614c031c1c262b69b2a4ed414935222cda56c722 Merge: bc2c74e b655e07 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Apr 18 12:08:38 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff * 'ff' of 141.65.6.106:ogs_sources: fixed some warnings fixed some warnings fixed linux error scalar values for FEM conditions can now be displayed fixed some warnings Some refactoring Fixed find xyz arrays in LegacyVtkInterface Removed COutput dependency from LegacyVtkInterface Almost done with removing COutput dependency on LegacyVtkInterface. Only method COutput::GetPCS_ELE() needs to be replaced. Tidying up Compile fix for gems configuration Moved COutput class to its own file. Extracted legacy VTK output from COutput to FileIO/MeshIO/LegacyVtkInterface Legacy vtk output more conforming to the standard (http://www.vtk.org/VTK/img/file-formats.pdf). Output x,y,z point data as a vector. commit e5de11ad5f716758060c4f7b0ca16c27c58357bc Merge: 5676dd0 b655e07 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon Apr 18 07:38:32 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit b655e078b8aad4cd937289be46ac2a63154c58e1 Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Apr 15 17:09:07 2011 +0200 fixed some warnings commit 8001d89d424ff2afdc5491b47a1a2becd21559fd Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Apr 15 17:04:10 2011 +0200 fixed some warnings commit 7c32933fe2c20f907f10b7433ec504fc2b0efcb3 Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Apr 15 16:49:08 2011 +0200 fixed linux error commit 5ec12d45f1ed3385f296b5c4b819e1b71305113d Merge: fac61b1 1abb8dd Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Apr 15 16:34:32 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit fac61b105cdab525d478caacf8c2dcc2a4d1ef53 Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Apr 15 16:34:15 2011 +0200 scalar values for FEM conditions can now be displayed commit 5676dd0587b48f475d06f03775643a2ffbcc67bd Merge: b439dc8 1abb8dd Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Fri Apr 15 12:37:43 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit b439dc843e6bc8030f585e662a235f8eac9003b1 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Fri Apr 15 12:34:53 2011 +0200 added switch OGS_USE_QT to Configure.h.in rf_bc_new.cpp: exit only when simulation code is executed (i.e. if OGS_USE_QT is not set) commit 1abb8ddb93ea7aa8862e8eb7ef8fef9f101c2557 Merge: 82761b2 657e321 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Apr 14 17:19:09 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff * 'ff' of 141.65.6.106:ogs_sources: fixed some warnings commit 657e3214a42aab516c34608ac9ab3c36d6fc864a Merge: 5f582dc 0d6bc11 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Apr 14 16:39:18 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff Conflicts: Qt/DataView/ConditionModel.h commit 5f582dc98ffaa5e6f4388df6f9b1b985db27bf9c Merge: bb710a1 993ade6 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Apr 14 16:30:36 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff Conflicts: Qt/DataView/ConditionModel.cpp commit 82761b22312d6d1db3930fe30c435d19254b0b33 Merge: 0d6bc11 1961304 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Apr 14 16:23:35 2011 +0200 Merge branch 'refactor/vtk_output' into ff * refactor/vtk_output: Some refactoring Fixed find xyz arrays in LegacyVtkInterface Removed COutput dependency from LegacyVtkInterface Almost done with removing COutput dependency on LegacyVtkInterface. Only method COutput::GetPCS_ELE() needs to be replaced. Tidying up Compile fix for gems configuration Moved COutput class to its own file. Extracted legacy VTK output from COutput to FileIO/MeshIO/LegacyVtkInterface Legacy vtk output more conforming to the standard (http://www.vtk.org/VTK/img/file-formats.pdf). Output x,y,z point data as a vector. commit bc2c74e5bb5d933a62a16fff80984c2457393c8f Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Apr 14 14:53:00 2011 +0200 Global superelevation is preserved between application runs. Every new vtk source object automatically gets the factor set. commit f8e8f50f312a0c8e5b00afb4373c2aad9ac04306 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Apr 14 14:18:01 2011 +0200 Merged with origin ff commit 0d6bc11df14c018ef8db6cd27d82a1137f671fac Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Apr 14 12:52:32 2011 +0200 fixed linux error commit b125ac8a6f9341ad87ddffc01d065e399c7ae3b3 Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Apr 14 12:40:49 2011 +0200 meshes can now be read and written from/to project files commit e62101c0c52f2a9aec735683ca51b217faf19412 Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Apr 13 16:21:25 2011 +0200 fixed linux error commit 86755c1d08f3f72112730d33f28ba9f383a36131 Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Apr 13 15:58:06 2011 +0200 linear conditions can be handled + various minor changes commit da1cc01aee89112b95c7ab04d7a409a2fbd1dcd0 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Apr 11 15:25:33 2011 +0200 FEMConditions: constant and domain conditions work correct now for old and new files commit 561939cd6b891b11b4af0f4b2e1d6f5d8bcb4794 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Apr 11 11:31:33 2011 +0200 some changes to IC class, and compatibility for reading old condition-files commit 4a1e393a08758d46fed47aa3877f66f4dd0a3b47 Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Apr 8 14:40:02 2011 +0200 corrected gms mesh import method commit 78f095eced87a3c160b489676f6735171824757e Merge: 9b91473 5f9ce93 Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Apr 8 14:24:05 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit 9b914735e9e0d49c52f6126cb6d4ab873f30ea89 Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Apr 8 14:23:44 2011 +0200 documentation and tweaking of condition model commit 5f9ce93fee760cf5e8d077910a18a5f2cbc46e1f Author: git@dev2 <lars.bilke@ufz.de> Date: Fri Apr 8 13:48:52 2011 +0200 Fixed merge mistake commit 9d59323eae1bdf3b15c2574164f1571fb2cca6cd Merge: ad2e387 89b9630 Author: git@dev2 <lars.bilke@ufz.de> Date: Fri Apr 8 13:26:16 2011 +0200 Merge branch 'master' into ff commit 89b963096691084978b29d633f5d4a8aaa0a69c1 Merge: e2fde5d 1234010 Author: git@dev2 <lars.bilke@ufz.de> Date: Fri Apr 8 13:25:40 2011 +0200 Merge branch 'master' of /home/git/ogs_sources_svn commit 1234010836fab3ca72322a476d0a23b12821e94d Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Mar 17 13:07:59 2011 +0000 Version 5.1.01 by Bastian Graupner git-svn-id: https://svn.ufz.de/svn/ogs/trunk/sources@8073 3895a583-e809-0410-9bb6-aa9463026377 commit ad2e3879d86246e33681c8bb0aee2b191ee481f6 Merge: 383054f 02797d9 Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Apr 8 10:38:13 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit 383054f2a620f97b25db0c9559dfbedec18eddf0 Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Apr 8 10:37:55 2011 +0200 Added a second cmake run to the windows build scripts. This fixes a Hudson link error commit 02797d9f994e43406094285b57937c683b86a9d8 Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Apr 8 10:12:52 2011 +0200 fixed a few warnings commit fe72789245caf52c4a3362e11b2803ce97485065 Merge: fc3ec3c d07d28d Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Apr 8 09:51:24 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit fc3ec3c5c397d2acf0321e6d8343f614a61c6754 Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Apr 8 09:51:09 2011 +0200 fixed linux issue commit d07d28d219ea7f10247d137ab4573635213ba522 Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Apr 8 09:48:30 2011 +0200 Removed unneeded qualifier commit 081dc9480f71518cc4ebb4bd5026d3d965cdd7a9 Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Apr 8 09:33:56 2011 +0200 VtkVisPrefsDialog is now a member of the main window due to random crashes on linux and win when using deleteLater() or DeleteOnClose flag. commit bb710a1a3bc4634d4e4580f2a2ed63116bc7e906 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Fri Apr 8 08:03:47 2011 +0200 fixed some warnings commit 993ade6eedc21fa0d4ea56aa313f287a71c14124 Merge: c44182d 6a2bffa Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Apr 7 16:29:33 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff * 'ff' of 141.65.6.106:ogs_sources: added missing file FEM Conditions are now correctly displayed in data views and render window commit c44182d841e2da5f0d96e2c8d0480e43fbb9d330 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Apr 7 16:29:30 2011 +0200 A hopefully working delete on close commit 6a2bffa88028c785a6d63bda833295983cfa668e Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Apr 7 16:13:54 2011 +0200 added missing file commit 1600ed146edfcd06964fd5d81f709625a1e8bf32 Merge: f98dc3e b069ff6 Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Apr 7 15:34:23 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit f98dc3eeaa8e43a4ed2ea22df1e03abab56b4e96 Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Apr 7 15:34:04 2011 +0200 FEM Conditions are now correctly displayed in data views and render window commit b069ff6537af1b5ff5cdf3612a682991a5ee108c Merge: 9e0fe8d f45690b Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Apr 7 15:06:50 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff * 'ff' of 141.65.6.106:ogs_sources: removed serveral warnings (reported by cppcheck), reduced scope of variables, made some methods const-correct, removed unused variables in files - rf_kireact.cpp - rf_kinreact.h - msh_mesh.cpp - msh_mesh.h - mesh_edge.cpp (possible memory leak: velocity) - mesh_elem.cpp (possible memory leak: angle) commit 9e0fe8dd0250fbdb8a68e4cfffb8b5d0b1fa7c3f Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Apr 7 15:05:03 2011 +0200 Introduced an alternative mouse mode which is activated on holding the spacebar. When activated left clicks picks a cell on the actual selected vtk object and on right click it sets the cameras focal point (center of rotation) to tghe picked position. commit f45690bdc465f740024a0398ca01bc72ee5e6e2b Merge: 1997522 9795e5e Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Apr 7 12:58:42 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit 1997522f143520833d03b500e2316f3166ce9dfe Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Apr 7 12:58:25 2011 +0200 removed serveral warnings (reported by cppcheck), reduced scope of variables, made some methods const-correct, removed unused variables in files - rf_kireact.cpp - rf_kinreact.h - msh_mesh.cpp - msh_mesh.h - mesh_edge.cpp (possible memory leak: velocity) - mesh_elem.cpp (possible memory leak: angle) commit 9795e5e1ea67c954e24c5879a6fb6329b773235b Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Apr 7 10:52:33 2011 +0200 Close button VisPrefsDialog commit 1e01d66ea3099342ccb69e0766752299c2f40c11 Merge: 9783d9e 80a9b5e Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Apr 7 10:31:42 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff * 'ff' of 141.65.6.106:ogs_sources: substituted GetNODOnPLY() with a new version (using the class GEOLIB::Polyline instead of CGLPolyline) in method CSourceTermGroup::SetPLY() commit 1961304287e743533797cdce2361f74209ef49a1 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Apr 6 15:35:39 2011 +0200 Some refactoring commit d729af1b1334017bf19206d6fe33368b1e969a4c Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Apr 6 14:04:56 2011 +0200 Fixed find xyz arrays in LegacyVtkInterface commit 840202a68599b2da82f84d704af3f3bc22db787a Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Apr 6 10:14:51 2011 +0200 Removed COutput dependency from LegacyVtkInterface commit d51e1f297913fcd911a4a00825a73a5c51cfe3a2 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Apr 5 16:40:41 2011 +0200 Almost done with removing COutput dependency on LegacyVtkInterface. Only method COutput::GetPCS_ELE() needs to be replaced. commit 0585239702fd958512a5c378aff8a914e5beec8d Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Apr 5 15:30:56 2011 +0200 Tidying up commit ba3f9f5fb4c64c0897fcf41b68457b7348ff8576 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Apr 5 14:48:18 2011 +0200 Compile fix for gems configuration commit 80a9b5efeebbc1cac0ca475dc5ae749bd2ba616e Merge: fd05f0e c8d50a0 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Apr 5 13:05:38 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff Conflicts: Qt/DataView/CMakeLists.txt commit fd05f0e555d65a2315706196100406eec7e18e59 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Apr 5 13:01:21 2011 +0200 substituted GetNODOnPLY() with a new version (using the class GEOLIB::Polyline instead of CGLPolyline) in method CSourceTermGroup::SetPLY() commit 2218af95f94ab547e8041c18fb76ba27792373b4 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Apr 5 12:58:21 2011 +0200 Moved COutput class to its own file. Extracted legacy VTK output from COutput to FileIO/MeshIO/LegacyVtkInterface commit e3e263f633afbd780fe9e8d073f23289db34ab63 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Apr 4 15:43:42 2011 +0200 Legacy vtk output more conforming to the standard (http://www.vtk.org/VTK/img/file-formats.pdf). Output x,y,z point data as a vector. commit 9783d9ee168ad39e993159a288eb22b9c000aa0b Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Apr 4 15:40:41 2011 +0200 Force USE_NET_CDF when OGS_USE_QT is ON commit c8d50a06db26456b720f05b4d8e28dfd27b0c755 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Apr 4 11:55:24 2011 +0200 Some fixed for the shapelib cmake inclusion commit 64fe93b32eb7a0cf00cfeab4fab36363d703fb60 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Apr 4 09:12:04 2011 +0200 fixed syntax error commit fad5c477d9aba314b305ef28f1423d3375f0f9e4 Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Apr 1 16:19:08 2011 +0200 modified Conditionmodel to fit GeoTreeModel commit 47f5767c863156a29254bb103e24e47c0ce313bf Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Apr 1 12:40:36 2011 +0200 a little more cleanup commit 3ed384fd5c86d7e099c74545b49c3f28838d4176 Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Mar 31 15:56:03 2011 +0200 cleaned up msh read some more commit 62f2f25313a1a3e105d2bbd093dad87c4c5867d5 Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Mar 31 15:29:16 2011 +0200 fixing TDiff benchmark commit 100cf381682440386a4587070e5906dc54749732 Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Mar 31 14:58:24 2011 +0200 trying to fix neverending benchmarks... commit bef9521f19ad9e5fd3f74b27e88de5f5ed2b77cd Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Mar 31 14:08:57 2011 +0200 cleaned up code commit 3a75334643dd30645a2691c9e1e4600d5a1a4742 Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Mar 31 10:10:01 2011 +0200 fixed a few warnings commit e7d9affd690a12c216d0e38edf426f5e578e0482 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Wed Mar 30 16:06:16 2011 +0200 modified test such that test results match the computed results commit d9150f4e5b0bb78b20bb58828a96e0686a68f2d6 Merge: d0b673b bcae3aa Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Wed Mar 30 15:44:52 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit d0b673beca5d972cdfe3babf4edbe64d5455a894 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Wed Mar 30 15:44:23 2011 +0200 fixed some compile issues with GEMS and BRNS configuration commit cfcd65c7ca021a7e828b1d0b5b38342048e07620 Merge: b5e1500 62e3334 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Wed Mar 30 14:17:44 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit b5e150066673e79dff4f37c05dea5caf06ac173a Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Wed Mar 30 14:17:25 2011 +0200 added some functionality for searching mesh nodes and computing the corresponding area in 2D Meshes serveral changes concerning the classes MeshQuality* class CNode - changed data type of connected_elements from std::vector<long> to std::vector<size_t> - made the attribute connected_element private - changed name schema for attribute (connected_element -> _connected_element) GMSHInterface - stations outside of the bounding polygon will not be integrated into the mesh commit bcae3aad459df50cd1d67b567602afacd3d16556 Merge: e301426 cfcd65c Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Mar 30 13:47:13 2011 +0200 Merge branch 'ff' of 141.65.6.106:~/ogs_sources into ff * 'ff' of 141.65.6.106:~/ogs_sources: added some functionality for searching mesh nodes and computing the corresponding area in 2D Meshes substituted in COutput::NODWritePLYDataTEC the method call CFEMesh::GetNODOnPLY which used a CGLPolyline with CFEMesh::GetNODOnPLY that is using the new GEOLIB::Polyline added an implementation for the equi angle skew criterion for the prism case completed implementation of mesh quality criterion equi angle skew (for hexahedrons), improved the implementation of equi angle criterion for other element types commit e3014266d6ee17a22721e218034350c54594f590 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Mar 30 13:45:22 2011 +0200 Made shapelib, libtiff and libgeotiff optional for the Data Explorer. Now it only depends on Qt and VTK. commit 62e3334b35b10d3406d7987cab07774bf44194e2 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Mar 29 12:39:21 2011 +0200 When adding a filter the active scalar array is set to that of the parent or the desired scalar array which is set in VtkAlgorithmProperties. commit 867b7836942513c373255d83b905542f4f591321 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Mar 29 11:07:28 2011 +0200 Moved VisPrefsDialog to VtkVis commit ab74747097a9bbce1b80d4b139ce146c4e01afa7 Merge: b8d24a3 18a4a5f Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Mar 29 10:17:14 2011 +0200 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit b8d24a36220ba721840379382dd40d3a5b7113f9 Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Mar 29 10:16:56 2011 +0200 fixed but in tubefilter commit 18a4a5f4b78953d76595c80419a335f690c7015c Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Mar 28 16:38:44 2011 +0200 Global superelevation to visualisation settings dialog added. commit 98445f7c9f44593ce59d74ec605bb85e09c326e9 Merge: 19c7c7d e2fde5d Author: git@dev2 <lars.bilke@ufz.de> Date: Fri Mar 25 15:09:30 2011 +0100 Merge branch 'master' into ff commit e2fde5d51b59e509137ee1466b895ff52a6f11b3 Author: git@dev2 <lars.bilke@ufz.de> Date: Fri Mar 25 15:05:58 2011 +0100 Added Gui manual as a git submodule under Qt/Gui/manual commit 19c7c7de87b139dcf70d90a3f0af116ba677a655 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Mar 24 10:30:52 2011 +0100 Removed some debug output commit 3fd99941b3e1a76447bfed0fdf73dc2e6532856a Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Mar 23 16:33:00 2011 +0100 Fix build commit 06476deaf3180b1778ec05b0c8c7cae8b9737fbb Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Mar 23 14:32:56 2011 +0100 Resetting the camera on loading / unloading can be switched off in the visualization settings. Subclassed QSlider to show the value as a tooltip commit daec089fcbf01541c1fca4f87127c6857710cb4f Merge: 5b96c9d 9bc942a Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Mar 22 07:33:43 2011 +0100 Merge branch 'ff' of git@141.65.6.106:ogs_sources into ff commit 5b96c9dd6d0c25225452ae850e989796f0a463a0 Merge: 0eda28e fe4a922 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon Mar 21 18:06:47 2011 +0100 Merge branch 'ff' of git@141.65.6.106:ogs_sources into ff commit 0eda28e1185ebb71c21afb3f9264162f854d1da6 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon Mar 21 18:06:38 2011 +0100 substituted in COutput::NODWritePLYDataTEC the method call CFEMesh::GetNODOnPLY which used a CGLPolyline with CFEMesh::GetNODOnPLY that is using the new GEOLIB::Polyline commit 9bc942ad9530d60fb287c577a20f7fa83e426eb7 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Mar 21 17:43:46 2011 +0100 Fixed linux gui build. Some configurations now need at least two cmake runs. commit fe4a922230c19d13c38149e94fa7d304274c6992 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Mar 21 16:58:31 2011 +0100 OpenMP executable flag correctly set commit e4036548246018a77961b033cc9c0c5088ba8f1f Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Mar 21 16:14:22 2011 +0100 Some CMake refactoring commit 05c3160d559b8b3e5590c59758dad5e7962ae4fd Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Mar 21 14:29:11 2011 +0100 VtkToOsg converter can now batch convert commit 8c4e94edee4d3867f1a644821cc72ffd2bbf7d27 Merge: da590ab 0e363eb Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon Mar 21 07:53:35 2011 +0100 Merge branch 'ff' of git@141.65.6.106:ogs_sources into ff commit da590ab095f72195b18e882b78ebd7ec98d32cdb Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon Mar 21 07:53:31 2011 +0100 added an implementation for the equi angle skew criterion for the prism case commit 2e594daaf027be39f8754fa076be6f75079a2763 Merge: 15552bd 693ab17 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Fri Mar 18 12:33:47 2011 +0100 Merge branch 'ff' of git@141.65.6.106:ogs_sources into ff commit 15552bd0657b361a1ae8175aed858caa39418ddd Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Fri Mar 18 12:33:33 2011 +0100 completed implementation of mesh quality criterion equi angle skew (for hexahedrons), improved the implementation of equi angle criterion for other element types commit 0e363ebac67ca48cd7a618ef1dd9a4eeff3221a0 Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Mar 18 12:09:59 2011 +0100 Add filter dialog accepts double-clicks commit aa870293bf8f4ad2f74eac7178caf1563a7b394f Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Mar 18 11:55:08 2011 +0100 Scalar arrays select box correctly saves the selected array commit 693ab17aac103602fc4b787714e4069e14fbd2db Merge: b144517 5b44c2b Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Mar 18 11:18:46 2011 +0100 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff * 'ff' of 141.65.6.106:ogs_sources: threshold for mesh quality can be a random interval now commit b144517aba68274dbeb5d5378645efebb4ae8ab3 Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Mar 18 11:18:37 2011 +0100 Fixed more warnings commit 5b44c2b90f2eb85c16576881388c4d0675bcbc01 Merge: f61eef4 6ccd308 Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Mar 18 11:09:30 2011 +0100 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit f61eef4362866e0b977fa06748818f9a92836e36 Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Mar 18 11:09:10 2011 +0100 threshold for mesh quality can be a random interval now commit 6ccd30868525c41d3ebf2632ca1199c677f45b30 Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Mar 18 10:45:19 2011 +0100 Fixed many warnings commit 7e45e6c4fcafceb06d687f73d177a5b1319d24b5 Merge: ebdeac6 0caeeb9 Author: git@dev2 <lars.bilke@ufz.de> Date: Fri Mar 18 10:43:34 2011 +0100 Merged with master (tag 5.1.01 from svn trunk) commit ebdeac6cb6cdbabf583d28eb80b3f94c35468832 Merge: 3843402 9636641 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Fri Mar 18 07:53:05 2011 +0100 Merge branch 'ff' of git@141.65.6.106:ogs_sources into ff commit 3843402bcea632064589056a6581efc4c99d9543 Merge: 1e6203c 27261bc Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Fri Mar 18 07:52:32 2011 +0100 Merge branch 'ff' of git@141.65.6.106:ogs_sources into ff Conflicts: MSH/MeshQualityNormalisedVolumes.cpp MSH/MeshQualityNormalisedVolumes.h Qt/VtkVis/VtkVisPipeline.cpp commit 9636641360db295605c93d6766e40e85ee0cc918 Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Mar 17 17:29:26 2011 +0100 fixed a few warnings commit 1e6203cdbc67d001fa9547dcb88e7d1adbd9bc56 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Mar 17 15:36:46 2011 +0100 implemented new mesh quality criterion equi angle skew added a funcion to compute the angle between two edges commit 0caeeb9e16414c99aaf43bb0fa68463128a6ffb7 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Mar 17 14:29:12 2011 +0000 Moved libraries files to Libs folder git-svn-id: https://svn.ufz.de/svn/ogs/trunk/sources@8074 3895a583-e809-0410-9bb6-aa9463026377 commit 0df9bbda11ee27fd16859a1056a26a639ca85fc5 Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Mar 17 14:48:37 2011 +0100 fixed bloody stupid bug with damn vs not recognising stupid upper case letters in dumb include commands commit 27261bcba376b98ec5a3b3990158ab3411ee1af9 Merge: f08f4fa 7334c1b Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Mar 17 14:31:04 2011 +0100 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit f08f4fafceaa1bd5a8d9a019fe02639ad7f6a05f Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Mar 17 14:30:52 2011 +0100 added mesh quality criterium based on area commit e2feb299580c9defd168db7ce0cf67aeaaa18d96 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Mar 17 13:07:59 2011 +0000 Version 5.1.01 by Bastian Graupner git-svn-id: https://svn.ufz.de/svn/ogs/trunk/sources@8073 3895a583-e809-0410-9bb6-aa9463026377 commit 7334c1bbaba5cdf2e7ff80cfe18df738a40e4c45 Author: Lars Bilke <lars.bilke@ufz.de> Date: Thu Mar 17 11:21:38 2011 +0100 His excellency dev2, please build mpi configuration now commit c5c2a9183e35d18cb84a9e1a6f927057da73d205 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Mar 17 09:40:11 2011 +0100 fix a compile issue under linux commit ea492faa12c5a6e1b3179c0f64bd09cc8babd3d1 Merge: 1047ffd e83aa6f Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Mar 17 09:33:20 2011 +0100 Merge branch 'ff' of git@141.65.6.106:ogs_sources into ff commit 1047ffd2f70d26a85d2e587813cc0b56bf9db845 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Mar 17 09:33:16 2011 +0100 fixed some compile issues under linux fixed a bug in method MeshQualityChecker::getHistogramm() commit 344223045a9e92795cac1ec80c4f8c7756cbba93 Merge: d19c4e7 0c432ed Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Mar 17 08:48:21 2011 +0100 Merge branch 'ff' of git@141.65.6.106:ogs_sources into ff commit d19c4e7ff94d0970191607a2d8be683b6f205381 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Mar 17 08:48:14 2011 +0100 modified class MeshQualityNormalisedVolumes - 1D and 2D elements are associated with values greater than 1 commit e83aa6f16918b1df190156baaee43eb687aee773 Merge: 2648bc4 0c432ed Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Mar 17 08:27:45 2011 +0100 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit 2648bc406c083d3132ff14bcba18b036e78d75ca Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Mar 17 08:27:27 2011 +0100 fixed error concerning M_PI under MSVS commit 0c432ed8f53be03281ef76bf5d5e52510e67f506 Merge: e7c3b6a 097792c Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Mar 16 19:21:29 2011 +0100 Merge branch 'ff' of git@141.65.6.106:ogs_sources into ff * 'ff' of git@141.65.6.106:ogs_sources: added mesh quality selection dialog commit e7c3b6a104c8a5f39f16c8885e6ab5976592e496 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Mar 16 18:47:15 2011 +0100 Finish build script fixes commit ac0cfbee46620849265804e2028f7e8c1b4da7e5 Merge: cab9b1c 65306cb Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Mar 16 18:13:20 2011 +0100 Merge branch 'ff' of git@141.65.6.106:ogs_sources into ff * 'ff' of git@141.65.6.106:ogs_sources: added #include <cmath> to Polygon.cpp fixed a bug in class EarClippingTriangulation fixed bugs in image-to-barchart-filter, apply-color-table-filter and MeshQualityNormalisedVolumes commit cab9b1cf9171e6236ac579d5ffcf7b7521b51756 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Mar 16 18:13:11 2011 +0100 Fixed lis, mkl and mpi build configuration commit 097792cdf2b590ec3c769d44fb043b1c1e0e7735 Merge: 92afaa9 ac0cfbe Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Mar 16 17:23:07 2011 +0100 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit 92afaa9752190116a5643f642d5f4feec41cb27c Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Mar 16 17:22:51 2011 +0100 added mesh quality selection dialog commit 65306cb414b4c512a8185fd912b22357bda4bd71 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Wed Mar 16 16:46:48 2011 +0100 added #include <cmath> to Polygon.cpp commit cb7fd18c8448dfe9f98e08d9cb6a042680ae9b15 Merge: a464fcc 00376a8 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Wed Mar 16 16:09:59 2011 +0100 Merge branch 'ff' of git@141.65.6.106:ogs_sources into ff commit a464fccae87bd0c625f3b10ee0836b37a3cf3515 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Wed Mar 16 16:09:46 2011 +0100 fixed a bug in class EarClippingTriangulation fixed a bug in class LinearInterpolation (removed wrong boundary check) added function createPolygonFromCircle (see Polygon.h) eliminated CFEMesh::GetNODOnPLY() calls at serveral places commit 51df8fb390858949e4d3a9711b7590d8fa05a01c Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Mar 16 12:34:51 2011 +0100 Fixed MKL build. Added a second CMake run to build_configs.sh because this is required at least for MKL configuration commit 00376a8281a41820c551ec356c822d0a4163a979 Merge: ea98bc9 51df8fb Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Mar 16 12:20:06 2011 +0100 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit ea98bc9c599c5612ff3cfd840b6c12da3b4d47a8 Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Mar 16 12:19:49 2011 +0100 fixed bugs in image-to-barchart-filter, apply-color-table-filter and MeshQualityNormalisedVolumes commit db874250fbf6ec6d1098003f59d418607e7150e6 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Mar 15 16:41:31 2011 +0100 Fix project name commit 47dd64b3ad355f60fac4e22c646007e06a4d7af9 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Mar 15 16:25:29 2011 +0100 Added CMake config files commit b31e8202c48b0479b98a0276ded9155ddc222c69 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Mar 15 16:24:07 2011 +0100 Deleted obsolete FEM.cmake commit 33072028d11d25400584418d2f9d8f3067d7f355 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Mar 15 15:11:02 2011 +0100 Deleted obsolete Options.cmake commit 243cec1ea3da47419cfc00d4cb63b4762e0d662c Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Mar 15 13:54:18 2011 +0100 Finished FindMKL commit cf834ab090c792bbaa747f39e34d04d9c1c777ee Merge: 1b38d32 664e0c9 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Mar 15 13:03:23 2011 +0100 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff * 'ff' of 141.65.6.106:ogs_sources: Fix FindMKL commit 664e0c9dc993d3ef3071d03c3c9c770fce216170 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Mar 15 14:02:14 2011 +0100 Fix FindMKL commit 257c674dcc35346651373219fa1100b9eb98bfa6 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Mar 15 12:57:41 2011 +0100 Cleanup of MKL CMake config commit 1b38d32aa1bdde5a705a8055c2f57f7ced51990a Merge: 397841c 257c674 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Mar 15 11:59:04 2011 +0100 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff * 'ff' of 141.65.6.106:ogs_sources: Cleanup of MKL CMake config commit 397841c1b5bcd59809382de7b25cd6617b162580 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Mar 15 10:52:43 2011 +0100 Removed CMake config files commit 9215a466f7d5c18dbdc95c207ef2add05063aeb7 Merge: a5e9b22 7621049 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Mar 15 10:40:31 2011 +0100 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff * 'ff' of 141.65.6.106:ogs_sources: added #include <algorithm> to rf_bc_new .cpp substituted in method CBoundaryConditionsGroup::Set the method call CFEMesh::GetNODOnPLY (), that is using the old polyline data structure. The old polyline data structure was (mis)used for interpolation. For this reason the (linear) interpolation is also substituted. Therefore the classes MeshNodesAlongPolylines and LinearInterpolation are used. cleaned up code in msh_elem temp fix of memory issue at startup commit a5e9b227c57816a92289de94e4ca4ac63d81145d Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Mar 15 10:40:28 2011 +0100 Moving FEM config cmake commands to main CMakeLists.txt commit 8c4409acae6b52076e536ff0824581c48ebff923 Merge: 6b4daea 1243037 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Mar 10 10:47:53 2011 +0100 Merge branch 'ff' of git@141.65.6.106:ogs_sources into ff commit 6b4daeae07771d178883755e454f7905589a74a7 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Mar 10 10:47:37 2011 +0100 substituted in method CBoundaryConditionsGroup::Set the method call CFEMesh::GetNODOnPLY (), that is using the old polyline data structure. The old polyline data structure was (mis)used for interpolation. For this reason the (linear) interpolation is also substituted. Therefore the classes MeshNodesAlongPolylines and LinearInterpolation are used. commit 762104959fa1a2f91c10bdfd7190f3780734a2c4 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Mar 10 09:52:51 2011 +0100 added #include <algorithm> to rf_bc_new .cpp commit 1243037e83fb3a16c701cd28a969eb8fa3829e9f Author: Karsten Rink <karsten.rink@ufz.de> Date: Thu Mar 10 08:45:04 2011 +0100 cleaned up code in msh_elem commit 352729a3aa4b628f29068e892cbd82ac3d74252e Author: Karsten Rink <karsten.rink@ufz.de> Date: Wed Mar 9 17:23:54 2011 +0100 temp fix of memory issue at startup commit 353dc0c19107f3ecdbae8ae60868208a3d78feca Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Mar 9 09:46:07 2011 +0100 Screenshot functionality. Screenshots are taken with a button on the VisualizationWidget. A magnification factor can be given to save the image in a higher resolution, e.g. for printing. commit 2e5d603ded5f529fbdc80acb466e8c8c005d1060 Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Mar 8 14:32:25 2011 +0100 colour tables can now be loaded for each scalar array; removal of vtk-objects is fixed commit 08b7fd63a601de285d0e28802f5dcc7febec16b5 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Mar 8 13:32:28 2011 +0100 added #ifndef _WIN32 ... #endif commit 8afef46640ce31b7b7745be83115efa4fddeafa2 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Mar 8 13:31:42 2011 +0100 removed OS dependent code commit ce64c1114ca00fcb0549c2c3b9d2c0b26a6d3197 Merge: 2251776 5185ade Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Mar 8 13:10:04 2011 +0100 Merge branch 'ff' of git@141.65.6.106:ogs_sources into ff commit 2251776a4cca5bddafba2a6d2a6a387970663a4c Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Mar 8 12:58:31 2011 +0100 - set default GeoType in GeoInfo to INVALID - created command line tool to extract boundary conditions from polyline (setting head using the z-value of the polyline points) - enclosed debug info into #ifndef NDEBUG ... #endif commit 5185adec1027c51c1ff6dcb314984375705f9021 Author: Karsten Rink <karsten.rink@ufz.de> Date: Tue Mar 8 09:47:20 2011 +0100 Removed constructgrid from mesh loading in gui ... commit 1a7add822932857fbc62b4acd9fd3c850ab537f1 Merge: 5e6374e 838167d Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Mar 8 09:37:14 2011 +0100 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff * 'ff' of 141.65.6.106:ogs_sources: Testing modifications on ConstructGrid Testing modifications on ComputeVolume commit 5e6374e438107adc639a0cc682b5e55cff8f3fd4 Author: Lars Bilke <lars.bilke@ufz.de> Date: Tue Mar 8 09:37:10 2011 +0100 Fixed cell selection on superelevated data objects commit f39ae17b4abcf582dadf7b0a0cb3c28f3ebf07cd Merge: 9b8365b 838167d Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Mar 8 07:45:50 2011 +0100 Merge branch 'ff' of git@141.65.6.106:ogs_sources into ff commit 9b8365b7a664aad0cf3ebfa9c2a4d4a7a14300fb Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Mar 8 07:45:29 2011 +0100 - added the possibility to use posix threads in cmake (with the help of Lars) - implemented CFEMesh::GetNODOnPnt with threads to accelerate the setting of BCs - added class OGSMeshIO in order to write only mesh elements with non-zero volume to the file - implemented a base class MeshQualityChecker - added mesh quality criterion based on the volume of the elements (class MeshQualityNormalisedVolumes) that inherits from class MeshQualityChecker - added mesh quality criterion based on the ration shortest edge / longest edge of a element (class MeshQualityShortestLongestRatio) that inherits from class MeshQualityChecker commit 838167d1f8bc4572b5fb00dc27b898765ec4c8f6 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Mar 7 16:47:01 2011 +0100 Testing modifications on ConstructGrid commit 1b3612c238aadede81677f44bbeb3acbd36ec1e5 Merge: 363fff4 bae5c62 Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Mar 7 14:27:18 2011 +0100 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff commit 363fff45c08279f000d5572d1d54bd331776ce0f Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Mar 7 14:26:46 2011 +0100 Testing modifications on ComputeVolume commit bae5c625528b8f5d25dcb51399158ab897f87d2a Merge: 6ff4994 3ea70ae Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Mar 7 14:07:03 2011 +0100 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff * 'ff' of 141.65.6.106:ogs_sources: Testing modifications on ConstructGrid Testing modifications on ConstructGrid commit 6ff499493a21f9b1e7602cb132f8ec80986cfc36 Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Mar 7 12:28:04 2011 +0100 Fixed Qt Creator compile issue commit 9055ecf9fb110333e7d1b731934403fe1831959b Author: Lars Bilke <lars.bilke@ufz.de> Date: Mon Mar 7 12:26:50 2011 +0100 Fixed threshold filter bug. Do not call ClearOsg() from outside the vtkOsgActor-class. commit 3ea70aef4ccf892f80cadb5c86ded8f963f5bccd Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Mar 7 12:21:16 2011 +0100 Testing modifications on ConstructGrid commit 42f4f4a5bd8ae43eb8753ea501f1d9388d1bf50e Author: Karsten Rink <karsten.rink@ufz.de> Date: Mon Mar 7 10:14:41 2011 +0100 Testing modifications on ConstructGrid commit 56e9372b5b892122a9499e5afe21abd9131c16ae Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Mar 4 16:33:29 2011 +0100 In OpenSG-mode append a vtkTriangleFilter to the vtkTubeFilter to convert triangle strips to ordinary triangles. commit 714d21db8af0b25c573abec1b91a5d43f720f11b Merge: 224333e afb212e Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Mar 4 13:07:06 2011 +0100 Merge branch 'ff' of 141.65.6.106:ogs_sources into ff * 'ff' of 141.65.6.106:ogs_sources: fixed some compiler warnings added missing files fixed bug concerning conversion of vtk-meshes to ogs-meshes commit 224333e83783845c5cd6412901049862c0cd6b13 Merge: 90b5c0e f21205d Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Mar 4 13:04:29 2011 +0100 Merge commit 'f21205d' into ff * commit 'f21205d': (65 commits) Moved visualization widget from DataView/ to VtkVis/ Fixed some cppcheck errors Some tooltips added Bump version number Missing changes Added missing files Missing git merges. Fixed XML-index-mapping issue as well as conditional connect for GeoTreeView made an ambiguous call to overloaded function log clear added "#include <cmath>" to MeshQualityChecker for log fixed warning in GeoObjectListItem Replaced separated geometry-dataviews by a treemodel/view containing all geometry information added loading of a matrix from GUI for testing purposes implemented criterion: shortest edge/ longest edge for all (currently know - see in MshElemType.h) mesh element types in class MeshQualityChecker converting FEM Conditions to new data structures added new constructor to TemplatePoint and renamed protected attribute x to _x changed implementation of opertor== from Vector3 some new checks in MeshQualityChecker cleaned up code some more work on the scalar visualisation of vtk objects + modularisation of code 1 removed bugs from class ExtractMeshNodes and ExtractSurface 2 changed algorithm to test if a point is in a polygon 3 added test "point in polygon" to google test add documentation to GMSHInterface changed PointVec::makePntsUnique ... commit f21205de636a748e246d00e26db85280663389fa Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Mar 4 12:59:48 2011 +0100 Moved visualization widget from DataView/ to VtkVis/ commit afb212e6d50144b2ee11fe120be1ffe2752f39fd Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Mar 4 12:57:13 2011 +0100 fixed some compiler warnings commit 2f2263b376bbd4077ed3c98fd6a69f3b7b414aaa Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Mar 4 12:28:41 2011 +0100 added missing files commit 3d2ed8ccf2be04623da2a7caab374efd5066f990 Author: Karsten Rink <karsten.rink@ufz.de> Date: Fri Mar 4 12:27:39 2011 +0100 fixed bug concerning conversion of vtk-meshes to ogs-meshes commit 09c273396bf8b67f66a03675fc78f76371bf8ee4 Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Mar 4 10:15:59 2011 +0100 Fixed some cppcheck errors commit ae49d98e608cca9e36702a9ec5c9bd59b0671e58 Author: Lars Bilke <lars.bilke@ufz.de> Date: Fri Mar 4 09:37:08 2011 +0100 Some tooltips added commit cef38feb9f72ebf70fb02b50a7b354a5b89eba81 Merge: bdee358 6f7e5fa Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Mar 3 07:43:57 2011 +0100 Merge branch 'ff' of git@141.65.6.106:ogs_sources into ff commit bdee358d83cd9f3302fe1bad55c89275608143cb Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Thu Mar 3 07:43:51 2011 +0100 implemented CFEMesh::GetNODOnPoint using pthreads commit 90b5c0edf1a5003e1e4e88d13cbd56cad6e4eb82 Author: Lars Bilke <lars.bilke@ufz.de> Date: Wed Mar 2 17:06:10 2011 +0100 Added simple cell picking in 3d view. Select an vtk object in the vis pipeline and then click on that object in the 3d view to highlight the picked cell. commit c33860da3f4e1ad26795e9b0f823f7571ef9fb9c Merge: 389d4ec 8a6959c Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Mar 1 14:07:54 2011 +0100 Merge branch 'ff' of git@141.65.6.106:ogs_sources into ff commit 389d4ecf0a01f6c80a30c510d3318fa88584d44e Merge: 15f7c62 29a5ed6 Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Mar 1 13:31:11 2011 +0100 Merge branch 'ff' of git@141.65.6.106:ogs_sources into ff commit 15f7c62d1afba2a7aaaccbe576d436ffbcbdaeaf Author: Thomas Fischer <thomas.fischer@ufz.de> Date: Tue Mar 1 13:31:04 2011 +0100 add a more useful error message to XMLInterface git-svn-id: https://svn.ufz.de/svn/ogs/trunk/sources@9473 3895a583-e809-0410-9bb6-aa9463026377
Showing
- Base/CheckboxDelegate.cpp 22 additions, 21 deletionsBase/CheckboxDelegate.cpp
- Base/CheckboxDelegate.h 7 additions, 7 deletionsBase/CheckboxDelegate.h
- Base/ColorPickerPushButton.cpp 4 additions, 4 deletionsBase/ColorPickerPushButton.cpp
- Base/ColorPickerPushButton.h 0 additions, 1 deletionBase/ColorPickerPushButton.h
- Base/OGSError.h 0 additions, 2 deletionsBase/OGSError.h
- Base/QNonScalableGraphicsTextItem.cpp 14 additions, 10 deletionsBase/QNonScalableGraphicsTextItem.cpp
- Base/QNonScalableGraphicsTextItem.h 3 additions, 3 deletionsBase/QNonScalableGraphicsTextItem.h
- Base/QValueTooltipSlider.cpp 3 additions, 3 deletionsBase/QValueTooltipSlider.cpp
- Base/QValueTooltipSlider.h 1 addition, 2 deletionsBase/QValueTooltipSlider.h
- Base/RecentFiles.cpp 6 additions, 6 deletionsBase/RecentFiles.cpp
- Base/RecentFiles.h 2 additions, 4 deletionsBase/RecentFiles.h
- Base/StrictDoubleValidator.h 3 additions, 3 deletionsBase/StrictDoubleValidator.h
- Base/StrictIntValidator.h 3 additions, 3 deletionsBase/StrictIntValidator.h
- Base/TreeItem.cpp 14 additions, 16 deletionsBase/TreeItem.cpp
- Base/TreeItem.h 4 additions, 5 deletionsBase/TreeItem.h
- Base/TreeModel.cpp 80 additions, 74 deletionsBase/TreeModel.cpp
- Base/TreeModel.h 4 additions, 3 deletionsBase/TreeModel.h
- Base/TreeModelIterator.cpp 4 additions, 6 deletionsBase/TreeModelIterator.cpp
- Base/TreeModelIterator.h 1 addition, 4 deletionsBase/TreeModelIterator.h
- Base/modeltest.cpp 380 additions, 377 deletionsBase/modeltest.cpp
Loading
Please register or sign in to comment