Changeset 2019 for branches/DEV_r1879_FCM/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modinterp.F

Timestamp:

2010-07-20T19:48:19+02:00 (14 years ago)

Author:

rblod

Message:

Put back the changes for Agrif on fcm branch

File:

• branches/DEV_r1879_FCM/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modinterp.F (modified) (17 diffs)

branches/DEV_r1879_FCM/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modinterp.F

@@ -37 +37 @@
       Use Agrif_Mask 
       Use Agrif_CurgridFunctions
-#if defined AGRIF_MPI
+#if defined key_mpp_mpi
       Use Agrif_mpp
 #endif
@@ -656 +656 @@
       
 C
-#ifdef AGRIF_MPI
-C
-#include "mpif.h"
+#ifdef key_mpp_mpi
+C
+        INCLUDE 'mpif.h'
 C
 #endif
@@ -715 +715 @@
       INTEGER,DIMENSION(nbdim)    :: indminglob2,indmaxglob2      
 C
-#ifdef AGRIF_MPI
+#ifdef key_mpp_mpi
 C
       LOGICAL :: memberout
@@ -739 +739 @@
      &       indmaxglob,indminglob2,indmaxglob2,parentarray,
      &       pttruetab,cetruetab,member,memberin,find_list_interp
-#if defined AGRIF_MPI
+#if defined key_mpp_mpi
      &       ,tab4t,memberinall,sendtoproc1,recvfromproc1
 #endif
@@ -766 +766 @@
      &                        child % var % root_var % interptab)
        
-#ifdef AGRIF_MPI
+#ifdef key_mpp_mpi
        IF (memberin) THEN
         Call Agrif_Parentbounds(TYPEinterp,nbdim,indmin,indmax,
@@ -810 +810 @@
       ELSE
       
-#if !defined AGRIF_MPI
+#if !defined key_mpp_mpi
       parentarray(:,1,1) = indminglob
       parentarray(:,2,1) = indmaxglob
@@ -885 +885 @@
             endif
 
-#ifdef AGRIF_MPI
+#ifdef key_mpp_mpi
       if (.not.find_list_interp) then
       tab3(:,1) = indminglob2(:)
@@ -936 +936 @@
      &   indminglob,indmaxglob,indminglob2,indmaxglob2,parentarray,
      &   pttruetab,cetruetab,member,memberin,nbdim
-#if defined AGRIF_MPI
+#if defined key_mpp_mpi
      &   ,tab4t,memberinall,sendtoproc1,recvfromproc1
 #endif
@@ -1034 +1034 @@
      &                               lowerbound,upperbound,nbdim)
 
-#ifdef AGRIF_MPI
+#ifdef key_mpp_mpi
       Call Agrif_GlobtoLocInd2(childarray,
      &                     lowerbound,upperbound,
@@ -1069 +1069 @@
       if (torestore) then
 C
-#ifdef AGRIF_MPI
+#ifdef key_mpp_mpi
 C
         SELECT CASE (nbdim)
@@ -1301 +1301 @@
 C             
 C     Deallocations
-#ifdef AGRIF_MPI        
+#ifdef key_mpp_mpi        
       IF (member) THEN
       Call Agrif_nbdim_deallocation(tempP%var,nbdim)
@@ -2136 +2136 @@
      &       pttruetab,cetruetab,member,memberin,
      &      find_list_interp
-#if defined AGRIF_MPI
+#if defined key_mpp_mpi
      &     ,tab4t,memberinall,sendtoproc1,recvfromproc1
 #endif
@@ -2152 +2152 @@
       LOGICAL :: member, memberin
       INTEGER :: i
-#ifdef AGRIF_MPI
+#ifdef key_mpp_mpi
 C
       INTEGER,DIMENSION(nbdim,0:Agrif_Nbprocs-1,8) :: tab4t
@@ -2180 +2180 @@
         cetruetab = parcours%interp_loc%cetruetab(1:nbdim)
                 
-#if !defined AGRIF_MPI
+#if !defined key_mpp_mpi
         indminglob = parcours%interp_loc%indminglob(1:nbdim)
         indmaxglob = parcours%interp_loc%indmaxglob(1:nbdim)
@@ -2207 +2207 @@
      &                          parentarray,pttruetab,cetruetab,
      &                          member,memberin,nbdim
-#if defined AGRIF_MPI
+#if defined key_mpp_mpi
      &      ,tab4t,memberinall,sendtoproc1,recvfromproc1
 #endif
@@ -2221 +2221 @@
       INTEGER,DIMENSION(nbdim,2,2) :: parentarray
       LOGICAL :: member, memberin
-#ifdef AGRIF_MPI
+#ifdef key_mpp_mpi
 C
       INTEGER,DIMENSION(nbdim,0:Agrif_Nbprocs-1,8) :: tab4t
@@ -2243 +2243 @@
 
       parcours%interp_loc%memberin = memberin
-#if !defined AGRIF_MPI
+#if !defined key_mpp_mpi
       parcours%interp_loc%indminglob(1:nbdim) = indminglob(1:nbdim)
       parcours%interp_loc%indmaxglob(1:nbdim) = indmaxglob(1:nbdim)