From a86cb22d6f2563298e3a2a96c96c70a2b861e053 Mon Sep 17 00:00:00 2001
From: fperignon <fperignon@7c7fe9aa-52eb-4d9e-b0a8-ba7d787348e9>
Date: Tue, 12 Apr 2011 09:32:22 +0000
Subject: [PATCH] Fix bugs, missing use modules and wrong arguments in routines
calls
git-svn-id: https://ppm.inf.ethz.ch/svn/ppmnumerics/branches/ngtopo/libppmnumerics@839 7c7fe9aa-52eb-4d9e-b0a8-ba7d787348e9
---
src/ppm_comp_pp_ring.f | 1 +
src/ppm_fdsolver_map_2d.f | 2 +-
src/ppm_fdsolver_map_3d.f | 2 +-
src/ppm_fmm_init.f | 2 ++
src/ppm_fmm_potential.f | 3 +++
src/ppm_gmm_extend_bkwd.f | 1 +
src/ppm_gmm_extend_fwd.f | 9 +++++----
src/ppm_gmm_march.f | 10 ++++++----
src/ppm_gmm_march_bkwd.f | 5 +++--
src/ppm_gmm_march_fwd.f | 9 +++++----
src/ppm_hamjac_ext_3d.f | 16 +++++++++-------
src/ppm_hamjac_reinit_2d.f | 1 +
src/ppm_hamjac_reinit_3d.f | 2 ++
src/ppm_hamjac_reinit_loc_3d.f | 2 ++
src/ppm_hamjac_reinit_ref_3d.f | 2 ++
src/ppm_hamjac_reinit_russo_3d.f | 2 ++
src/ppm_mg_restrict.f | 2 ++
src/ppm_mg_smooth_coarse.f | 2 ++
src/ppm_mg_smooth_fine.f | 2 ++
src/ppm_ode_map_push.f | 1 +
20 files changed, 53 insertions(+), 23 deletions(-)
diff --git a/src/ppm_comp_pp_ring.f b/src/ppm_comp_pp_ring.f
index 1d85b7b..4abdb1d 100644
--- a/src/ppm_comp_pp_ring.f
+++ b/src/ppm_comp_pp_ring.f
@@ -91,6 +91,7 @@
USE ppm_module_alloc
USE ppm_module_map
USE ppm_module_comp_pp_doring
+ USE ppm_module_map_part
IMPLICIT NONE
#if __KIND == __SINGLE_PRECISION | __KIND == __SINGLE_PRECISION_COMPLEX
INTEGER, PARAMETER :: MK = ppm_kind_single
diff --git a/src/ppm_fdsolver_map_2d.f b/src/ppm_fdsolver_map_2d.f
index 5e6912f..17a2853 100644
--- a/src/ppm_fdsolver_map_2d.f
+++ b/src/ppm_fdsolver_map_2d.f
@@ -110,7 +110,7 @@
USE ppm_module_write
USE ppm_module_substart
USE ppm_module_substop
-
+ USE ppm_module_map_field
IMPLICIT NONE
#if __KIND == __SINGLE_PRECISION | __KIND == __COMPLEX
INTEGER, PARAMETER :: MK = ppm_kind_single
diff --git a/src/ppm_fdsolver_map_3d.f b/src/ppm_fdsolver_map_3d.f
index 1270f18..6463828 100644
--- a/src/ppm_fdsolver_map_3d.f
+++ b/src/ppm_fdsolver_map_3d.f
@@ -121,7 +121,7 @@
USE ppm_module_write
USE ppm_module_substart
USE ppm_module_substop
-
+ USE ppm_module_map_field
IMPLICIT NONE
#if __KIND == __SINGLE_PRECISION | __KIND == __COMPLEX
diff --git a/src/ppm_fmm_init.f b/src/ppm_fmm_init.f
index 4a7d5c6..ed3987a 100644
--- a/src/ppm_fmm_init.f
+++ b/src/ppm_fmm_init.f
@@ -62,6 +62,8 @@
USE ppm_module_substop
USE ppm_module_write
USE ppm_module_topo_check
+ USE ppm_module_map_part
+ USE ppm_module_map_part_global
IMPLICIT NONE
!-------------------------------------------------------------------------
! Includes
diff --git a/src/ppm_fmm_potential.f b/src/ppm_fmm_potential.f
index 8d8bc39..b87de6e 100644
--- a/src/ppm_fmm_potential.f
+++ b/src/ppm_fmm_potential.f
@@ -183,6 +183,9 @@
USE ppm_module_util_cart2sph
USE ppm_module_write
USE ppm_module_topo_check
+ USE ppm_module_map_part_ghost
+ USE ppm_module_map_part
+ USE ppm_module_map_part_global
IMPLICIT NONE
!-------------------------------------------------------------------------
! Includes
diff --git a/src/ppm_gmm_extend_bkwd.f b/src/ppm_gmm_extend_bkwd.f
index b870999..f53e0b9 100644
--- a/src/ppm_gmm_extend_bkwd.f
+++ b/src/ppm_gmm_extend_bkwd.f
@@ -60,6 +60,7 @@
USE ppm_module_error
USE ppm_module_alloc
USE ppm_module_typedef
+ USE ppm_module_map_field
IMPLICIT NONE
#if __KIND == __SINGLE_PRECISION
INTEGER, PARAMETER :: MK = ppm_kind_single
diff --git a/src/ppm_gmm_extend_fwd.f b/src/ppm_gmm_extend_fwd.f
index 283ce76..0f59d7c 100644
--- a/src/ppm_gmm_extend_fwd.f
+++ b/src/ppm_gmm_extend_fwd.f
@@ -60,6 +60,7 @@
USE ppm_module_error
USE ppm_module_alloc
USE ppm_module_typedef
+ USE ppm_module_map_field
IMPLICIT NONE
#if __KIND == __SINGLE_PRECISION
INTEGER, PARAMETER :: MK = ppm_kind_single
@@ -409,14 +410,14 @@
!-------------------------------------------------------------------------
! Update ghost layers for both dta AND gmm_state3d
!-------------------------------------------------------------------------
- CALL ppm_map_field_push(gmm_topoid,gmm_meshid,dta,ghostsize,info)
+ CALL ppm_map_field_push(gmm_topoid,gmm_meshid,dta,info)
IF (info .NE. ppm_param_success) THEN
info = ppm_error_error
CALL ppm_error(ppm_err_sub_failed,'ppm_gmm_extend_fwd', &
& 'pushing field data failed',__LINE__,info)
GOTO 9999
ENDIF
- CALL ppm_map_field_push(gmm_topoid,gmm_meshid,gmm_state3d,ghostsize,info)
+ CALL ppm_map_field_push(gmm_topoid,gmm_meshid,gmm_state3d,info)
IF (info .NE. ppm_param_success) THEN
info = ppm_error_error
CALL ppm_error(ppm_err_sub_failed,'ppm_gmm_extend_fwd', &
@@ -579,14 +580,14 @@
!-------------------------------------------------------------------------
! Update ghost layers for both dta AND gmm_state2d
!-------------------------------------------------------------------------
- CALL ppm_map_field_push(gmm_topoid,gmm_meshid,dta,ghostsize,info)
+ CALL ppm_map_field_push(gmm_topoid,gmm_meshid,dta,info)
IF (info .NE. ppm_param_success) THEN
info = ppm_error_error
CALL ppm_error(ppm_err_sub_failed,'ppm_gmm_extend_fwd', &
& 'pushing field data failed',__LINE__,info)
GOTO 9999
ENDIF
- CALL ppm_map_field_push(gmm_topoid,gmm_meshid,gmm_state2d,ghostsize,info)
+ CALL ppm_map_field_push(gmm_topoid,gmm_meshid,gmm_state2d,info)
IF (info .NE. ppm_param_success) THEN
info = ppm_error_error
CALL ppm_error(ppm_err_sub_failed,'ppm_gmm_extend_fwd', &
diff --git a/src/ppm_gmm_march.f b/src/ppm_gmm_march.f
index 60adcd1..7e72156 100644
--- a/src/ppm_gmm_march.f
+++ b/src/ppm_gmm_march.f
@@ -92,6 +92,8 @@
USE ppm_module_error
USE ppm_module_write
USE ppm_module_alloc
+ USE ppm_module_map_field
+ USE ppm_module_map_field_ghost
IMPLICIT NONE
#if __KIND == __SINGLE_PRECISION
INTEGER, PARAMETER :: MK = ppm_kind_single
@@ -367,7 +369,7 @@
& 'ghost get mapping failed',__LINE__,info)
GOTO 9999
ENDIF
- CALL ppm_map_field_push(gmm_topoid,gmm_meshid,fdta,ghostsize,info)
+ CALL ppm_map_field_push(gmm_topoid,gmm_meshid,fdta,info)
IF (info .NE. ppm_param_success) THEN
info = ppm_error_error
CALL ppm_error(ppm_err_sub_failed,'ppm_gmm_march', &
@@ -375,7 +377,7 @@
GOTO 9999
ENDIF
IF (PRESENT(udata)) THEN
- CALL ppm_map_field_push(gmm_topoid,gmm_meshid,dta,ghostsize,info)
+ CALL ppm_map_field_push(gmm_topoid,gmm_meshid,dta,info)
IF (info .NE. ppm_param_success) THEN
info = ppm_error_error
CALL ppm_error(ppm_err_sub_failed,'ppm_gmm_march', &
@@ -533,7 +535,7 @@
!-------------------------------------------------------------------------
! Initialize ghost layers for state array
!-------------------------------------------------------------------------
- CALL ppm_map_field_push(gmm_topoid,gmm_meshid,gmm_state3d,ghostsize,info)
+ CALL ppm_map_field_push(gmm_topoid,gmm_meshid,gmm_state3d,info)
IF (info .NE. ppm_param_success) THEN
info = ppm_error_error
CALL ppm_error(ppm_err_sub_failed,'ppm_gmm_march', &
@@ -762,7 +764,7 @@
!-------------------------------------------------------------------------
! Initialize ghost layers for state array
!-------------------------------------------------------------------------
- CALL ppm_map_field_push(gmm_topoid,gmm_meshid,gmm_state2d,ghostsize,info)
+ CALL ppm_map_field_push(gmm_topoid,gmm_meshid,gmm_state2d,info)
IF (info .NE. ppm_param_success) THEN
info = ppm_error_error
CALL ppm_error(ppm_err_sub_failed,'ppm_gmm_march', &
diff --git a/src/ppm_gmm_march_bkwd.f b/src/ppm_gmm_march_bkwd.f
index dad6ec5..dcc0966 100644
--- a/src/ppm_gmm_march_bkwd.f
+++ b/src/ppm_gmm_march_bkwd.f
@@ -60,6 +60,7 @@
USE ppm_module_substop
USE ppm_module_error
USE ppm_module_alloc
+ USE ppm_module_map_field
IMPLICIT NONE
#if __KIND == __SINGLE_PRECISION
INTEGER, PARAMETER :: MK = ppm_kind_single
@@ -330,7 +331,7 @@
!-------------------------------------------------------------------------
! Update ghost layers for fdta
!-------------------------------------------------------------------------
- CALL ppm_map_field_push(gmm_topoid,gmm_meshid,fdta,ghostsize,info)
+ CALL ppm_map_field_push(gmm_topoid,gmm_meshid,fdta,info)
IF (info .NE. ppm_param_success) THEN
info = ppm_error_error
CALL ppm_error(ppm_err_sub_failed,'ppm_gmm_march', &
@@ -449,7 +450,7 @@
!-------------------------------------------------------------------------
! Update ghost layers for fdta
!-------------------------------------------------------------------------
- CALL ppm_map_field_push(gmm_topoid,gmm_meshid,fdta,ghostsize,info)
+ CALL ppm_map_field_push(gmm_topoid,gmm_meshid,fdta,info)
IF (info .NE. ppm_param_success) THEN
info = ppm_error_error
CALL ppm_error(ppm_err_sub_failed,'ppm_gmm_march', &
diff --git a/src/ppm_gmm_march_fwd.f b/src/ppm_gmm_march_fwd.f
index d6ce53a..8385af9 100644
--- a/src/ppm_gmm_march_fwd.f
+++ b/src/ppm_gmm_march_fwd.f
@@ -60,6 +60,7 @@
USE ppm_module_error
USE ppm_module_alloc
USE ppm_module_typedef
+ USE ppm_module_map_field
IMPLICIT NONE
#if __KIND == __SINGLE_PRECISION
INTEGER, PARAMETER :: MK = ppm_kind_single
@@ -434,14 +435,14 @@
!-------------------------------------------------------------------------
! Update ghost layers for both fdta AND gmm_state3d
!-------------------------------------------------------------------------
- CALL ppm_map_field_push(gmm_topoid,gmm_meshid,fdta,ghostsize,info)
+ CALL ppm_map_field_push(gmm_topoid,gmm_meshid,fdta,info)
IF (info .NE. ppm_param_success) THEN
info = ppm_error_error
CALL ppm_error(ppm_err_sub_failed,'ppm_gmm_march_fwd', &
& 'pushing field data failed',__LINE__,info)
GOTO 9999
ENDIF
- CALL ppm_map_field_push(gmm_topoid,gmm_meshid,gmm_state3d,ghostsize,info)
+ CALL ppm_map_field_push(gmm_topoid,gmm_meshid,gmm_state3d,info)
IF (info .NE. ppm_param_success) THEN
info = ppm_error_error
CALL ppm_error(ppm_err_sub_failed,'ppm_gmm_march_fwd', &
@@ -626,14 +627,14 @@
!-------------------------------------------------------------------------
! Update ghost layers for both fdta AND gmm_state2d
!-------------------------------------------------------------------------
- CALL ppm_map_field_push(gmm_topoid,gmm_meshid,fdta,ghostsize,info)
+ CALL ppm_map_field_push(gmm_topoid,gmm_meshid,fdta,info)
IF (info .NE. ppm_param_success) THEN
info = ppm_error_error
CALL ppm_error(ppm_err_sub_failed,'ppm_gmm_march_fwd', &
& 'pushing field data failed',__LINE__,info)
GOTO 9999
ENDIF
- CALL ppm_map_field_push(gmm_topoid,gmm_meshid,gmm_state2d,ghostsize,info)
+ CALL ppm_map_field_push(gmm_topoid,gmm_meshid,gmm_state2d,info)
IF (info .NE. ppm_param_success) THEN
info = ppm_error_error
CALL ppm_error(ppm_err_sub_failed,'ppm_gmm_march_fwd', &
diff --git a/src/ppm_hamjac_ext_3d.f b/src/ppm_hamjac_ext_3d.f
index 0ee26b0..5e03a2f 100644
--- a/src/ppm_hamjac_ext_3d.f
+++ b/src/ppm_hamjac_ext_3d.f
@@ -64,6 +64,8 @@
USE ppm_module_alloc
USE ppm_module_typedef
USE ppm_module_write
+ USE ppm_module_map_field
+ USE ppm_module_map_field_ghost
IMPLICIT NONE
#ifdef __MPI
@@ -185,23 +187,23 @@
dx(2) = len_phys(2)/REAL(mesh%nm(2)-1,mk)
dx(3) = len_phys(3)/REAL(mesh%nm(3)-1,mk)
!--- map the gowas
- CALL ppm_map_field_ghost_get(topo_id,mesh_id,phi,ghostsize,info)
- CALL ppm_map_field_push(topo_id,mesh_id,phi,ghostsize,info)
+ CALL ppm_map_field_ghost_get(topo_id,mesh_id,ghostsize,info)
+ CALL ppm_map_field_push(topo_id,mesh_id,phi,info)
CALL ppm_map_field_send(info)
CALL ppm_map_field_pop(topo_id,mesh_id,phi,ghostsize,info)
!--- map the function
DO istep=1,maxstep
#if __MODE == __SCA
- CALL ppm_map_field_ghost_get(psi,topo_id,mesh_id,ghostsize,info)
- CALL ppm_map_field_push(topo_id,mesh_id,psi,ghostsize,info)
+ CALL ppm_map_field_ghost_get(topo_id,mesh_id,ghostsize,info)
+ CALL ppm_map_field_push(topo_id,mesh_id,psi,info)
CALL ppm_map_field_send(info)
CALL ppm_map_field_pop(topo_id,mesh_id,psi,ghostsize,info)
#elif __MODE == __VEC
- CALL ppm_map_field_ghost_get(topo_id,mesh_id,psi,lda,ghostsize,info)
- CALL ppm_map_field_push(topo_id,mesh_id,psi,lda,ghostsize,info)
+ CALL ppm_map_field_ghost_get(topo_id,mesh_id,ghostsize,info)
+ CALL ppm_map_field_push(topo_id,mesh_id,psi,lda,info)
CALL ppm_map_field_send(info)
- CALL ppm_map_field_pop(psi,lda,topo_id,mesh_id,ghostsize,info)
+ CALL ppm_map_field_pop(topo_id, mesh_id, psi,lda,ghostsize,info)
#endif
! IF (ppm_debug .GT. 0) THEN
! ENDIF
diff --git a/src/ppm_hamjac_reinit_2d.f b/src/ppm_hamjac_reinit_2d.f
index cabd24d..29ede9c 100644
--- a/src/ppm_hamjac_reinit_2d.f
+++ b/src/ppm_hamjac_reinit_2d.f
@@ -52,6 +52,7 @@
USE ppm_module_alloc
USE ppm_module_substop
USE ppm_module_map
+ USE ppm_module_map_field_ghost
USE ppm_module_typedef
IMPLICIT NONE
diff --git a/src/ppm_hamjac_reinit_3d.f b/src/ppm_hamjac_reinit_3d.f
index 15c533c..cc7c3a1 100644
--- a/src/ppm_hamjac_reinit_3d.f
+++ b/src/ppm_hamjac_reinit_3d.f
@@ -62,6 +62,8 @@
USE ppm_module_substop
USE ppm_module_map
USE ppm_module_typedef
+ USE ppm_module_map_field
+ USE ppm_module_map_field_ghost
IMPLICIT NONE
#if __KIND == __SINGLE_PRECISION
diff --git a/src/ppm_hamjac_reinit_loc_3d.f b/src/ppm_hamjac_reinit_loc_3d.f
index 7e673f8..f7cecd8 100644
--- a/src/ppm_hamjac_reinit_loc_3d.f
+++ b/src/ppm_hamjac_reinit_loc_3d.f
@@ -62,6 +62,8 @@
USE ppm_module_substop
USE ppm_module_map
USE ppm_module_typedef
+ USE ppm_module_map_field
+ USE ppm_module_map_field_ghost
IMPLICIT NONE
#if __KIND == __SINGLE_PRECISION
diff --git a/src/ppm_hamjac_reinit_ref_3d.f b/src/ppm_hamjac_reinit_ref_3d.f
index 9a4583b..3df3ba2 100644
--- a/src/ppm_hamjac_reinit_ref_3d.f
+++ b/src/ppm_hamjac_reinit_ref_3d.f
@@ -53,6 +53,8 @@
USE ppm_module_substop
USE ppm_module_map
USE ppm_module_typedef
+ USE ppm_module_map_field
+ USE ppm_module_map_field_ghost
IMPLICIT NONE
#if __KIND == __SINGLE_PRECISION
diff --git a/src/ppm_hamjac_reinit_russo_3d.f b/src/ppm_hamjac_reinit_russo_3d.f
index fe70806..9cedc76 100644
--- a/src/ppm_hamjac_reinit_russo_3d.f
+++ b/src/ppm_hamjac_reinit_russo_3d.f
@@ -52,6 +52,8 @@
USE ppm_module_alloc
USE ppm_module_substop
USE ppm_module_map
+ USE ppm_module_map_field
+ USE ppm_module_map_field_ghost
IMPLICIT NONE
#if __KIND == __SINGLE_PRECISION
diff --git a/src/ppm_mg_restrict.f b/src/ppm_mg_restrict.f
index e3a5362..cc41d81 100644
--- a/src/ppm_mg_restrict.f
+++ b/src/ppm_mg_restrict.f
@@ -103,6 +103,8 @@
USE ppm_module_error
USE ppm_module_write
USE ppm_module_map
+ USE ppm_module_map_field
+ USE ppm_module_map_field_ghost
IMPLICIT NONE
#if __KIND == __SINGLE_PRECISION
INTEGER, PARAMETER :: MK = ppm_kind_single
diff --git a/src/ppm_mg_smooth_coarse.f b/src/ppm_mg_smooth_coarse.f
index 0afc9d9..40f34d9 100644
--- a/src/ppm_mg_smooth_coarse.f
+++ b/src/ppm_mg_smooth_coarse.f
@@ -122,6 +122,8 @@
USE ppm_module_map
USE ppm_module_data_mesh
USE ppm_module_write
+ USE ppm_module_map_field
+ USE ppm_module_map_field_ghost
IMPLICIT NONE
#if __KIND == __SINGLE_PRECISION
INTEGER, PARAMETER :: MK = ppm_kind_single
diff --git a/src/ppm_mg_smooth_fine.f b/src/ppm_mg_smooth_fine.f
index e71a17d..70accd0 100644
--- a/src/ppm_mg_smooth_fine.f
+++ b/src/ppm_mg_smooth_fine.f
@@ -116,6 +116,8 @@
USE ppm_module_map
USE ppm_module_data_mesh
USE ppm_module_write
+ USE ppm_module_map_field
+ USE ppm_module_map_field_ghost
IMPLICIT NONE
#if __KIND == __SINGLE_PRECISION
INTEGER, PARAMETER :: MK = ppm_kind_single
diff --git a/src/ppm_ode_map_push.f b/src/ppm_ode_map_push.f
index ff044ce..62a46ae 100644
--- a/src/ppm_ode_map_push.f
+++ b/src/ppm_ode_map_push.f
@@ -92,6 +92,7 @@
USE ppm_module_map
USE ppm_module_error
USE ppm_module_alloc
+ USE ppm_module_map_part
IMPLICIT NONE
#if __KIND == __SINGLE_PRECISION
INTEGER, PARAMETER :: mk = ppm_kind_single
--
GitLab