Skip to content

[FEFLOW] fix a bug that a property vector was not allocated before use#1397

Merged
norihiro-w merged 3 commits intoufz:masterfrom
norihiro-w:fix-FEFLOW-import
Sep 14, 2016
Merged

[FEFLOW] fix a bug that a property vector was not allocated before use#1397
norihiro-w merged 3 commits intoufz:masterfrom
norihiro-w:fix-FEFLOW-import

Conversation

@norihiro-w
Copy link
Copy Markdown
Collaborator

@norihiro-w norihiro-w commented Sep 13, 2016

follow up of #1400. fix #1395

@TomFischer
Copy link
Copy Markdown
Member

TomFischer commented Sep 13, 2016

Thanks for fixing the bug. Could you please provide a tiny example for our test suite?

👍

@norihiro-w
Copy link
Copy Markdown
Collaborator Author

I added an example in ufz/ogs-data#24, which is also used in the new test

@norihiro-w
Copy link
Copy Markdown
Collaborator Author

@fabienma can you please test this PR with your example?

@norihiro-w
Copy link
Copy Markdown
Collaborator Author

TODO: update the submodule Data

@fabienma
Copy link
Copy Markdown

file for test. Current version ogs-6.0.6-513-g51eaa5f- crashes when importing the FEM file
feflw_import_test.zip

@norihiro-w
Copy link
Copy Markdown
Collaborator Author

norihiro-w commented Sep 13, 2016

it works on my pc. The version you tested is latest in master branch but is not including my modifications yet.
screen

@ogsbot
Copy link
Copy Markdown
Member

ogsbot commented Sep 14, 2016

Jenkins: OGS-6/Gui/Mac-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Gui/job/Mac-PRs/2714/

@ogsbot
Copy link
Copy Markdown
Member

ogsbot commented Sep 14, 2016

Jenkins: OGS-6/Gui/Mac-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Gui/job/Mac-PRs/2715/

@norihiro-w
Copy link
Copy Markdown
Collaborator Author

The Jenkins error on Mac is below and is not caused by this PR. maybe @bilke is changing something there

In file included from /Users/jenkins/workspace/OGS-6/Gui/Mac-PRs/ogs/Applications/DataExplorer/DataView/DirectConditionGenerator.cpp:22:
In file included from /Users/jenkins/workspace/OGS-6/Gui/Mac-PRs/ogs/Applications/FileIO/AsciiRasterInterface.h:20:
In file included from /usr/local/include/boost/optional.hpp:15:
In file included from /usr/local/include/boost/optional/optional.hpp:1035:
/usr/local/include/boost/optional/detail/optional_reference_spec.hpp:97:78: error: 'ptr_' is a private member of 'boost::optional<MeshLib::PropertyVector<int> &>'
        explicit optional(const optional<U&>& rhs) BOOST_NOEXCEPT : ptr_(rhs.ptr_) {}
                                                                             ^
/Users/jenkins/workspace/OGS-6/Gui/Mac-PRs/ogs/Applications/DataExplorer/DataView/DirectConditionGenerator.cpp:100:58: note: in instantiation of function template specialization 'boost::optional<const MeshLib::PropertyVector<int> &>::optional<MeshLib::PropertyVector<int> >' requested here
    boost::optional<MeshLib::PropertyVector<int> const&> opt_node_id_pv(
                                                         ^
/usr/local/include/boost/optional/detail/optional_reference_spec.hpp:83:8: note: implicitly declared private here
    T* ptr_;
       ^
1 error generated.

@endJunction
Copy link
Copy Markdown
Member

@norihiro-w The last error look like those fixed in #1383
The optional<T const&> is no longer valid. I changed it to optional<T&> const.

@bilke
Copy link
Copy Markdown
Member

bilke commented Sep 14, 2016

@norihiro-w See #1401.

@norihiro-w
Copy link
Copy Markdown
Collaborator Author

@bilke thanks

@norihiro-w norihiro-w merged commit 62de5d8 into ufz:master Sep 14, 2016
@norihiro-w norihiro-w deleted the fix-FEFLOW-import branch September 14, 2016 10:41
@ogsbot
Copy link
Copy Markdown
Member

ogsbot commented Jun 19, 2020

OpenGeoSys development has been moved to GitLab.

See this pull request on GitLab.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Data_explorer: FEFLOW IMPORT CRASHES

6 participants