Skip to content

Commit

Permalink
Add vtkGeoTransform patch (#19233) (#19238)
Browse files Browse the repository at this point in the history
* Add patch for vtkGeoTransform.
Fixes regressions with CartographicProjection operator due to VTK 9 port.
Removed cart_proj.py tests from skip list and updated 1 baseline due to minor pixel diffs.

Also built 3.4.1 third party libs on CZ for toss4.
Updated poodle config-site to use the new path and mfem 4.6.

* Update release notes.
  • Loading branch information
biagas committed Jan 13, 2024
1 parent 38b657b commit b76a2d6
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 7 deletions.
4 changes: 2 additions & 2 deletions src/config-site/poodle18.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
##
## Setup VISITHOME & VISITARCH variables.
##
SET(VISITHOME /usr/workspace/wsa/visit/visit/thirdparty_shared/3.4.0/toss4)
SET(VISITHOME /usr/workspace/wsa/visit/visit/thirdparty_shared/3.4.1/toss4)
SET(VISITARCH linux-x86_64_gcc-10.3)
VISIT_OPTION_DEFAULT(VISIT_SLIVR TRUE TYPE BOOL)

Expand Down Expand Up @@ -192,7 +192,7 @@ VISIT_OPTION_DEFAULT(VISIT_ICET_DIR ${VISITHOME}/icet/77c708f9090236b576669b74c5
##
## MFEM
##
VISIT_OPTION_DEFAULT(VISIT_MFEM_DIR ${VISITHOME}/mfem/4.4/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_MFEM_DIR ${VISITHOME}/mfem/4.6/${VISITARCH})
VISIT_OPTION_DEFAULT(VISIT_MFEM_INCDEP CONDUIT_INCLUDE_DIR FMS_INCLUDE_DIR TYPE STRING)
VISIT_OPTION_DEFAULT(VISIT_MFEM_LIBDEP ${VISIT_CONDUIT_LIBDEP} ${VISITHOME}/zlib/${ZLIB_VERSION}/${VISITARCH}/lib z TYPE STRING)

Expand Down
1 change: 1 addition & 0 deletions src/resources/help/en_US/relnotes3.4.1.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
<li>Fixed a Volume plot but that would cause the parallel engine to crash when certain operators were used in conjunction with the plot.</li>
<li>Fixed a Cube reader bug that didn't read in multiple orbital data files correctly.</li>
<li>Fixed a bug with the Expression window that caused the 'Python' editor to be the default tab when the window was first opened.</li>
<li>Fixed a bug with the Cartographic Projection operator where the projections were a no-op.</li>
</ul>

<a name="Enhancements"></a>
Expand Down
3 changes: 0 additions & 3 deletions src/test/skip.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
{"category":"simulation","file":"zerocopy.py","cases":["zerocopy02"]},
{"category":"quickrecipes","file":"how_to_start.py"},
{"category":"quickrecipes","file":"opening_compute_engine.py"},
{"category":"operators","file":"cart_proj.py","cases":["ops_cart_proj_1","ops_cart_proj_3"]},
{"category":"operators","file":"dual_mesh.py","cases":["ops_dualmesh_mesh_plot_2d_01"]},
{"category":"plots","file":"volumePlot.py","cases":["volumeOpacity_05"]},
{"category":"queries","file":"avg_value.py","cases":["avg_value_02"]},
Expand Down Expand Up @@ -66,7 +65,6 @@
{"category":"simulation","file":"zerocopy.py","cases":["zerocopy02"]},
{"category":"quickrecipes","file":"how_to_start.py"},
{"category":"quickrecipes","file":"opening_compute_engine.py"},
{"category":"operators","file":"cart_proj.py","cases":["ops_cart_proj_1","ops_cart_proj_3"]},
{"category":"operators","file":"dual_mesh.py","cases":["ops_dualmesh_mesh_plot_2d_01"]},
{"category":"plots","file":"volumePlot.py","cases":["volumeOpacity_05"]},
{"category":"queries","file":"avg_value.py","cases":["avg_value_02"]},
Expand Down Expand Up @@ -123,7 +121,6 @@
{"category":"simulation","file":"zerocopy.py","cases":["zerocopy02"]},
{"category":"quickrecipes","file":"how_to_start.py"},
{"category":"quickrecipes","file":"opening_compute_engine.py"},
{"category":"operators","file":"cart_proj.py","cases":["ops_cart_proj_1","ops_cart_proj_3"]},
{"category":"operators","file":"dual_mesh.py","cases":["ops_dualmesh_mesh_plot_2d_01"]},
{"category":"plots","file":"volumePlot.py","cases":["volumeOpacity_05"]},
{"category":"queries","file":"avg_value.py","cases":["avg_value_02"]},
Expand Down
31 changes: 31 additions & 0 deletions src/tools/dev/scripts/bv_support/bv_vtk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1122,6 +1122,32 @@ EOF
fi
}

function apply_vtk9_vtkgeotransform_patch
{
# patch vtk's vtkGeoTransform (patch taken from 9.3)
# can be removed when version changed to >= 9.3

patch -p0 << \EOF
--- Geovis/Core/vtkGeoTransform.cxx.orig 2024-01-10 10:22:40.143031000 -0800
+++ Geovis/Core/vtkGeoTransform.cxx 2024-01-10 10:22:49.698983000 -0800
@@ -212,7 +212,7 @@
#if PROJ_VERSION_MAJOR >= 5
c.lp.lam = coord[0];
c.lp.phi = coord[1];
- c_out = proj_trans(src, PJ_FWD, c);
+ c_out = proj_trans(dst, PJ_FWD, c);
coord[0] = c_out.xy.x;
coord[1] = c_out.xy.y;
#else
EOF

if [[ $? != 0 ]] ; then
warn "vtk patch for vtkGeoTransform failed."
return 1
fi
return 0;
}

function apply_vtk8_vtkxopenglrenderwindow_patch
{
# patch vtk's vtkXOpenRenderWindow to fix segv when deleting windows in
Expand Down Expand Up @@ -2543,6 +2569,11 @@ function apply_vtk_patch
return 1
fi

apply_vtk9_vtkgeotransform_patch
if [[ $? != 0 ]] ; then
return 1
fi

else
apply_vtk8_vtkdatawriter_patch
if [[ $? != 0 ]] ; then
Expand Down
4 changes: 2 additions & 2 deletions test/baseline/operators/cart_proj/ops_cart_proj_1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit b76a2d6

Please sign in to comment.