Skip to content
Snippets Groups Projects
Commit f068b6d2 authored by Lars Bilke's avatar Lars Bilke
Browse files

This is version 5.2.07 by LB / TF / KR. 

Squashed commit of the following:

commit 7960f958e9029699e48062a95be93d0c237c5254
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Wed Dec 14 15:26:56 2011 +0100

    Some missing FiniteElement:: namespace prefixes.

commit 39328362da0cf6b4bf0994364371c6d52375b83a
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Wed Dec 14 15:04:06 2011 +0100

    Fixed merge.

commit b20f95a7a371615cc6da6271951a6349382a9163
Merge: 8c62f05 9423fb0
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Wed Dec 14 14:16:20 2011 +0100

    Merge branch 'master' into ff

    * master:
      bugfix of the bugfix for GEMS coupling
      bugfixes for GEMS coupling (mainly Richards flow related)...this should not interfere with any other parts of the codes
      changed the last commit for PVD output - It's not necessary to change variable names in OUT according to coordinate systems. Variable names in VTU files will be automatically changed.
      updated PVD stuff - fixed a bug creating VTU files in a wrong directory. - added a feature automatically switching variable names for XZ problems.
      fixed minor issues - changed to output error messages if geometric dimension in MMP is not consistent with element dimension. - fixed OpenMP link error on Linux
      fixed critical bugs. let's see benchmark results...
      fixed a bug in reloading initial stress
      Add a feature to read asci element stresses, and remove the unused files of MSH from the CMakelist for non-GUI option
      fixed a bug while generating GMSH mesh; fixed a bug loading GMSH mesh
      enabled JOD-benchmarks in scripts/run_benchmarks.sh script
      GROUNDWATER_FLOW: Bugfix for 1D Elements in 2D (Coord_Trans)
      Squashed commit of the following:

    Conflicts:
    	FEM/fem_ele_std.cpp
    	FEM/rf_REACT_GEM.cpp
    	FEM/vtk.cpp
    	FileIO/MeshIO/GMSHInterface.cpp
    	scripts/run_benchmarks.sh

commit 8c62f052a145340e4f0a010597f4f31698fe3f8c
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Wed Dec 14 12:49:09 2011 +0100

    Bump version to 5.2.07

commit 40ac6736cf8a4acd2fb933a78d663f9a2677cbd9
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Wed Dec 14 11:17:25 2011 +0100

    Point selection is working,

    A scalar field had to be generated inside VtkPointsSource because there was none
    that could be used by the threshold filter in VtkCompositeGeoObjectFilter.

    TODO: View gets reset when selecting a point. This is du to
    VisualizationWidget::updateViewOnLoad().

commit c7a5c1f90e4d2c97af84c20fbaed9a211b4e8f36
Merge: ba270e6 fba5bd3
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Tue Dec 13 16:40:13 2011 +0100

    Merge branch 'ff' of vismac02.intranet.ufz.de:ogs5/sources into ff

commit ba270e631e2283f38179e523feb897a4bfd0a826
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Tue Dec 13 16:39:48 2011 +0100

    fixed a bug with displaying names for geo-objects

commit fba5bd379e0ba449f22a242d7c929ad3e6a987b9
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Tue Dec 13 16:22:14 2011 +0100

    setfill must be set, otherwise white space is used.

commit f1b7aadf4cd6ee40a927d8c5648c3ccadecd6aa8
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Tue Dec 13 15:50:02 2011 +0100

    It should work with the include.

commit d0f32b7c3cd9266df5eb8f8d1ead6f73cae96dab
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Tue Dec 13 15:42:53 2011 +0100

    Forgot namespace.

commit 9bfe3f00bcd725520b7f02915580e8806eb407d7
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Tue Dec 13 15:37:36 2011 +0100

    Time steps in vtk output filenames have leading zeros now.

commit ef2049b74276cd28a9f900512759e9293559f4ef
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Tue Dec 13 15:08:12 2011 +0100

    Test

commit 5a61569311238db4525c41ae56c2128cefac5811
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Tue Dec 13 14:38:28 2011 +0100

    Push test.

commit 216c3fbbfb541662d35f82d229dbc9b0e7bb7b76
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Tue Dec 13 14:19:38 2011 +0100

    Push test.

