Changeset 1988 for branches/DEV_r1879_FCM/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modupdate.F

Timestamp:

2010-07-07T17:58:55+02:00 (14 years ago)

Author:

rblod

Message:

Some cleaning in External and harmonization off cpp keys with NEMO

File:

• branches/DEV_r1879_FCM/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modupdate.F (modified) (22 diffs)

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

@@ -37 +37 @@
       Use Agrif_CurgridFunctions
       Use Agrif_Mask
-#ifdef AGRIF_MPI
+#ifdef key_mpp_mpi
       Use Agrif_mpp
 #endif
@@ -627 +627 @@
       
 C
-#ifdef AGRIF_MPI
+#ifdef key_mpp_mpi
 C
 #include "mpif.h"
@@ -676 +676 @@
       INTEGER :: debloc, finloc
 C
-#ifdef AGRIF_MPI
+#ifdef key_mpp_mpi
 C
       INTEGER,DIMENSION(nbdim)   :: lb,ub
@@ -740 +740 @@
 C lubglob(:,2) : global lbound for each dimension
 
-#if !defined AGRIF_MPI
+#if !defined key_mpp_mpi
         Call Agrif_nbdim_Get_bound_dimension(child % var,lubglob(:,1),
      &               lubglob(:,2),nbdim)
@@ -817 +817 @@
       
 C
-#ifdef AGRIF_MPI
+#ifdef key_mpp_mpi
 C
 #include "mpif.h"
@@ -866 +866 @@
       integer :: coeffraf
 C
-#ifdef AGRIF_MPI
+#ifdef key_mpp_mpi
 C
       INTEGER,DIMENSION(nbdim)   :: lb,ub
@@ -907 +907 @@
       ENDDO
 
-#if !defined AGRIF_MPI      
+#if !defined key_mpp_mpi      
         Call Agrif_nbdim_Get_bound_dimension(child % var,lubglob(:,1),
      &               lubglob(:,2),nbdim)
@@ -1059 +1059 @@
       
 C
-#ifdef AGRIF_MPI
+#ifdef key_mpp_mpi
 C
 #include "mpif.h"
@@ -1117 +1117 @@
       INTEGER :: nbin, ndirin
 C
-#ifdef AGRIF_MPI
+#ifdef key_mpp_mpi
 C
       INTEGER,DIMENSION(nbdim)    :: indminglob2,indmaxglob2
@@ -1157 +1157 @@
      &                     pttab_Parent,
      &                     posvartab_Child,TypeUpdate,loctab_Child
-#ifdef AGRIF_MPI
+#ifdef key_mpp_mpi
      &                 ,pttruetabwhole,cetruetabwhole
 #endif
      &     )
 
-#ifdef AGRIF_MPI
+#ifdef key_mpp_mpi
       IF (memberin) THEN
        Call Agrif_GlobtoLocInd2(childarray,
@@ -1266 +1266 @@
 C
 C
-#ifdef AGRIF_MPI
+#ifdef key_mpp_mpi
 C
 C     tab2 contains the necessary limits of the parent grid for each processor
@@ -1391 +1391 @@
       ENDIF
 
-#ifdef AGRIF_MPI
+#ifdef key_mpp_mpi
       Call Agrif_nbdim_Get_bound_dimension(parent%var,
      &                              lowerbound,upperbound,nbdim)
@@ -1475 +1475 @@
 ccc     &    child % var % root_var % interptab(1:nbdim) .EQ. 'N'
 C
-#ifdef AGRIF_MPI
+#ifdef key_mpp_mpi
 C
 c          Allocate(childvalues% var)
@@ -1513 +1513 @@
       if (Agrif_UseSpecialValue) then
 C
-#ifdef AGRIF_MPI
+#ifdef key_mpp_mpi
 C
 c          Call GiveAgrif_SpecialValueToTab_mpi(parent%var,tempP%var,
@@ -1678 +1678 @@
 
       IF (memberin) THEN
-#ifdef AGRIF_MPI
+#ifdef key_mpp_mpi
       Call Agrif_nbdim_deallocation(tempP%var,nbdim)
       Call Agrif_nbdim_deallocation(tempC%var,nbdim)
@@ -1685 +1685 @@
 !      Deallocate(tempP % var)
       ENDIF
-#ifdef AGRIF_MPI
+#ifdef key_mpp_mpi
 !      Deallocate(tempPextend%var)
 !      IF (.Not.memberin) Deallocate(tempCextend%var)
@@ -1706 +1706 @@
      &                              posvartab_child,TypeUpdate,
      &                              loctab_Child
-#ifdef AGRIF_MPI
+#ifdef key_mpp_mpi
      &                 ,pttruetabwhole,cetruetabwhole
 #endif
@@ -1720 +1720 @@
       
 C
-#ifdef AGRIF_MPI
+#ifdef key_mpp_mpi
 cccccccccccccccccccccccccc#include "mpif.h"
 #endif
@@ -1738 +1738 @@
       INTEGER :: i
       REAL,DIMENSION(nbdim) :: dim_newmin,dim_newmax      
-#ifdef AGRIF_MPI
+#ifdef key_mpp_mpi
       INTEGER,DIMENSION(nbdim)    :: pttruetabwhole,cetruetabwhole
       REAL :: positionmin,positionmax
@@ -1759 +1759 @@
      &        agrif_int((dim_newmax(i)-s_Parent(i))/ds_Parent(i))
 C
-#ifdef AGRIF_MPI
+#ifdef key_mpp_mpi
         positionmin = s_Parent(i) + (indmin(i)-
      &                          pttab_Parent(i))*ds_Parent(i)
@@ -1816 +1816 @@
         s_Child_temp(i) = dim_newmin(i)
 
-#ifdef AGRIF_MPI
+#ifdef key_mpp_mpi
         s_Child_temp(i) = positionmin
 #endif
@@ -2521 +2521 @@
       End Subroutine Agrif_Compute_nbdim_update
  
-#if defined AGRIF_MPI      
+#if defined key_mpp_mpi      
       Subroutine Agrif_Find_list_update(list_update,pttab,petab,
      &                          pttab_Child,pttab_Parent,nbdim,