Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[utils] netCDF converter #2654

Merged
merged 30 commits into from
Dec 9, 2019
Merged

[utils] netCDF converter #2654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
6a09d2a
work state with zlib linking error
rinkk Aug 29, 2019
c7974ef
[CMake] Fix netcdf linker on Win.
bilke Aug 29, 2019
b8893c4
adjusted code to work with netcdf-cxx4 library
rinkk Sep 2, 2019
bf465a8
replacing iterator + removing unused var
rinkk Sep 2, 2019
d15b67c
[Jenkins] Test netcdf config.
bilke Jul 19, 2019
4c65862
optimising fixed vector arguments
rinkk Sep 3, 2019
f93a5fb
fixed conversion error and warnings
rinkk Sep 5, 2019
87d7312
netcdf converter
rinkk Jan 6, 2017
b1bda1d
cli
rinkk Apr 10, 2017
6eb7135
updated netcdf cli to netcdf4-cxx
rinkk Sep 5, 2019
3a56403
seperating ui and algorithm
rinkk Sep 9, 2019
8fa517c
added command line parameters
rinkk Sep 10, 2019
1a79262
moving actual conversion into seperate function
rinkk Sep 10, 2019
e7aedb8
fixing mac warnings
rinkk Sep 11, 2019
3142ae6
fixing typos and removing unneccessary parenthesis, comparisions, ret…
rinkk Sep 23, 2019
aa268e1
separating fetching and displaying of variable name vector
rinkk Sep 23, 2019
0d20088
static functions + const params
rinkk Sep 23, 2019
177e386
adjusted return of dimensions and test for length = 0
rinkk Sep 23, 2019
079b0dc
fixing issue where app would crash when dimension where defined impli…
rinkk Sep 26, 2019
ba1af10
fixing first time step input not being tested for errors
rinkk Sep 26, 2019
0b70ee4
adjusted check for correct number of dimension params
rinkk Sep 27, 2019
1a126bf
added tests for netcdf to vtu conversion
rinkk Sep 27, 2019
0767df5
adjusted sequence of target link libraries
rinkk Oct 16, 2019
2197f57
temporarily switching netcdf off for mac
rinkk Nov 14, 2019
6843812
[Jenkins] Switched mac build back to full.
bilke Dec 4, 2019
f9f5495
[Conan] Bumped qt to 5.13.2
bilke Dec 5, 2019
0dae74f
[Jenkins] Updated Dockerfiles (bumped Conan).
bilke Dec 5, 2019
9c45a1e
[Jenkins] Ignore netcdf warning on gcc gui job.
bilke Dec 6, 2019
8e4d1d0
[Conan] Overwrite wrong dependency name in pcre package.
bilke Dec 6, 2019
3bbe055
[Conan] Disable qt harfbuzz dependency on win.
bilke Dec 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
*.pvtu* filter=lfs diff=lfs merge=lfs -text
*.gif filter=lfs diff=lfs merge=lfs -text
*.mp4 filter=lfs diff=lfs merge=lfs -text
*.nc filter=lfs diff=lfs merge=lfs -text
web/resources/_gen/**/*.content filter=lfs diff=lfs merge=lfs -text
# Gocad files
*.sg filter=lfs diff=lfs merge=lfs -text
Expand Down
12 changes: 8 additions & 4 deletions Applications/DataExplorer/NetCdfDialog/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,18 @@ if(BUILD_SHARED_LIBS)
endif()
target_link_libraries(NetCdfDialogLib
PUBLIC Qt5::Widgets
PRIVATE MathLib vtknetcdfcpp)
${NETCDF_LIBRARIES_CXX}
${NETCDF_LIBRARIES_C}
${HDF5_HL_LIBRARIES}
${HDF5_LIBRARIES}
PRIVATE MathLib)
set_property(TARGET NetCdfDialogLib PROPERTY FOLDER "DataExplorer")

# Workaround for system installed VTK (tested on arch)
if(NOT OGS_USE_CONAN)
target_include_directories(
NetCdfDialogLib SYSTEM
PUBLIC ${VTK_INSTALL_PREFIX}/include/vtk/vtknetcdfcpp)
target_include_directories(NetCdfDialogLib SYSTEM
PUBLIC ${NETCDF_INCLUDES_C}
PUBLIC ${NETCDF_INCLUDES_CXX})
endif()

add_autogen_include(NetCdfDialogLib)
66 changes: 3 additions & 63 deletions Applications/DataExplorer/NetCdfDialog/NetCdfConfigure.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,68 +167,6 @@
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QDateTimeEdit" name="dateTimeEditDim3">
<property name="minimumSize">
<size>
<width>110</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>110</width>
<height>16777215</height>
</size>
</property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="dateTime">
<datetime>
<hour>0</hour>
<minute>0</minute>
<second>0</second>
<year>1900</year>
<month>1</month>
<day>1</day>
</datetime>
</property>
<property name="date">
<date>
<year>1900</year>
<month>1</month>
<day>1</day>
</date>
</property>
<property name="maximumDateTime">
<datetime>
<hour>23</hour>
<minute>59</minute>
<second>59</second>
<year>2200</year>
<month>12</month>
<day>31</day>
</datetime>
</property>
<property name="minimumDateTime">
<datetime>
<hour>0</hour>
<minute>0</minute>
<second>0</second>
<year>1900</year>
<month>1</month>
<day>1</day>
</datetime>
</property>
<property name="displayFormat">
<string>dd.MM.yyyy</string>
</property>
<property name="calendarPopup">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="3">
<spacer name="horizontalSpacer_8">
<property name="orientation">
Expand All @@ -255,6 +193,9 @@
</property>
</spacer>
</item>
<item row="0" column="2">
<widget class="QSpinBox" name="dateTimeEditDim3"/>
</item>
</layout>
</widget>
</item>
Expand Down Expand Up @@ -720,7 +661,6 @@
<tabstop>doubleSpinBoxDim2Start</tabstop>
<tabstop>doubleSpinBoxDim2End</tabstop>
<tabstop>comboBoxDim3</tabstop>
<tabstop>dateTimeEditDim3</tabstop>
<tabstop>comboBoxDim4</tabstop>
<tabstop>spinBoxDim4</tabstop>
<tabstop>doubleSpinBoxResolution</tabstop>
Expand Down
Loading