commit 4d6f8310432fb4e836532c5c2e892c6cac3833ad
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Tue Dec 13 14:10:17 2011 +0100

    Push test.

commit 4f2828a90f289b249371112803457271c6d560c7
Merge: f70cf0e a416aa8
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Tue Dec 13 14:00:33 2011 +0100

    Merge branch 'ff' of vismac02.intranet.ufz.de:ogs5/sources into ff

commit f70cf0e0a47d3d3ae4555af0682482337a440f06
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Tue Dec 13 13:59:49 2011 +0100

    added TetGen interface to GUI

commit a416aa82968938b828bee6aaafb130b462fa127a
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Tue Dec 13 12:38:43 2011 +0100

    Use isodate in About dialog.

commit bd4b30a48ae4910fad7792d3f991317d8a52b5fe
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Tue Dec 13 12:31:11 2011 +0100

    radius is now correctly calculated upon highlighting a single polyline

commit fcd1f745743ffa00ef695300afe357f70b61a85d
Merge: cb8fc9b 8646aad
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Tue Dec 13 12:08:42 2011 +0100

    Merge branch 'ff' of vismac02.intranet.ufz.de:ogs5/sources into ff

commit cb8fc9b963a305fbdbd66720ab4d081c4d1ba1f4
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Tue Dec 13 12:07:36 2011 +0100

    added a file converter (working in terminal) from GMSH mesh file into OGS mesh format

commit 8df1cca1f1b03f2bdeb26515e9407fca8dd94c7e
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Tue Dec 13 12:06:25 2011 +0100

    moved about-menuitem to help-menu

commit d7ba6b7935be34311de66b32f99c8d0f25e495ca
Merge: 341e5c0 fcd1f74
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Tue Dec 13 11:53:22 2011 +0100

    Merge branch 'ff' of vismac02.intranet.ufz.de:ogs5/sources into ff

commit 341e5c0e69c3cd3684a644deae523e01f0757d32
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Tue Dec 13 11:52:38 2011 +0100

    glyph and tube filter now calculate initial radius as double; fixed bug in geotreeview

commit 8646aad9d652b1e863fe3644b7c175d9f23bb286
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Tue Dec 13 10:35:29 2011 +0100

    Fixed compile error.

commit 1499119b4bd2514d1b41ba0edb2a45ade67eace5
Merge: ba79eba c9190e4
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Tue Dec 13 10:13:51 2011 +0100

    Merge branch 'ff' of vismac02.intranet.ufz.de:ogs5/sources into ff

    * 'ff' of vismac02.intranet.ufz.de:ogs5/sources:
      added tetgen-import to gui
      geo-objects can now be highlighted in render window (does not work for points); radius for glyph- and tube-filter is now calculated based on size of dataset
      Ups again...
      minor changes

    Conflicts:
    	Qt/VtkVis/VtkCompositePointToGlyphFilter.cpp

commit c9190e463fb71eeccad61f63cee16204dad0a63a
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Tue Dec 13 09:33:07 2011 +0100

    added tetgen-import to gui

commit 5580cecd95430faf8bfa54d6e42d737b6d50854c
Merge: c967b49 39c290a
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Fri Dec 9 15:18:35 2011 +0100

    Merge branch 'ff' of vismac02.intranet.ufz.de:ogs5/sources into ff

commit c967b497a69f03f2e36ec6c3f0ec21b8d6cf6426
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Fri Dec 9 15:08:36 2011 +0100

    geo-objects can now be highlighted in render window (does not work for points); radius for glyph- and tube-filter is now calculated based on size of dataset

commit 39c290a2e4389bd6dea793916af27f70f7df9441
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Fri Dec 9 13:07:57 2011 +0100

    Ups again...

commit ba79ebacd1e024cba472dc2bc0cf2707e00dd442
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Thu Dec 8 15:19:45 2011 +0100

    Added about dialog and additional informations when OGS_BUILD_INFO is enabled.

commit 1fbca36849e38bdf5dc94b5775e9a0c3d8b143f2
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Thu Dec 8 12:55:12 2011 +0100

    Point radius can now be a float.

commit 54c9746e887071ec3d0dd556662212942288bb77
Merge: 9d407a4 85238cf
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Tue Dec 6 08:46:05 2011 +0100

    Merge branch 'ff' of 141.65.6.106:ogs_sources into ff

