Changeset 898 for trunk/AGRIF/AGRIF_FILES/modinterp.F
- Timestamp:
- 2008-04-22T17:35:20+02:00 (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/AGRIF/AGRIF_FILES/modinterp.F
r779 r898 631 631 INTEGER,DIMENSION(nbdim,4) :: tab3 632 632 INTEGER,DIMENSION(nbdim,4,0:Agrif_Nbprocs-1) :: tab4 633 INTEGER,DIMENSION(nbdim,0:Agrif_Nbprocs-1, 4) :: tab4t633 INTEGER,DIMENSION(nbdim,0:Agrif_Nbprocs-1,8) :: tab4t 634 634 LOGICAL, DIMENSION(0:Agrif_Nbprocs-1) :: memberinall 635 LOGICAL, DIMENSION(0:Agrif_Nbprocs-1) :: sendtoproc1,recvfromproc1 635 636 LOGICAL, DIMENSION(1) :: memberin1 636 637 C … … 650 651 & pttruetab,cetruetab,member,memberin,find_list_interp 651 652 #if defined AGRIF_MPI 652 & ,tab4t,memberinall 653 & ,tab4t,memberinall,sendtoproc1,recvfromproc1 653 654 #endif 654 655 & ) … … 823 824 CALL MPI_ALLGATHER(memberin1,1,MPI_LOGICAL,memberinall, 824 825 & 1,MPI_LOGICAL,MPI_COMM_WORLD,code) 825 826 827 Call Get_External_Data_first(tab4t(:,:,1), 828 & tab4t(:,:,2), 829 & tab4t(:,:,3),tab4t(:,:,4),nbdim,member,memberin, 830 & memberinall,sendtoproc1,recvfromproc1,tab4t(:,:,5), 831 & tab4t(:,:,6),tab4t(:,:,7),tab4t(:,:,8)) 832 826 833 endif 827 834 828 Call Get_External_Data(tempP,tempPextend,tab4t(:,:,1), 829 & tab4t(:,:,2), 830 & tab4t(:,:,3),tab4t(:,:,4),nbdim,member,memberin, 831 & memberinall) 835 ! Call Get_External_Data(tempP,tempPextend,tab4t(:,:,1), 836 ! & tab4t(:,:,2), 837 ! & tab4t(:,:,3),tab4t(:,:,4),nbdim,member,memberin, 838 ! & memberinall) 839 840 Call ExchangeSameLevel2(sendtoproc1,recvfromproc1,nbdim, 841 & tab4t(:,:,3),tab4t(:,:,4),tab4t(:,:,5),tab4t(:,:,6), 842 & tab4t(:,:,7),tab4t(:,:,8),memberin,tempP, 843 & tempPextend) 832 844 #else 833 845 tempPextend%var => tempP%var … … 840 852 & pttruetab,cetruetab,member,memberin,nbdim 841 853 #if defined AGRIF_MPI 842 & ,tab4t,memberinall 854 & ,tab4t,memberinall,sendtoproc1,recvfromproc1 843 855 #endif 844 856 & ) … … 2048 2060 & find_list_interp 2049 2061 #if defined AGRIF_MPI 2050 & ,tab4t,memberinall 2062 & ,tab4t,memberinall,sendtoproc1,recvfromproc1 2051 2063 #endif 2052 2064 & ) … … 2065 2077 #ifdef AGRIF_MPI 2066 2078 C 2067 INTEGER,DIMENSION(nbdim,0:Agrif_Nbprocs-1, 4) :: tab4t2079 INTEGER,DIMENSION(nbdim,0:Agrif_Nbprocs-1,8) :: tab4t 2068 2080 LOGICAL, DIMENSION(0:Agrif_Nbprocs-1) :: memberinall 2081 LOGICAL, DIMENSION(0:Agrif_Nbprocs-1) :: sendtoproc1,recvfromproc1 2069 2082 #endif 2070 2083 … … 2098 2111 parentarray = parcours%interp_loc%parentarray(1:nbdim,:,:) 2099 2112 member = parcours%interp_loc%member 2100 tab4t = parcours%interp_loc%tab4t(1:nbdim,0:Agrif_Nbprocs-1,1: 4)2113 tab4t = parcours%interp_loc%tab4t(1:nbdim,0:Agrif_Nbprocs-1,1:8) 2101 2114 memberinall = parcours%interp_loc%memberinall(0:Agrif_Nbprocs-1) 2115 sendtoproc1 = parcours%interp_loc%sendtoproc1(0:Agrif_Nbprocs-1) 2116 recvfromproc1 = 2117 & parcours%interp_loc%recvfromproc1(0:Agrif_Nbprocs-1) 2102 2118 #endif 2103 2119 memberin = parcours%interp_loc%memberin … … 2115 2131 & member,memberin,nbdim 2116 2132 #if defined AGRIF_MPI 2117 & ,tab4t,memberinall 2133 & ,tab4t,memberinall,sendtoproc1,recvfromproc1 2118 2134 #endif 2119 2135 & ) … … 2130 2146 #ifdef AGRIF_MPI 2131 2147 C 2132 INTEGER,DIMENSION(nbdim,0:Agrif_Nbprocs-1, 4) :: tab4t2148 INTEGER,DIMENSION(nbdim,0:Agrif_Nbprocs-1,8) :: tab4t 2133 2149 LOGICAL,DIMENSION(0:Agrif_Nbprocs-1) :: memberinall 2150 LOGICAL,DIMENSION(0:Agrif_Nbprocs-1) :: sendtoproc1 2151 LOGICAL,DIMENSION(0:Agrif_Nbprocs-1) :: recvfromproc1 2134 2152 #endif 2135 2153 Type(Agrif_List_Interp_loc), Pointer :: parcours … … 2157 2175 & = parentarray(1:nbdim,:,:) 2158 2176 parcours%interp_loc%member = member 2159 Allocate(parcours%interp_loc%tab4t(nbdim,0:Agrif_Nbprocs-1, 4))2177 Allocate(parcours%interp_loc%tab4t(nbdim,0:Agrif_Nbprocs-1,8)) 2160 2178 Allocate(parcours%interp_loc%memberinall(0:Agrif_Nbprocs-1)) 2179 Allocate(parcours%interp_loc%sendtoproc1(0:Agrif_Nbprocs-1)) 2180 Allocate(parcours%interp_loc%recvfromproc1(0:Agrif_Nbprocs-1)) 2161 2181 parcours%interp_loc%tab4t=tab4t 2162 2182 parcours%interp_loc%memberinall=memberinall 2183 parcours%interp_loc%sendtoproc1=sendtoproc1 2184 parcours%interp_loc%recvfromproc1=recvfromproc1 2163 2185 #endif 2164 2186
Note: See TracChangeset
for help on using the changeset viewer.