Change order of openMP flag check

geodynamics · May 14, 2024 · b590c3d · b590c3d
1 parent 7167766
commit b590c3d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 13 deletions.
diff --git a/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/leg_bwd_trans_on_the_fly.f90 b/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/leg_bwd_trans_on_the_fly.f90
@@ -130,8 +130,7 @@ subroutine legendre_b_trans_on_the_fly                            &
             call leg_bwd_trans_1latitude(lp_rtm, jst, mm,               &
      &          mp_rlm, idx_trns%mn_rlm(mp_rlm), nkrs, nkrt,            &
      &          iflag_matmul, ncomp, nvector, nscalar,                  &
-     &          sph_rlm, sph_rtm, comm_rlm, comm_rtm,                   &
-     &          idx_trns, leg, n_WR, n_WS, WR, WS,                      &
+     &          sph_rlm, sph_rtm, comm_rtm, leg, n_WR, n_WS, WR, WS,    &
      &          WK_l_otf%n_jk_e(mp_rlm), WK_l_otf%n_jk_o(mp_rlm),       &
      &          WK_l_otf%Smat(1), WK_l_otf%Pjt_mat(ip),                 &
      &          WK_l_otf%Fmat(ip), WK_l_otf%wk_plm(ip))
@@ -175,8 +174,7 @@ end subroutine legendre_b_trans_on_the_fly
       subroutine leg_bwd_trans_1latitude                                &
      &         (lp_rtm, jst, mm, mp_rlm, mn_rlm, nkrs, nkrt,            &
      &          iflag_matmul, ncomp, nvector, nscalar,                  &
-     &          sph_rlm, sph_rtm, comm_rlm, comm_rtm,                   &
-     &          idx_trns, leg, n_WR, n_WS, WR, WS,                      &
+     &          sph_rlm, sph_rtm, comm_rtm, leg, n_WR, n_WS, WR, WS,    &
      &          n_jk_e, n_jk_o, Smat, Pjt_mat, Fmat, wk_plm)
 !
       use t_schmidt_poly_on_rtm
@@ -192,9 +190,8 @@ subroutine leg_bwd_trans_1latitude                                &
       integer(kind = kint), intent(in) :: iflag_matmul
       type(sph_rlm_grid), intent(in) :: sph_rlm
       type(sph_rtm_grid), intent(in) :: sph_rtm
-      type(sph_comm_tbl), intent(in) :: comm_rlm, comm_rtm
+      type(sph_comm_tbl), intent(in) :: comm_rtm
       type(legendre_4_sph_trans), intent(in) :: leg
-      type(index_4_sph_trans), intent(in) :: idx_trns
 !
       integer(kind = kint), intent(in) :: ncomp, nvector, nscalar
       integer(kind = kint), intent(in) :: n_WR, n_WS

diff --git a/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/legendre_bwd_trans_testloop.f90 b/src/Fortran_libraries/PARALLEL_src/SPH_SHELL_src/legendre_bwd_trans_testloop.f90
@@ -49,6 +49,7 @@ module legendre_bwd_trans_testloop
 !
       implicit none
 !
+      private :: leg_bwd_trans_1latitude
       integer, external :: omp_get_max_threads
 !
 ! -----------------------------------------------------------------------
@@ -128,8 +129,7 @@ subroutine legendre_b_trans_vector_test                           &
             call leg_bwd_trans_1latitude(lp_rtm, jst, mm,               &
      &          mp_rlm, idx_trns%mn_rlm(mp_rlm), nkrs, nkrt,            &
      &          iflag_matmul, ncomp, nvector, nscalar,                  &
-     &          sph_rlm, sph_rtm, comm_rlm, comm_rtm,                   &
-     &          idx_trns, leg, n_WR, n_WS, WR, WS,                      &
+     &          sph_rlm, sph_rtm, comm_rtm, leg, n_WR, n_WS, WR, WS,    &
      &          WK_l_tst%n_jk_e(mp_rlm), WK_l_tst%n_jk_o(mp_rlm),       &
      &          WK_l_tst%Smat(1), WK_l_tst%Pjt_mat(ip),                 &
      &          WK_l_tst%Fmat(ip), WK_l_tst%wk_plm(ip))
@@ -172,8 +172,7 @@ end subroutine legendre_b_trans_vector_test
       subroutine leg_bwd_trans_1latitude                                &
      &         (lp_rtm, jst, mm, mp_rlm, mn_rlm, nkrs, nkrt,            &
      &          iflag_matmul, ncomp, nvector, nscalar,                  &
-     &          sph_rlm, sph_rtm, comm_rlm, comm_rtm,                   &
-     &          idx_trns, leg, n_WR, n_WS, WR, WS,                      &
+     &          sph_rlm, sph_rtm, comm_rtm, leg, n_WR, n_WS, WR, WS,    &
      &          n_jk_e, n_jk_o, Smat, Pjt_mat, Fmat, wk_plm)
 !
       use t_schmidt_poly_on_rtm
@@ -189,9 +188,8 @@ subroutine leg_bwd_trans_1latitude                                &
       integer(kind = kint), intent(in) :: iflag_matmul
       type(sph_rlm_grid), intent(in) :: sph_rlm
       type(sph_rtm_grid), intent(in) :: sph_rtm
-      type(sph_comm_tbl), intent(in) :: comm_rlm, comm_rtm
+      type(sph_comm_tbl), intent(in) :: comm_rtm
       type(legendre_4_sph_trans), intent(in) :: leg
-      type(index_4_sph_trans), intent(in) :: idx_trns
 !
       integer(kind = kint), intent(in) :: ncomp, nvector, nscalar
       integer(kind = kint), intent(in) :: n_WR, n_WS

diff --git a/src/Fortran_libraries/SERIAL_src/IO_ZLIB/gz_layer_mean_monitor_IO.F90 b/src/Fortran_libraries/SERIAL_src/IO_ZLIB/gz_layer_mean_monitor_IO.F90
@@ -52,7 +52,9 @@ module gz_layer_mean_monitor_IO
 !
       implicit none
 !
+#ifdef ZLIB_IO
       private :: gz_write_layer_mean_monitor
+#endif
 !
 ! -----------------------------------------------------------------------
 !

diff --git a/src/confdb/ax_openmp.m4 b/src/confdb/ax_openmp.m4
@@ -45,7 +45,7 @@ ax_cv_[]_AC_LANG_ABBREV[]_openmp=unknown
 #                -xopenmp (Sun), -omp (Tru64),
 #                -qsmp=omp (AIX),
 #                none
-ax_openmp_flags="-fopenmp -openmp -qopenmp -mp -xopenmp -omp -qsmp=omp none"
+ax_openmp_flags="-openmp -qopenmp -fopenmp -mp -xopenmp -omp -qsmp=omp none"
  if test "x$OPENMP_[]_AC_LANG_PREFIX[]FLAGS" != x; then
   ax_openmp_flags="$OPENMP_[]_AC_LANG_PREFIX[]FLAGS $ax_openmp_flags"
 fi