Changeset 774 for trunk/AGRIF/AGRIF_FILES/modbc.F

Timestamp:

2007-12-18T17:45:53+01:00 (16 years ago)

Author:

rblod

Message:

Update Agrif, see ticket:#39

File:

• trunk/AGRIF/AGRIF_FILES/modbc.F (modified) (11 diffs)

trunk/AGRIF/AGRIF_FILES/modbc.F

@@ -58 +58 @@
 C
 C     Arguments      
-      INTEGER,DIMENSION(6) :: TypeInterp    ! TYPE of interpolation
+      INTEGER,DIMENSION(6,6) :: TypeInterp    ! TYPE of interpolation
                                             ! (linear,...)
       TYPE(AGRIF_PVariable) :: parent       ! Variable on the parent grid
@@ -126 +126 @@
       External :: procname
       Optional :: procname
-      INTEGER,DIMENSION(6) :: TypeInterp    ! TYPE of interpolation (linear, 
+      INTEGER,DIMENSION(6,6) :: TypeInterp    ! TYPE of interpolation (linear, 
                                             ! lagrange, spline, ... )
       TYPE(AGRIF_PVariable) :: parent       ! Variable on the parent grid
@@ -202 +202 @@
       External :: procname
       Optional :: procname     
-      INTEGER,DIMENSION(6) :: TypeInterp    ! TYPE of interpolation (linear, 
+      INTEGER,DIMENSION(6,6) :: TypeInterp    ! TYPE of interpolation (linear, 
                                             ! lagrange, spline, ... )
       TYPE(AGRIF_PVariable) :: parent       ! Variable on the parent grid
@@ -279 +279 @@
       External :: procname
       Optional :: procname     
-      INTEGER,DIMENSION(6) :: TypeInterp      ! TYPE of interpolation (linear, 
+      INTEGER,DIMENSION(6,6) :: TypeInterp      ! TYPE of interpolation (linear, 
                                               ! lagrange, spline, ... )
       TYPE(AGRIF_PVariable) :: parent         ! Variable on the parent grid
@@ -356 +356 @@
       External :: procname
       Optional :: procname     
-      INTEGER,DIMENSION(6) :: TypeInterp      ! TYPE of interpolation (linear, 
+      INTEGER,DIMENSION(6,6) :: TypeInterp      ! TYPE of interpolation (linear, 
                                               ! lagrange, spline, ... )
       TYPE(AGRIF_PVariable) :: parent         ! Variable on the parent grid
@@ -433 +433 @@
 C
 C     Arguments      
-      INTEGER,DIMENSION(6) :: TypeInterp      ! TYPE of interpolation (linear, 
+      INTEGER,DIMENSION(6,6) :: TypeInterp      ! TYPE of interpolation (linear, 
                                               ! lagrange, spline, ... )
       TYPE(AGRIF_PVariable) :: parent         ! Variable on the parent grid
@@ -507 +507 @@
       TYPE(AGRIF_PVariable) :: parent         ! Variable on the parent grid
       TYPE(AGRIF_PVariable) :: child          ! Variable on the child grid
-      INTEGER,DIMENSION(6)  :: TypeInterp     ! TYPE of interpolation
+      INTEGER,DIMENSION(6,6)  :: TypeInterp     ! TYPE of interpolation
                                               !    (linear,lagrange,...)
       INTEGER               :: deb,fin        ! Positions where boundary
@@ -715 +715 @@
       External :: procname
       Optional :: procname
-      INTEGER,DIMENSION(6) :: TypeInterp ! TYPE of interpolation (linear, 
+      INTEGER,DIMENSION(6,6) :: TypeInterp ! TYPE of interpolation (linear, 
                                          !   spline,...)  
       TYPE(AGRIF_PVariable)    :: parent ! Variable on the parent grid
@@ -910 +910 @@
 C      
       kindex = 1    
+      
+
 C
       do nb = 1,nbdim
 C
-        do ndir = 1,2                
+        do ndir = 1,2
 C
           if (loctab_child(nb) /= (-ndir) 
@@ -920 +922 @@
               IF (present(procname)) THEN
               Call Agrif_InterpnD
-     &             (TYPEInterp,parent,child,
+     &             (TYPEInterp(nb,:),parent,child,
      &              ptres(1:nbdim,1,ndir,nb),ptres(1:nbdim,2,ndir,nb),
      &              pttab_child(1:nbdim),pttab_Parent(1:nbdim),
@@ -928 +930 @@
               ELSE
               Call Agrif_InterpnD              
-     &             (TYPEInterp,parent,child,
+     &             (TYPEInterp(nb,:),parent,child,
      &              ptres(1:nbdim,1,ndir,nb),ptres(1:nbdim,2,ndir,nb),
      &              pttab_child(1:nbdim),pttab_Parent(1:nbdim),