commit 9d407a42b787d7da36409ed01356fea9342f53a8
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Tue Dec 6 08:45:34 2011 +0100

    minor changes

commit 85238cfe464e88aa9095a3ef8f87c7ff674154d1
Merge: efcc836 28dbd2f
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Fri Dec 2 12:08:14 2011 +0100

    Merge branch 'ff' of 141.65.6.106:ogs_sources into ff

commit efcc836687734ed0a916a708416768d514198d7d
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Fri Dec 2 12:05:33 2011 +0100

    - fixed a small bug in class GEOObjects
    - implemented an algorithm which allows to find nodes of a mesh belonging to a specific layer (damn - this is a hack :-( )

commit 28dbd2febb534c8cb9164b00b724d77f0ecb9b55
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Fri Dec 2 10:51:26 2011 +0100

    compiler is now ignoring warning C4267 (int to size_t conversion), thus removing 600 warnings under win64; removed some (real) warnings

commit 7617eaea8c8bef902173a774358b7fb40f8a2bdf
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Fri Dec 2 10:01:16 2011 +0100

    fixed a few details in femconditionsetup

commit 0e9dfb71ebdc6871bfa03292def7d9e07998e9d5
Merge: dc178f5 046275e
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Fri Dec 2 09:32:27 2011 +0100

    adding and removing conditions from gui should work correctly now

commit dc178f563e1371d50a661c5833c2930b65f48531
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Thu Dec 1 09:29:25 2011 +0100

    xml cond files can be exported now, fixed a few warnings

commit 90d77d6e85b9f889bf684c0ab7910566e19d9e5d
Merge: c217d4b 68f2a74
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Wed Nov 30 13:29:24 2011 +0100

    Merge branch 'ff' of 141.65.6.106:ogs_sources into ff

commit 046275e618be222238766b40240728a7afb4ce5b
Merge: 8685164 90d77d6
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Wed Nov 30 13:21:29 2011 +0100

    Merge branch 'ff' of 141.65.6.106:~/ogs_sources into ff

    * 'ff' of 141.65.6.106:~/ogs_sources:
      - added two new constructors to class CElem (you can directly create a triangle or quad element now) - switch attributes of class template vec to ensure memory will be allocated properly - made attribute CElem::tranform_tensor private and changed the name a little bit - made CElem::nodes_index private and wrote some getter and setter - fixed some warnings

commit 8685164156a97ee47e2c77edf9cb77acd2d8229d
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Wed Nov 30 13:20:10 2011 +0100

    Ups...

commit c217d4b0fe108f72a48c48cbc489a279044b3d49
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Wed Nov 30 13:19:56 2011 +0100

    - added two new constructors to class CElem (you can directly create a triangle or quad element now)
    - switch attributes of class template vec to ensure memory will be allocated properly
    - made attribute CElem::tranform_tensor private and changed the name a little bit
    - made CElem::nodes_index private and wrote some getter and setter
    - fixed some warnings

commit 68f2a74554ee0a97959f590e04f7970040964f9d
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Wed Nov 30 12:06:29 2011 +0100

    Fixed benchmark script.

commit aaa37f368a982902934953eac1e5b6bd2318175d
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Wed Nov 30 11:24:53 2011 +0100

    Updated benchmark script.

commit c5630578655a1cd848b8471f427b9f5dffeebcd9
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Wed Nov 30 11:09:18 2011 +0100

    Deleted old scripts

commit 836637821d83fef43dabb10b009eee51a5292d1f
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Wed Nov 30 11:07:42 2011 +0100

    Updated README

commit bf44a136a73d63c00cbba0f27d302af28d56c9f0
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Wed Nov 30 10:10:13 2011 +0100

    Forgot the build command.

commit b4a8e10a80556132faef64f5ba6025fe9023cd5e
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Wed Nov 30 09:56:44 2011 +0100

    Unified config build script.

commit 04b79f53894ce61bab5cb5b5a4475d214c73caed
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Mon Nov 28 11:23:40 2011 +0100

    changed const-iterator issue in projectdata

commit da342bed5faf790ebda08b465ad86a91c10ea1fd
Merge: 7c72d14 4614af0
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Mon Nov 28 11:11:01 2011 +0100

    Merge branch 'ff' of 141.65.6.106:ogs_sources into ff

commit 7c72d144be1a12af665b5b301af44794c695426f
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Mon Nov 28 11:09:27 2011 +0100

    re-implemented raster to mesh conversion, also removed some bugs connected to that method

commit 4614af07e0ad5ad17848865e9c57f62bed9aea3f
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Thu Nov 24 13:08:26 2011 +0100

    fixed a bug in the geometric test

commit de155f727ddbafe18830861c9270aa11ff674096
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Thu Nov 24 12:48:41 2011 +0100

    added third parameter to function readGLIFileV4() that takes the unique geometric name

commit d1b680ca9dd601c4625fc1e7a269a7352f8aebbe
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Thu Nov 24 12:35:38 2011 +0100

    some more small changes, loading FEM Conds from geometry added again

commit bc73ba3621843f8b3a14f6d02172b93b2614f2c3
Merge: cf20e7d 4863eab
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Thu Nov 24 12:22:09 2011 +0100

    Merge branch 'ff' of 141.65.6.106:ogs_sources into ff

commit cf20e7d47006591155b6118f65ac6d0ed39cabef
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Thu Nov 24 12:19:24 2011 +0100

    implemented operator== for polylines and polygons
    GMSHInterface: check if polygons are contained more the one time in geometry
    ModifyMeshProperties: modify material of mesh element if and only if the center of the element is in the polygon

commit dd2fab3e9b4b14baa0cdd99981493ba68e0c5d9b
Merge: 012c35b de155f7
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Thu Nov 24 12:00:46 2011 +0100

    Merge branch 'ff' of 141.65.6.106:ogs_sources into ff

commit 012c35bcf371bd6c48483ee93ffc2a9f8e22b8d5
Merge: 2a5e527 bc73ba3
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Thu Nov 24 11:49:48 2011 +0100

    Merge branch 'ff' of 141.65.6.106:ogs_sources into ff

commit 2a5e527205be48448e5496fb56d96c98070ca0c5
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Thu Nov 24 11:49:14 2011 +0100

    some small changes (xml includes, etc.)

commit 16ca7c29f7e35e0fb5f0afa79a61900c929fdc88
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Wed Nov 23 10:12:30 2011 +0100

    split up xmlinterface into a class hierarchy; changed fem condition management toward an process oriented approach; visualisation of fem conditons is currently disabled

commit a6630c6f069f888a496eb3a315efecfc5da53fba
Merge: 23f0c2f 4863eab
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Tue Nov 22 12:27:44 2011 +0100

    Merge branch 'ff' of 141.65.6.106:ogs_sources into ff

commit 4863eab6658085288ab0bb34b0b6cdf5dd47c12b
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Tue Nov 22 12:16:22 2011 +0100

    Fixed script on Windows. Old bash version on Windows has not the =~ operator.

commit 2692ba3ee7beac12c7ee0cba515a99ceee71d63a
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Tue Nov 22 11:16:03 2011 +0100

    Build scripts will use cmake to actually build the project. More work on separating common script parts.

commit 9c837e558c25a689a642a926ec58e9f1cdec5611
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Tue Nov 22 11:14:51 2011 +0100

    Fixed typo

commit 3d527ea2f8726ebdd0fb08b6e77a2a2a6a089767
Merge: 4a20a09 7510d39
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Tue Nov 22 08:58:58 2011 +0100

    Merge branch 'ff' of 141.65.6.106:ogs_sources into ff

commit 4a20a096699115ccff976c35cbe6d597482f7b09
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Tue Nov 22 08:58:42 2011 +0100

    did some formating

commit 683a4dc6397e3c3307737a2640a2929b2df64a36
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Tue Nov 22 08:57:20 2011 +0100

    VCRedist should be found on VC++ 2010.

commit 7510d39ce07db8bfca11f5ce9cc59026015baf02
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Mon Nov 21 12:50:17 2011 +0100

    Last tweak

commit 9f362225b27b15fd6ba4314a5e0df4191401abe8
Merge: b31ea1e 3a87b7c
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Mon Nov 21 12:29:43 2011 +0100

    Merge branch 'ff' of 141.65.6.106:ogs_sources into ff

    * 'ff' of 141.65.6.106:ogs_sources:
      initialiazed attributes of class CElem n CFEMesh::ConstructGrid()

commit b31ea1e6b92630d12396e6717a5c09a54efd1427
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Mon Nov 21 12:29:39 2011 +0100

    Windows build working.

commit 3a87b7cf8c403b662e39cf1da3f2b510045894cc
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Mon Nov 21 12:26:32 2011 +0100

    initialiazed attributes of class CElem n CFEMesh::ConstructGrid()

commit 9f7cbb43b27ca1ea89a9d5a9a5566ea985eecfb0
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Fri Nov 18 16:51:46 2011 +0100

    Fixed mac gui build. Modified win gui build script.

commit 2a4a6cebc4473cf06ceeebe4dbd32d13c0a4b5f0
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Fri Nov 18 15:48:13 2011 +0100

    Build script working locally.

commit 23f0c2fa40128442e423de6f50a9276b401b6d99
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Fri Nov 18 14:37:32 2011 +0100

    raster to mesh dialog should now work correctly

commit 2acd8bd30c488f95f9060af004d02ee25e23154c
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Fri Nov 18 14:26:44 2011 +0100

    Fix

commit 1c3cea8e9f73d452acdaba12abbf9b3e51342bb2
Merge: 93e2020 727ef6c
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Fri Nov 18 12:13:53 2011 +0100

    Merge branch 'ff' of 141.65.6.106:ogs_sources into ff

    * 'ff' of 141.65.6.106:ogs_sources:
      Debug builds must be built.
      removed changes again
      testing filename requirements for benchmarks

commit 93e20201faade761f37bb42190813e488ef84c72
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Fri Nov 18 12:13:45 2011 +0100

    Added README for build scripts. Added base dir with common scripts.

commit 6acc4d595ec5d07c5daba66b8a2af6b85d414c1d
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Fri Nov 18 12:12:21 2011 +0100

    Refactoring build_gui.sh.

commit 727ef6cb3d26ab0debcf53aee4b0e4cd35ce677d
Merge: a111e60 4e4b98d
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Fri Nov 18 11:26:03 2011 +0100

    Merge branch 'ff' of 141.65.6.106:~/ogs_sources into ff

commit a111e60d74174b2cad92393d432b1a109a304adf
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Fri Nov 18 11:25:41 2011 +0100

    Debug builds must be built.

commit 4e4b98daf9a9656241f1b830a4abd3924bd81891
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Fri Nov 18 11:21:00 2011 +0100

    removed changes again

commit 5e3c3bae2a4fe48bba86bde19463b817beead8e9
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Fri Nov 18 11:06:51 2011 +0100

    testing filename requirements for benchmarks

commit 898985ab22ecd4b5558d91834c15d31acb410ebc
Merge: a3e7eb7 6fc27fc
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Thu Nov 17 16:40:44 2011 +0100

    Merge branch 'ff' of 141.65.6.106:~/ogs_sources into ff

commit 6fc27fc074a5d31955de104de16982e67e20f3c7
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Thu Nov 17 16:34:04 2011 +0100

    fixed linux bug

commit a3e7eb7a9e0917a5f9aaff3d4f57864ccbfb0a7f
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Thu Nov 17 16:26:25 2011 +0100

    New scripts working.

commit 8914b6b38dd961b5d63cfd8518815a903ab94fe3
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Thu Nov 17 16:06:46 2011 +0100

    Process specifiers can now be added/removed in GUI, raster to mesh conversion can now be parameterised via a special dialog

commit 31873e96073ee639a6eceafd401089c80b2962d2
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Thu Nov 17 14:14:16 2011 +0100

    New setup scripts from ogs6 added.

commit a308af8d4467d2371ec03859403477579dd1dc8e
Author: Lars Bilke <lars.bilke@ufz.de>
Date:   Thu Nov 17 10:18:10 2011 +0100

    New build script wip.

commit a7e39078b35bb0cd62f13d0a84d171c4a04617ea
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Tue Nov 15 18:10:00 2011 +0100

    problem finally fixed ... reintroducing some of the previous changes

commit a173c97ed3861e9953595ba2878684c84dcba669
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Tue Nov 15 17:47:21 2011 +0100

    i am running out of ideas

commit 3b9d4db7021d46317bf06872b3ff3817d8f0acbf
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Tue Nov 15 17:40:34 2011 +0100

    removed some more changes

commit 3f0a19f26b7942e97a5690d49489c4063c769763
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Tue Nov 15 17:29:54 2011 +0100

    (hopefully) removed problem that causes unit tests to crash

commit a8be05a0d9aea4c4b7c083c1a770c13a541e50fa
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Tue Nov 15 17:06:17 2011 +0100

    error in xmlinterface resolved

commit eedb5afe48dbedf76a8541ed880509ec97854dd0
Merge: c9c20c4 ecaa84b
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Tue Nov 15 16:46:15 2011 +0100

    resolved conflict in XMLInterface

commit c9c20c49daaabe13b8b1ed2913a424025e9f5892
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Tue Nov 15 16:43:25 2011 +0100

    redesigned xml cond-fileformat and started adapting sourcesfor a different process-oriented model for data handling in GUI

commit ecaa84bd68d3499a2b71622b43b0f7f7cc57e06b
Merge: 3eeb7de ac2f440
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Fri Nov 11 13:07:26 2011 +0100

    Merge branch 'ff' of 141.65.6.106:ogs_sources into ff

commit 3eeb7dea3236fc575e89487a1f70c74a7458f968
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Fri Nov 11 13:03:31 2011 +0100

    fixed some compile errors since a the namespace FiniteElement was expanded for some enums and functions

commit 05be9464e6a07a81f4adceeda4468d23ed048a8b
Merge: cda4e9f be7b598
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Fri Nov 11 12:59:29 2011 +0100

    Merge branch 'ff' of 141.65.6.106:ogs_sources into ff

    Conflicts:
    	FEM/FEMCondition.cpp
    	FEM/FEMCondition.h
    	FEM/FEMEnums.cpp
    	FEM/FEMEnums.h
    	FileIO/XMLInterface.cpp

commit ac2f44066cc3f1a5bd27f29cd11abeb25b412c24
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Fri Nov 11 11:46:56 2011 +0100

    fixed a few (regular) warning

commit a0a1a50ab32ff41eeb5d574b34d530615dcaecf2
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Fri Nov 11 11:12:14 2011 +0100

    removed several conversion warnings

commit be7b5987158c100a358d936b3d962ed0c40868f7
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Fri Nov 11 10:39:16 2011 +0100

    (hopefully) finished renaming process

commit a6dab3c80dcf3f9981d09106ee0fc4b9aeb34b06
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Fri Nov 11 10:23:14 2011 +0100

    second part of renaming process

commit 1b6eb93ab07e4c31e65fc19c2315af3004f13df0
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Fri Nov 11 09:52:33 2011 +0100

    Renamed condition model related files to process model

commit f0836b7a615765ca71d253e0fdfa2bba33060c9d
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Thu Nov 10 11:54:36 2011 +0100

    Added functionality to create FEMConditions in GUI

commit cda4e9f5677a22952e3274848ace921497986aba
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Thu Nov 10 10:48:43 2011 +0100

    moved enums ProcessType and PrimaryVariable into namespace FiniteElement

commit fb73e16d6d1c3208e6d09c65b9f14d111cdef6b3
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Mon Nov 7 10:46:10 2011 +0100

    transformfilters are now used correctly in the vtkvispipelineitem class-hierarchy

commit 6672a1ede0c9c032c9dbc1be272815af871b2c25
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Fri Nov 4 12:45:28 2011 +0100

    fixed some warnings

commit 9c103b8b27cbdda49e177058aa5c871a90a372e2
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Fri Nov 4 11:34:07 2011 +0100

    added image/raster translation; added volume-support to geometry-xml-format

commit 973539e076b9b8e3b513a6de9904be74ea013f7d
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Thu Nov 3 12:47:24 2011 +0100

    optimized GeoTreeModel data insertion routines

commit 4d8a7748823c5294126c330f57766f4cd5f32d67
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Wed Nov 2 17:08:54 2011 +0100

    fixed linux-only syntax error ... the things i have to put up with ...

commit e2a96da7e859d07f65d53012fbfaff957c1135ee
Merge: 39f0f8c 77a98cc
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Wed Nov 2 15:51:03 2011 +0100

    Merge branch 'ff' of 141.65.6.106:ogs_sources into ff

commit 77a98cca10a16ff46d4a721a1bdc31c1d5716ec9
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Wed Nov 2 16:47:40 2011 +0100

    made MFPRead a friend of class CFluidProperties

commit b10b2498dd65bfa9ed324cc5bb63213f0bc0f16e
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Wed Nov 2 16:44:10 2011 +0100

    cleaned class CFluidProperties a little bit (removed some attributes, wrote some getters, ...)

commit 39f0f8c29d59395a712021b0a9108411894a4409
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Wed Nov 2 15:50:30 2011 +0100

    fixed bug in geotreeview context menu

commit 377c1146416a483866b35fe924bff340d83b7148
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Wed Nov 2 10:20:14 2011 +0100

    removed some code that was uncommented

commit 5bda38066ca06163aa8835627a77ee9a9f7d3772
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Wed Nov 2 10:14:20 2011 +0100

    - fixed warnings in FEM/rf_kinreact.cpp, Qt/DataView/GEOModels.cpp and Qt/DataView/GeoTreeModel.cpp
    - derived PointVec from TemplateVec<Point>

commit 646fec6bddc45b1a80f87013d0ab5c3bbf6953cc
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Tue Nov 1 16:34:24 2011 +0100

    added another case for reading geometric type DOMAIN in GeoType.cpp in function convertGeoType()

commit 094fcd8c1fb22a0f58995f4bb2326359b1224e00
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Tue Nov 1 14:00:38 2011 +0100

    fixed small bugs

commit e46fd128c53bda8b3b1e9ea7b2ea3d3eb6a1af61
Merge: d0088db 0cf4f3d
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Tue Nov 1 13:27:08 2011 +0100

    Merge branch 'ff' of 141.65.6.106:ogs_sources into ff

commit d0088db8bae228501881ce728afe6d5f4d3c2d24
Merge: 2880e48 a6660e6
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Tue Nov 1 13:25:14 2011 +0100

    Merge branch 'ff' of 141.65.6.106:ogs_sources into ff

commit 2880e48c74ee05cd6767a76a599454abfc51d99e
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Tue Nov 1 13:24:54 2011 +0100

    removed a warning in problem

commit 829be8b05a749d06211572fc8aef9b5623ac4d16
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Tue Nov 1 12:58:10 2011 +0100

    class CMediumProperties
    - changed the name and the type of attribute geo_name_type (string) to _geo_type (GEOLIB::GEOTYPE enum) and made the attribute private

    tools
    - uncommented an unused function

    msh_lib
    - changed access to the former public attribute geo_name_type of class CMediumProperties

commit 0cf4f3d7853dde00265e1d6c0082fdb1b3522cdb
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Tue Nov 1 12:27:01 2011 +0100

    added missing files

commit a6660e626bd417f24fc51dd140e959dcd6463883
Merge: 01dc021 829be8b
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Tue Nov 1 12:09:25 2011 +0100

    Merge branch 'ff' of 141.65.6.106:ogs_sources into ff

commit 01dc02181b3b26f9139f8491e4f90fa58fb151f3
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Tue Nov 1 12:08:09 2011 +0100

    names for geo-objects can new be changed from gui

commit a9d3a95bad55dbedfb71164fd8f9eb79eb742188
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Mon Oct 24 15:40:44 2011 +0200

    fixed missing std-specifier in problem.cpp

commit 7398baaf82c2c915d2af2f52f876125b1458a800
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Mon Oct 24 15:18:28 2011 +0200

    some more changes to properties

commit 7eb9651be45dce4f2febc8fbc6af8a0125a771a7
Merge: 1dc27ab 40f1f49
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Mon Oct 24 14:40:51 2011 +0200

    Merge branch 'ff' of 141.65.6.106:ogs_sources into ff

commit 1dc27ab773d0ab2fe8e74a5c3f0df0363d3b560c
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Mon Oct 24 14:40:12 2011 +0200

    small changes to property-classes

commit 40f1f491aa1ed62001be7ee0b504fbd771f6f3db
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Mon Oct 24 13:27:25 2011 +0200

    - fixed a bug in binarySearch for double values
    - together with NB: changed algorithm for searching and interpolating
      in GetMatrixValue

commit 7e6437a77f5b77e16b38c9b85e39f1bf5269a807
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Mon Oct 24 12:36:23 2011 +0200

    - moved some functions out of file rf_pcs.cpp to eos.cpp
    - made attibute m_msh of class CMediumProperties private
    - remove a temporary variable of class CMediumProperties
    - made attribute geo_dimension of class CMediumProperties private

commit db1abe1a54f04280778ed7c1686666fc3c6fc111
Merge: ab93755 da295c7
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Tue Oct 18 12:28:55 2011 +0200

    Merge branch 'ff' of 141.65.6.106:ogs_sources into ff

commit ab93755870d5c4d5495f16d9775634e1071302a6
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Tue Oct 18 12:28:23 2011 +0200

    some documentation

commit da295c735d174374543368483bdf98ccc48f70ef
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Fri Oct 14 13:49:20 2011 +0200

    - fixed issue concerning mesh generation
    - fixed a bug while loading a gmsh mesh

commit c1fd11bd33b8603f052f52dbbe7b7cb360fbd7eb
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Fri Oct 14 10:14:58 2011 +0200

    enabled benchmarks from JOD (former YW)

commit 763039ac6c4098547c2fc5fcbd14fb67d1167da7
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Thu Oct 13 11:12:04 2011 +0200

    removed all code enclosed in #ifdef RFW_FRACTURE ... #endif in files rf_mmp_new.{h,cpp}

commit 5bc6ee9eb9e2f766c6a694188df27d49faeb2ee5
Merge: 04b7932 1ae3c19
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Thu Oct 13 08:13:35 2011 +0200

    Merge branch 'ff' of 141.65.6.106:ogs_sources into ff

commit 04b793208c9504b2a7e020f9c0ef697777281a6d
Author: Thomas Fischer <thomas.fischer@ufz.de>
Date:   Thu Oct 13 08:10:09 2011 +0200

    removed 3 unused attributes (m_pcs, mfp_pcs, file_base_name) from class CFluidProperties

commit 1ae3c1971c0a52c8a80cb69331a83eb60d599355
Author: Karsten Rink <karsten.rink@ufz.de>
Date:   Wed Oct 12 12:08:15 2011 +0200

    added some comments

git-svn-id: https://svn.ufz.de/svn/ogs/trunk/sources@9926 3895a583-e809-0410-9bb6-aa9463026377
parent 6507faca
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 10 additions and 3 deletions
FindMSVCRedist.cmake
+ 10
− 3
View file @ f068b6d2
......@@ -5,6 +5,9 @@ IF (MSVC)
if (MSVC90)
set(VCVERS 9)
endif()
if (MSVC10)
set(VCVERS 10)
endif()
IF(CMAKE_CL_64)
#IF(MSVC_VERSION GREATER 1599)
......@@ -23,19 +26,23 @@ IF (MSVC)
set(SDKVERS "2.0")
endif()
if(${VCVERS} EQUAL 9)
set(SDKVERS "3.5")
set(SDKVERS "v6.0A")
endif()
if(${VCVERS} EQUAL 10)
set(SDKVERS "v7.0A")
endif()
IF(MSVC${VCVERS}0)
IF(MSVC${VCVERS}0 OR MSVC${VCVERS})
FIND_PROGRAM(MSVC_REDIST NAMES
vcredist_${CMAKE_MSVC_ARCH}/vcredist_${CMAKE_MSVC_ARCH}.exe
PATHS
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VCExpress\\${VCVERS}.0;InstallDir]/../../SDK/v${SDKVERS}/BootStrapper/Packages/"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\${VCVERS}.0;InstallDir]/../../SDK/v${SDKVERS}/BootStrapper/Packages/"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\VisualStudio\\${VCVERS}.0;InstallDir]/../../SDK/v${SDKVERS}/BootStrapper/Packages/"
"C:/Program Files (x86)/Microsoft SDKs/Windows/${SDKVERS}/Bootstrapper/Packages/"
)
GET_FILENAME_COMPONENT(vcredist_name "${MSVC_REDIST}" NAME)
INSTALL(PROGRAMS ${MSVC_REDIST} COMPONENT msvc_redist DESTINATION bin)
SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "ExecWait '\\\"$INSTDIR\\\\bin\\\\${vcredist_name}\\\"'")
message(STATUS "MSVC_REDIST: ${MSVC_REDIST}")
ENDIF(MSVC${VCVERS}0)
ENDIF(MSVC${VCVERS}0 OR MSVC${VCVERS})
ENDIF ()
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment