Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

O

ogs
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

3be14529

Commit 3be14529 authored 2 years ago by Dmitri Naumov

Downloads
- Plain Diff

Merge branch '2dmImport' into 'master'

Adding support for 2dm files

See merge request ogs/ogs!4250

parents 1f65e061 a8dbbeb2

No related branches found

No related tags found

No related merge requests found

Changes 6

Expand all Hide whitespace changes

Inline Side-by-side

Showing

Applications/DataExplorer/Base/ImportFileTypes.h 2 additions, 2 deletions

Applications/DataExplorer/Base/ImportFileTypes.h
Applications/DataExplorer/mainwindow.cpp 4 additions, 4 deletions

Applications/DataExplorer/mainwindow.cpp
Applications/FileIO/GMSInterface.cpp 49 additions, 21 deletions

Applications/FileIO/GMSInterface.cpp
Applications/FileIO/GMSInterface.h 1 addition, 1 deletion

Applications/FileIO/GMSInterface.h
Tests/Data/FileIO/2DMeshData.2dm 18390 additions, 0 deletions

Tests/Data/FileIO/2DMeshData.2dm
Tests/FileIO/TestGmsInterface.cpp 22 additions, 2 deletions

Tests/FileIO/TestGmsInterface.cpp

with 18468 additions and 30 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment