From 795919e5761589a24ac7ae197c3887b3697c2059 Mon Sep 17 00:00:00 2001 From: Irina Tezaur Date: Sat, 24 Dec 2022 13:49:13 -0800 Subject: [PATCH] Revert "Attempt to fix build failure described in issue #879." This reverts commit 97930f4e5e8c52844a691a298ce497b8ed4b86d9. --- src/disc/stk/Albany_STKDiscretization.cpp | 6 +----- src/landIce/interfaceWithCISM/ali_driver.cpp | 3 +-- src/landIce/interfaceWithMPAS/Interface.cpp | 6 ++---- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/disc/stk/Albany_STKDiscretization.cpp b/src/disc/stk/Albany_STKDiscretization.cpp index 44cac505d4..39bdf9dbc9 100644 --- a/src/disc/stk/Albany_STKDiscretization.cpp +++ b/src/disc/stk/Albany_STKDiscretization.cpp @@ -2307,12 +2307,8 @@ STKDiscretization::setupExodusOutput() Ioss::Init::Initializer io; - Teuchos::Ptr > mpi_comm = - Teuchos::ptr_dynamic_cast >(Teuchos::ptrFromRef(*comm)); - auto raw_mpi_comm = mpi_comm->getRawMpiComm(); - mesh_data = Teuchos::rcp( - new stk::io::StkMeshIoBroker(*raw_mpi_comm)); + new stk::io::StkMeshIoBroker(getMpiCommFromTeuchosComm(comm))); mesh_data->set_bulk_data(Teuchos::get_shared_ptr(bulkData)); //IKT, 8/16/19: The following is needed to get correct output file for Schwarz problems //Please see: https://github.com/trilinos/Trilinos/issues/5479 diff --git a/src/landIce/interfaceWithCISM/ali_driver.cpp b/src/landIce/interfaceWithCISM/ali_driver.cpp index 576b46b254..d3c2e59d57 100644 --- a/src/landIce/interfaceWithCISM/ali_driver.cpp +++ b/src/landIce/interfaceWithCISM/ali_driver.cpp @@ -160,8 +160,7 @@ void ali_driver_init(int /* argc */, int /* exec_mode */, AliToGlimmer * ftg_ptr comm = MPI_Comm_f2c(cism_communicator); //MPI_COMM_size (comm, &cism_process_count); //MPI_COMM_rank (comm, &my_cism_rank); - //mpiCommT = Albany::createTeuchosCommFromMpiComm(comm); - mpiCommT = Teuchos::rcp(new Teuchos::MpiComm(Teuchos::opaqueWrapper(comm),1984)); + mpiCommT = Albany::createTeuchosCommFromMpiComm(comm); //IK, 4/4/14: get verbosity level specified in CISM *.config file debug_output_verbosity = *(ftg_ptr -> getLongVar("debug_output_verbosity","options")); diff --git a/src/landIce/interfaceWithMPAS/Interface.cpp b/src/landIce/interfaceWithMPAS/Interface.cpp index ce86804da6..a5649b8071 100644 --- a/src/landIce/interfaceWithMPAS/Interface.cpp +++ b/src/landIce/interfaceWithMPAS/Interface.cpp @@ -347,8 +347,7 @@ void velocity_solver_export_fo_velocity(MPI_Comm reducedComm) { } int velocity_solver_init_mpi(MPI_Comm comm) { - //mpiCommMPAS = Albany::createTeuchosCommFromMpiComm(comm); - mpiCommMPAS = Teuchos::rcp(new Teuchos::MpiComm(Teuchos::opaqueWrapper(comm),1984)); + mpiCommMPAS = Albany::createTeuchosCommFromMpiComm(comm); if(! Kokkos::is_initialized()) { Kokkos::initialize(); kokkosInitializedByAlbany = true; @@ -399,8 +398,7 @@ void velocity_solver_finalize() { void velocity_solver_compute_2d_grid(MPI_Comm reducedComm) { auto grid2DTimer = Teuchos::TimeMonitor(*Teuchos::TimeMonitor::getNewTimer("Albany: Compute 2D Grid")); keptMesh = false; - //mpiComm = Albany::createTeuchosCommFromMpiComm(reducedComm); - mpiComm = Teuchos::rcp(new Teuchos::MpiComm(Teuchos::opaqueWrapper(reducedComm),1984)); + mpiComm = Albany::createTeuchosCommFromMpiComm(reducedComm); } void velocity_solver_set_physical_parameters(double const& gravity, double const& ice_density, double const& ocean_density, double const& sea_level, double const& flowParamA, double const& flowLawExponent, double const& dynamic_thickness, bool const& use_GLP, double const& clausiusClapeyoronCoeff) {