From 2eb125d8937bb05ab5dfdee5b0109a002f0c3bf7 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Wed, 12 Oct 2022 16:18:56 -0400 Subject: [PATCH] change warning message and get the comm cutoff properly --- src/GPU/pair_sw_gpu.cpp | 4 ++-- src/GPU/pair_tersoff_gpu.cpp | 4 ++-- src/GPU/pair_tersoff_mod_gpu.cpp | 4 ++-- src/GPU/pair_tersoff_zbl_gpu.cpp | 4 ++-- src/GPU/pair_vashishta_gpu.cpp | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/GPU/pair_sw_gpu.cpp b/src/GPU/pair_sw_gpu.cpp index b6ac3feca2..4918ef8db8 100644 --- a/src/GPU/pair_sw_gpu.cpp +++ b/src/GPU/pair_sw_gpu.cpp @@ -219,10 +219,10 @@ void PairSWGPU::init_style() if (gpu_mode == GPU_FORCE) neighbor->add_request(this, NeighConst::REQ_FULL | NeighConst::REQ_GHOST); - if (comm->cutghostuser < (2.0 * cutmax + neighbor->skin)) { + if (comm->get_comm_cutoff() < (2.0 * cutmax + neighbor->skin)) { comm->cutghostuser = 2.0 * cutmax + neighbor->skin; if (comm->me == 0) - error->warning(FLERR, "Increasing communication cutoff to {:.3} for GPU pair style", + error->warning(FLERR, "Increasing communication cutoff to {:.8} for GPU pair style", comm->cutghostuser); } } diff --git a/src/GPU/pair_tersoff_gpu.cpp b/src/GPU/pair_tersoff_gpu.cpp index 6fd98d50d5..360b95debf 100644 --- a/src/GPU/pair_tersoff_gpu.cpp +++ b/src/GPU/pair_tersoff_gpu.cpp @@ -223,10 +223,10 @@ void PairTersoffGPU::init_style() if (gpu_mode == GPU_FORCE) neighbor->add_request(this, NeighConst::REQ_FULL | NeighConst::REQ_GHOST); - if (comm->cutghostuser < (2.0 * cutmax + neighbor->skin)) { + if (comm->get_comm_cutoff() < (2.0 * cutmax + neighbor->skin)) { comm->cutghostuser = 2.0 * cutmax + neighbor->skin; if (comm->me == 0) - error->warning(FLERR, "Increasing communication cutoff to {:.3} for GPU pair style", + error->warning(FLERR, "Increasing communication cutoff to {:.8} for GPU pair style", comm->cutghostuser); } } diff --git a/src/GPU/pair_tersoff_mod_gpu.cpp b/src/GPU/pair_tersoff_mod_gpu.cpp index b0776be074..5623720494 100644 --- a/src/GPU/pair_tersoff_mod_gpu.cpp +++ b/src/GPU/pair_tersoff_mod_gpu.cpp @@ -221,10 +221,10 @@ void PairTersoffMODGPU::init_style() if (gpu_mode == GPU_FORCE) neighbor->add_request(this, NeighConst::REQ_FULL | NeighConst::REQ_GHOST); - if (comm->cutghostuser < (2.0 * cutmax + neighbor->skin)) { + if (comm->get_comm_cutoff() < (2.0 * cutmax + neighbor->skin)) { comm->cutghostuser = 2.0 * cutmax + neighbor->skin; if (comm->me == 0) - error->warning(FLERR, "Increasing communication cutoff to {:.3} for GPU pair style", + error->warning(FLERR, "Increasing communication cutoff to {:.8} for GPU pair style", comm->cutghostuser); } } diff --git a/src/GPU/pair_tersoff_zbl_gpu.cpp b/src/GPU/pair_tersoff_zbl_gpu.cpp index 87e716d0bc..fa3f8be9e1 100644 --- a/src/GPU/pair_tersoff_zbl_gpu.cpp +++ b/src/GPU/pair_tersoff_zbl_gpu.cpp @@ -239,10 +239,10 @@ void PairTersoffZBLGPU::init_style() if (gpu_mode == GPU_FORCE) neighbor->add_request(this, NeighConst::REQ_FULL | NeighConst::REQ_GHOST); - if (comm->cutghostuser < (2.0 * cutmax + neighbor->skin)) { + if (comm->get_comm_cutoff() < (2.0 * cutmax + neighbor->skin)) { comm->cutghostuser = 2.0 * cutmax + neighbor->skin; if (comm->me == 0) - error->warning(FLERR, "Increasing communication cutoff to {:.3} for GPU pair style", + error->warning(FLERR, "Increasing communication cutoff to {:.8} for GPU pair style", comm->cutghostuser); } } diff --git a/src/GPU/pair_vashishta_gpu.cpp b/src/GPU/pair_vashishta_gpu.cpp index d6a8fc77e9..868c95b287 100644 --- a/src/GPU/pair_vashishta_gpu.cpp +++ b/src/GPU/pair_vashishta_gpu.cpp @@ -218,10 +218,10 @@ void PairVashishtaGPU::init_style() if (gpu_mode == GPU_FORCE) neighbor->add_request(this, NeighConst::REQ_FULL | NeighConst::REQ_GHOST); - if (comm->cutghostuser < (2.0 * cutmax + neighbor->skin)) { + if (comm->get_comm_cutoff() < (2.0 * cutmax + neighbor->skin)) { comm->cutghostuser = 2.0 * cutmax + neighbor->skin; if (comm->me == 0) - error->warning(FLERR, "Increasing communication cutoff to {:.3} for GPU pair style", + error->warning(FLERR, "Increasing communication cutoff to {:.8} for GPU pair style", comm->cutghostuser); } }