mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-05 09:50:04 +08:00
9e36a44338
* [cgns] update to 4.2.0 * [vtk-m] update to 1.6.0 * [vtk] Update to 9.0.1-pv5.9.1 - VTK update to match release version of ParaView * [ParaView] Update to 5.9.1 * version stuff * fix automatic svg linkage in static builds * update qt5-svg * revisit vtk - fix build with vtk-m 1.6 - remove unused patches - remove comments * bump version * remove two commented lines * version stuff * remove old PR version * commit stuff * commit stuff * update notes * wip commit * update paraview * fix hdf5 patch * fix patch * fix patch * fix portfile * add mpi feature * format manifest * use relativ path * trace * retry * move qml files again * try with host triplet * - use VCPKG_CRT_LINKAGE - use METIS not metis * fix casing Zlib * hopefully more fixes on other platforms. * fix patch * fix missing ws * fix typos * scale down to warning * revert jsoncpp change fix zoltan on osx? * move trace option to failing port * move trace option to failing port * Revert "trilinos vcpkg.json changes" * verdict fix osx build ? * fix patch * fix internal find_package call * also apply correct case for metis * disable METIS on osx * vtk-m don't support arm. * force more features in Ci * fix missing , * more fixes * more vtk python try and error. * - paraview python setup same as vtk - remove openvr from platforms not supporting it - trace openimageio * fix case and remove fmt for openimageio. * trying to fix stuff * set hash to 0 * [skip actions] add missing module * WebCore module moved to paraview&python * fixes * remove patch in vtk-dicom * add var to maybe unused * use correct 5.11 ref instead of the one in release * Patch cleanup round 1 * remove empty patch parts * fix vtkm configs * reintegrate jsoncpp.patch * fix patch * add single seacas/kokkos/zoltan ports * throw out trilinos, zoltan, kokkos replace trilinos with seacas make seacas work for dynamic windows * fix mpi feature * fix dependency * retry dep fix * rename target * remove double line * fix target * fix patch * retry * remove cgns config * fix cgns * no seacas trace * lowercase hdf5 target * fix case of metis * disable Fortran * add iotr patch * add additional config folder * handel case sensitive Seacas again * get trace again and force jsoncpp * update cmake to 3.25.0 * bump port-version * add patch from vtk upstream * cleanup, format-manifest * fix port version * v db * opencv4 always inject deps. * fix test port to not require stuff which is not supported on x86 * Fix HDF5 lookup in opencv4 * only delete bin folder in static builds * add license field * v db * add missing " * v db * trace again * fix rtabmap python dep * fix openimageio by deleting the find module * v db * cr cleanup * v db * opencv4 v db due to merge with master. Had to bump port version * v db * v db * v db * CR comments * v db for cr comments * trace theia output * revert theia trace * v db * try without patch * revert rtabmap changes * v db after merge * v db for all
126 lines
5.4 KiB
Diff
126 lines
5.4 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index c41d98f70..83f7ca27a 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -53,7 +53,7 @@ configure_file(
|
|
add_library(verdict ${verdict_SOURCES})
|
|
target_include_directories(verdict PUBLIC
|
|
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}> $<INSTALL_INTERFACE:include>)
|
|
-
|
|
+target_compile_features(verdict PUBLIC cxx_std_11)
|
|
|
|
# Setting the VERSION and SOVERSION of a library will include
|
|
# version information either in the library, or in the library
|
|
diff --git a/V_HexMetric.cpp b/V_HexMetric.cpp
|
|
index 6ba32fa86..5fd976321 100644
|
|
--- a/V_HexMetric.cpp
|
|
+++ b/V_HexMetric.cpp
|
|
@@ -2974,10 +2974,10 @@ double hex_distortion(int num_nodes, const double coordinates[][3])
|
|
double weight[maxTotalNumberGaussPoints];
|
|
|
|
// create an object of GaussIntegration
|
|
- GaussIntegration gint{};
|
|
- gint.initialize(number_of_gauss_points, num_nodes, number_dimension);
|
|
- gint.calculate_shape_function_3d_hex();
|
|
- gint.get_shape_func(shape_function[0], dndy1[0], dndy2[0], dndy3[0], weight);
|
|
+ GaussIntegration gaussint;
|
|
+ gaussint.initialize(number_of_gauss_points, num_nodes, number_dimension);
|
|
+ gaussint.calculate_shape_function_3d_hex();
|
|
+ gaussint.get_shape_func(shape_function[0], dndy1[0], dndy2[0], dndy3[0], weight);
|
|
|
|
VerdictVector xxi, xet, xze, xin;
|
|
|
|
@@ -3014,7 +3014,7 @@ double hex_distortion(int num_nodes, const double coordinates[][3])
|
|
double dndy2_at_node[maxNumberNodes][maxNumberNodes];
|
|
double dndy3_at_node[maxNumberNodes][maxNumberNodes];
|
|
|
|
- gint.calculate_derivative_at_nodes_3d(dndy1_at_node, dndy2_at_node, dndy3_at_node);
|
|
+ gaussint.calculate_derivative_at_nodes_3d(dndy1_at_node, dndy2_at_node, dndy3_at_node);
|
|
int node_id;
|
|
for (node_id = 0; node_id < num_nodes; node_id++)
|
|
{
|
|
diff --git a/V_QuadMetric.cpp b/V_QuadMetric.cpp
|
|
index 0c7c508e0..8e8a2537e 100644
|
|
--- a/V_QuadMetric.cpp
|
|
+++ b/V_QuadMetric.cpp
|
|
@@ -1329,10 +1329,10 @@ double quad_distortion(int num_nodes, const double coordinates[][3])
|
|
double weight[maxTotalNumberGaussPoints];
|
|
|
|
// create an object of GaussIntegration
|
|
- GaussIntegration gint{};
|
|
- gint.initialize(number_of_gauss_points, num_nodes);
|
|
- gint.calculate_shape_function_2d_quad();
|
|
- gint.get_shape_func(shape_function[0], dndy1[0], dndy2[0], weight);
|
|
+ GaussIntegration gaussint;
|
|
+ gaussint.initialize(number_of_gauss_points, num_nodes);
|
|
+ gaussint.calculate_shape_function_2d_quad();
|
|
+ gaussint.get_shape_func(shape_function[0], dndy1[0], dndy2[0], weight);
|
|
|
|
// calculate element area
|
|
int ife, ja;
|
|
@@ -1355,7 +1355,7 @@ double quad_distortion(int num_nodes, const double coordinates[][3])
|
|
double dndy1_at_node[maxNumberNodes][maxNumberNodes];
|
|
double dndy2_at_node[maxNumberNodes][maxNumberNodes];
|
|
|
|
- gint.calculate_derivative_at_nodes(dndy1_at_node, dndy2_at_node);
|
|
+ gaussint.calculate_derivative_at_nodes(dndy1_at_node, dndy2_at_node);
|
|
|
|
VerdictVector normal_at_nodes[9];
|
|
|
|
diff --git a/V_TetMetric.cpp b/V_TetMetric.cpp
|
|
index feb026968..dc956edb0 100644
|
|
--- a/V_TetMetric.cpp
|
|
+++ b/V_TetMetric.cpp
|
|
@@ -1354,10 +1354,10 @@ double tet_distortion(int num_nodes, const double coordinates[][3])
|
|
double weight[maxTotalNumberGaussPoints];
|
|
|
|
// create an object of GaussIntegration for tet
|
|
- GaussIntegration gint{};
|
|
- gint.initialize(number_of_gauss_points, num_nodes, number_dims, is_tri);
|
|
- gint.calculate_shape_function_3d_tet();
|
|
- gint.get_shape_func(shape_function[0], dndy1[0], dndy2[0], dndy3[0], weight);
|
|
+ GaussIntegration gaussint;
|
|
+ gaussint.initialize(number_of_gauss_points, num_nodes, number_dims, is_tri);
|
|
+ gaussint.calculate_shape_function_3d_tet();
|
|
+ gaussint.get_shape_func(shape_function[0], dndy1[0], dndy2[0], dndy3[0], weight);
|
|
|
|
// vector xxi is the derivative vector of coordinates w.r.t local xi coordinate in the
|
|
// computation space
|
|
@@ -1402,7 +1402,7 @@ double tet_distortion(int num_nodes, const double coordinates[][3])
|
|
double dndy2_at_node[maxNumberNodes][maxNumberNodes];
|
|
double dndy3_at_node[maxNumberNodes][maxNumberNodes];
|
|
|
|
- gint.calculate_derivative_at_nodes_3d_tet(dndy1_at_node, dndy2_at_node, dndy3_at_node);
|
|
+ gaussint.calculate_derivative_at_nodes_3d_tet(dndy1_at_node, dndy2_at_node, dndy3_at_node);
|
|
int node_id;
|
|
for (node_id = 0; node_id < num_nodes; node_id++)
|
|
{
|
|
diff --git a/V_TriMetric.cpp b/V_TriMetric.cpp
|
|
index 2fb5c37e8..71c16bea7 100644
|
|
--- a/V_TriMetric.cpp
|
|
+++ b/V_TriMetric.cpp
|
|
@@ -664,10 +664,10 @@ double tri_distortion(int num_nodes, const double coordinates[][3])
|
|
// create an object of GaussIntegration
|
|
int number_dims = 2;
|
|
int is_tri = 1;
|
|
- GaussIntegration gint{};
|
|
- gint.initialize(number_of_gauss_points, num_nodes, number_dims, is_tri);
|
|
- gint.calculate_shape_function_2d_tri();
|
|
- gint.get_shape_func(shape_function[0], dndy1[0], dndy2[0], weight);
|
|
+ GaussIntegration gaussint;
|
|
+ gaussint.initialize(number_of_gauss_points, num_nodes, number_dims, is_tri);
|
|
+ gaussint.calculate_shape_function_2d_tri();
|
|
+ gaussint.get_shape_func(shape_function[0], dndy1[0], dndy2[0], weight);
|
|
|
|
// calculate element area
|
|
int ife, ja;
|
|
@@ -691,7 +691,7 @@ double tri_distortion(int num_nodes, const double coordinates[][3])
|
|
double dndy1_at_node[maxNumberNodes][maxNumberNodes];
|
|
double dndy2_at_node[maxNumberNodes][maxNumberNodes];
|
|
|
|
- gint.calculate_derivative_at_nodes_2d_tri(dndy1_at_node, dndy2_at_node);
|
|
+ gaussint.calculate_derivative_at_nodes_2d_tri(dndy1_at_node, dndy2_at_node);
|
|
|
|
VerdictVector normal_at_nodes[7];
|
|
|