From: David Wells Date: Mon, 23 May 2022 02:35:16 +0000 (-0400) Subject: Use 'greater than or equal to' instead of 'not less than'. X-Git-Tag: v9.4.0-rc1~158^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F13788%2Fhead;p=dealii.git Use 'greater than or equal to' instead of 'not less than'. --- diff --git a/source/sundials/kinsol.cc b/source/sundials/kinsol.cc index dd6796bdfc..97869c426b 100644 --- a/source/sundials/kinsol.cc +++ b/source/sundials/kinsol.cc @@ -313,11 +313,11 @@ namespace SUNDIALS { set_functions_to_trigger_an_assert(); - #if DEAL_II_SUNDIALS_VERSION_GTE(6, 0, 0) +# if DEAL_II_SUNDIALS_VERSION_GTE(6, 0, 0) const int status = SUNContext_Create(&mpi_communicator, &kinsol_ctx); (void)status; AssertKINSOL(status); - #endif +# endif } @@ -355,7 +355,7 @@ namespace SUNDIALS if (get_solution_scaling) u_scale = internal::make_nvector_view(get_solution_scaling() -# if !DEAL_II_SUNDIALS_VERSION_LT(6, 0, 0) +# if DEAL_II_SUNDIALS_VERSION_GTE(6, 0, 0) , kinsol_ctx # endif @@ -365,7 +365,7 @@ namespace SUNDIALS reinit_vector(u_scale_temp); u_scale_temp = 1.0; u_scale = internal::make_nvector_view(u_scale_temp -# if !DEAL_II_SUNDIALS_VERSION_LT(6, 0, 0) +# if DEAL_II_SUNDIALS_VERSION_GTE(6, 0, 0) , kinsol_ctx # endif @@ -374,7 +374,7 @@ namespace SUNDIALS if (get_function_scaling) f_scale = internal::make_nvector_view(get_function_scaling() -# if !DEAL_II_SUNDIALS_VERSION_LT(6, 0, 0) +# if DEAL_II_SUNDIALS_VERSION_GTE(6, 0, 0) , kinsol_ctx # endif @@ -384,7 +384,7 @@ namespace SUNDIALS reinit_vector(f_scale_temp); f_scale_temp = 1.0; f_scale = internal::make_nvector_view(f_scale_temp -# if !DEAL_II_SUNDIALS_VERSION_LT(6, 0, 0) +# if DEAL_II_SUNDIALS_VERSION_GTE(6, 0, 0) , kinsol_ctx # endif @@ -406,7 +406,7 @@ namespace SUNDIALS } auto solution = internal::make_nvector_view(initial_guess_and_solution -# if !DEAL_II_SUNDIALS_VERSION_LT(6, 0, 0) +# if DEAL_II_SUNDIALS_VERSION_GTE(6, 0, 0) , kinsol_ctx # endif @@ -419,7 +419,7 @@ namespace SUNDIALS { KINFree(&kinsol_mem); -# if !DEAL_II_SUNDIALS_VERSION_LT(6, 0, 0) +# if DEAL_II_SUNDIALS_VERSION_GTE(6, 0, 0) status = SUNContext_Free(&kinsol_ctx); AssertKINSOL(status); # endif