From 81555629389d946e1d34ee879ef1861f5cd0b34b Mon Sep 17 00:00:00 2001 From: Salvatore Filippone Date: Thu, 13 Jul 2006 17:08:01 +0000 Subject: [PATCH] *** empty log message *** --- src/methd/Makefile | 2 +- src/modules/Makefile | 2 +- src/{methd => modules}/extra_env.f90 | 4 ++++ src/{methd => modules}/extra_env_essl.f90 | 4 ++++ 4 files changed, 10 insertions(+), 2 deletions(-) rename src/{methd => modules}/extra_env.f90 (75%) rename src/{methd => modules}/extra_env_essl.f90 (79%) diff --git a/src/methd/Makefile b/src/methd/Makefile index f60abbee..0fa70ec6 100644 --- a/src/methd/Makefile +++ b/src/methd/Makefile @@ -6,7 +6,7 @@ LIBDIR=../../lib HERE=. OBJS= psb_dcgstab.o psb_dcg.o psb_dcgs.o \ psb_dbicg.o psb_dcgstabl.o psb_dgmresr.o\ - psb_zcgstab.o psb_zcgs.o $(EXTRA_BLACS_ENV_OBJS) + psb_zcgstab.o psb_zcgs.o INCDIRS=-I. -I.. -I$(LIBDIR) diff --git a/src/modules/Makefile b/src/modules/Makefile index c482eac0..37c32560 100644 --- a/src/modules/Makefile +++ b/src/modules/Makefile @@ -6,7 +6,7 @@ MODULES = psb_realloc_mod.o psb_string_mod.o psb_spmat_type.o \ psb_prec_type.o psb_error_mod.o psb_prec_mod.o \ psb_methd_mod.o psb_const_mod.o \ psb_comm_mod.o psb_psblas_mod.o psi_mod.o \ - psb_sparse_mod.o psb_check_mod.o psb_all_mod.o + psb_sparse_mod.o psb_check_mod.o psb_all_mod.o $(EXTRA_BLACS_ENV_OBJS) OBJS = error.o diff --git a/src/methd/extra_env.f90 b/src/modules/extra_env.f90 similarity index 75% rename from src/methd/extra_env.f90 rename to src/modules/extra_env.f90 index d6728532..4f7e27b4 100644 --- a/src/methd/extra_env.f90 +++ b/src/modules/extra_env.f90 @@ -9,3 +9,7 @@ subroutine psb_restore_coher(ictxt,isvch) ! Ensure global coherence for convergence checks. Call blacs_set(ictxt,16,isvch) end subroutine psb_restore_coher +subroutine psb_get_mpicomm(ictxt,comm) + integer :: ictxt, comm + call blacs_get(ictxt,10,comm) +end subroutine psb_get_mpicomm diff --git a/src/methd/extra_env_essl.f90 b/src/modules/extra_env_essl.f90 similarity index 79% rename from src/methd/extra_env_essl.f90 rename to src/modules/extra_env_essl.f90 index 18b5bdfa..d39b9514 100644 --- a/src/methd/extra_env_essl.f90 +++ b/src/modules/extra_env_essl.f90 @@ -11,3 +11,7 @@ subroutine psb_restore_coher(ictxt,isvch) ! Ensure global coherence for convergence checks. !!$ Call blacs_set(ictxt,16,isvch) end subroutine psb_restore_coher +subroutine psb_get_mpicomm(ictxt,comm) + integer :: ictxt, comm + call blacs_get(ictxt,10,comm) +end subroutine psb_get_mpicomm