Changeset 2019 for branches/DEV_r1879_FCM
- Timestamp:
- 2010-07-20T19:48:19+02:00 (14 years ago)
- Location:
- branches/DEV_r1879_FCM/NEMOGCM/EXTERNAL/AGRIF
- Files:
-
- 4 deleted
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/DEV_r1879_FCM/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modarrays.F
r1901 r2019 55 55 INTEGER :: i,lbglob,ubglob 56 56 C 57 #ifdef AGRIF_MPI57 #ifdef key_mpp_mpi 58 58 INTEGER :: indglob1,indglob2 59 59 #endif … … 65 65 ubglob = uboundloc(i) 66 66 C 67 #ifdef AGRIF_MPI67 #ifdef key_mpp_mpi 68 68 C 69 69 Call AGRIF_InvLoc(lbglob,Agrif_ProcRank,i,indglob1) … … 335 335 C 336 336 C 337 #if !defined AGRIF_MPI337 #if !defined key_mpp_mpi 338 338 C ************************************************************************** 339 339 CCC Subroutine Agrif_nbdim_VarEQreal … … 754 754 C 755 755 C 756 #ifdef AGRIF_MPI756 #ifdef key_mpp_mpi 757 757 C ************************************************************************** 758 758 CCC Subroutine Where_ValTabToTab_mpi … … 1029 1029 End Subroutine PreProcessToInterpOrUpdate 1030 1030 1031 #ifdef AGRIF_MPI1031 #ifdef key_mpp_mpi 1032 1032 C 1033 1033 C ************************************************************************** … … 1091 1091 C 1092 1092 C 1093 #ifdef AGRIF_MPI1093 #ifdef key_mpp_mpi 1094 1094 C 1095 1095 C -
branches/DEV_r1879_FCM/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modbc.F
r1901 r2019 717 717 718 718 C 719 #ifdef AGRIF_MPI720 C 721 #include "mpif.h" 719 #ifdef key_mpp_mpi 720 C 721 INCLUDE 'mpif.h' 722 722 C 723 723 #endif … … 772 772 ! (c2t=1-c1t) 773 773 C 774 #ifdef AGRIF_MPI774 #ifdef key_mpp_mpi 775 775 C 776 776 INTEGER,DIMENSION(nbdim) :: lower,upper … … 796 796 797 797 798 #if !defined AGRIF_MPI798 #if !defined key_mpp_mpi 799 799 Call Agrif_nbdim_Get_bound_dimension(child%var,lubglob(:,1), 800 800 & lubglob(:,2),nbdim) … … 886 886 887 887 C 888 #if defined AGRIF_MPI888 #if defined key_mpp_mpi 889 889 Call Agrif_nbdim_Get_bound_dimension 890 890 & (child%var,lower,upper,nbdim) -
branches/DEV_r1879_FCM/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modinterp.F
r1901 r2019 37 37 Use Agrif_Mask 38 38 Use Agrif_CurgridFunctions 39 #if defined AGRIF_MPI39 #if defined key_mpp_mpi 40 40 Use Agrif_mpp 41 41 #endif … … 656 656 657 657 C 658 #ifdef AGRIF_MPI659 C 660 #include "mpif.h" 658 #ifdef key_mpp_mpi 659 C 660 INCLUDE 'mpif.h' 661 661 C 662 662 #endif … … 715 715 INTEGER,DIMENSION(nbdim) :: indminglob2,indmaxglob2 716 716 C 717 #ifdef AGRIF_MPI717 #ifdef key_mpp_mpi 718 718 C 719 719 LOGICAL :: memberout … … 739 739 & indmaxglob,indminglob2,indmaxglob2,parentarray, 740 740 & pttruetab,cetruetab,member,memberin,find_list_interp 741 #if defined AGRIF_MPI741 #if defined key_mpp_mpi 742 742 & ,tab4t,memberinall,sendtoproc1,recvfromproc1 743 743 #endif … … 766 766 & child % var % root_var % interptab) 767 767 768 #ifdef AGRIF_MPI768 #ifdef key_mpp_mpi 769 769 IF (memberin) THEN 770 770 Call Agrif_Parentbounds(TYPEinterp,nbdim,indmin,indmax, … … 810 810 ELSE 811 811 812 #if !defined AGRIF_MPI812 #if !defined key_mpp_mpi 813 813 parentarray(:,1,1) = indminglob 814 814 parentarray(:,2,1) = indmaxglob … … 885 885 endif 886 886 887 #ifdef AGRIF_MPI887 #ifdef key_mpp_mpi 888 888 if (.not.find_list_interp) then 889 889 tab3(:,1) = indminglob2(:) … … 936 936 & indminglob,indmaxglob,indminglob2,indmaxglob2,parentarray, 937 937 & pttruetab,cetruetab,member,memberin,nbdim 938 #if defined AGRIF_MPI938 #if defined key_mpp_mpi 939 939 & ,tab4t,memberinall,sendtoproc1,recvfromproc1 940 940 #endif … … 1034 1034 & lowerbound,upperbound,nbdim) 1035 1035 1036 #ifdef AGRIF_MPI1036 #ifdef key_mpp_mpi 1037 1037 Call Agrif_GlobtoLocInd2(childarray, 1038 1038 & lowerbound,upperbound, … … 1069 1069 if (torestore) then 1070 1070 C 1071 #ifdef AGRIF_MPI1071 #ifdef key_mpp_mpi 1072 1072 C 1073 1073 SELECT CASE (nbdim) … … 1301 1301 C 1302 1302 C Deallocations 1303 #ifdef AGRIF_MPI1303 #ifdef key_mpp_mpi 1304 1304 IF (member) THEN 1305 1305 Call Agrif_nbdim_deallocation(tempP%var,nbdim) … … 2136 2136 & pttruetab,cetruetab,member,memberin, 2137 2137 & find_list_interp 2138 #if defined AGRIF_MPI2138 #if defined key_mpp_mpi 2139 2139 & ,tab4t,memberinall,sendtoproc1,recvfromproc1 2140 2140 #endif … … 2152 2152 LOGICAL :: member, memberin 2153 2153 INTEGER :: i 2154 #ifdef AGRIF_MPI2154 #ifdef key_mpp_mpi 2155 2155 C 2156 2156 INTEGER,DIMENSION(nbdim,0:Agrif_Nbprocs-1,8) :: tab4t … … 2180 2180 cetruetab = parcours%interp_loc%cetruetab(1:nbdim) 2181 2181 2182 #if !defined AGRIF_MPI2182 #if !defined key_mpp_mpi 2183 2183 indminglob = parcours%interp_loc%indminglob(1:nbdim) 2184 2184 indmaxglob = parcours%interp_loc%indmaxglob(1:nbdim) … … 2207 2207 & parentarray,pttruetab,cetruetab, 2208 2208 & member,memberin,nbdim 2209 #if defined AGRIF_MPI2209 #if defined key_mpp_mpi 2210 2210 & ,tab4t,memberinall,sendtoproc1,recvfromproc1 2211 2211 #endif … … 2221 2221 INTEGER,DIMENSION(nbdim,2,2) :: parentarray 2222 2222 LOGICAL :: member, memberin 2223 #ifdef AGRIF_MPI2223 #ifdef key_mpp_mpi 2224 2224 C 2225 2225 INTEGER,DIMENSION(nbdim,0:Agrif_Nbprocs-1,8) :: tab4t … … 2243 2243 2244 2244 parcours%interp_loc%memberin = memberin 2245 #if !defined AGRIF_MPI2245 #if !defined key_mpp_mpi 2246 2246 parcours%interp_loc%indminglob(1:nbdim) = indminglob(1:nbdim) 2247 2247 parcours%interp_loc%indmaxglob(1:nbdim) = indmaxglob(1:nbdim) -
branches/DEV_r1879_FCM/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modmpp.F
r1901 r2019 30 30 31 31 Contains 32 #ifdef AGRIF_MPI32 #ifdef key_mpp_mpi 33 33 Subroutine Get_External_Data_first(pttruetab, 34 34 & cetruetab,pttruetabwhole,cetruetabwhole,nbdim,memberin, … … 37 37 38 38 IMPLICIT NONE 39 #include "mpif.h" 39 INCLUDE 'mpif.h' 40 40 INTEGER :: nbdim 41 41 INTEGER,DIMENSION(nbdim,0:Agrif_NbProcs-1) :: pttruetab, … … 177 177 178 178 IMPLICIT NONE 179 #include "mpif.h" 179 INCLUDE 'mpif.h' 180 180 INTEGER :: nbdim 181 181 TYPE(Agrif_PVariable) :: tempC, tempCextend … … 345 345 TYPE(AGRIF_PVARIABLE), SAVE :: temprecv 346 346 347 #include "mpif.h" 347 INCLUDE 'mpif.h' 348 348 INTEGER :: i,k 349 349 INTEGER :: etiquette = 100 … … 682 682 LOGICAL :: res 683 683 684 #include "mpif.h" 684 INCLUDE 'mpif.h' 685 685 INTEGER :: i,k 686 686 INTEGER :: etiquette = 100 … … 798 798 TYPE(AGRIF_PVARIABLE), SAVE :: temprecv 799 799 800 #include "mpif.h" 800 INCLUDE 'mpif.h' 801 801 INTEGER :: i,k 802 802 INTEGER :: etiquette = 100 … … 1096 1096 integer :: etiquette = 100 1097 1097 integer :: datasize, code 1098 #include "mpif.h" 1098 INCLUDE 'mpif.h' 1099 1099 1100 1100 datasize = SIZE(tab3D( -
branches/DEV_r1879_FCM/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modsauv.F
r1901 r2019 199 199 & Call Agrif_Free_list_interp(list_interp%suiv) 200 200 201 #ifdef AGRIF_MPI201 #ifdef key_mpp_mpi 202 202 Deallocate(list_interp%interp_loc%tab4t) 203 203 Deallocate(list_interp%interp_loc%memberinall) -
branches/DEV_r1879_FCM/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modtypes.F
r1901 r2019 276 276 INTEGER,DIMENSION(6) :: pttruetab,cetruetab 277 277 logical :: member, memberin 278 #if !defined AGRIF_MPI278 #if !defined key_mpp_mpi 279 279 integer,dimension(6) :: indminglob,indmaxglob 280 280 #else … … 408 408 INTEGER :: Agrif_USE_FIXED_GRIDS 409 409 C 410 #ifdef AGRIF_MPI410 #ifdef key_mpp_mpi 411 411 INTEGER :: Agrif_Nbprocs ! Number of processors 412 412 INTEGER :: Agrif_ProcRank ! Rank of the current processor -
branches/DEV_r1879_FCM/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modupdate.F
r1901 r2019 37 37 Use Agrif_CurgridFunctions 38 38 Use Agrif_Mask 39 #ifdef AGRIF_MPI39 #ifdef key_mpp_mpi 40 40 Use Agrif_mpp 41 41 #endif … … 627 627 628 628 C 629 #ifdef AGRIF_MPI630 C 631 #include "mpif.h" 629 #ifdef key_mpp_mpi 630 C 631 INCLUDE 'mpif.h' 632 632 C 633 633 #endif … … 676 676 INTEGER :: debloc, finloc 677 677 C 678 #ifdef AGRIF_MPI678 #ifdef key_mpp_mpi 679 679 C 680 680 INTEGER,DIMENSION(nbdim) :: lb,ub … … 740 740 C lubglob(:,2) : global lbound for each dimension 741 741 742 #if !defined AGRIF_MPI742 #if !defined key_mpp_mpi 743 743 Call Agrif_nbdim_Get_bound_dimension(child % var,lubglob(:,1), 744 744 & lubglob(:,2),nbdim) … … 817 817 818 818 C 819 #ifdef AGRIF_MPI820 C 821 #include "mpif.h" 819 #ifdef key_mpp_mpi 820 C 821 INCLUDE 'mpif.h' 822 822 C 823 823 #endif … … 866 866 integer :: coeffraf 867 867 C 868 #ifdef AGRIF_MPI868 #ifdef key_mpp_mpi 869 869 C 870 870 INTEGER,DIMENSION(nbdim) :: lb,ub … … 907 907 ENDDO 908 908 909 #if !defined AGRIF_MPI909 #if !defined key_mpp_mpi 910 910 Call Agrif_nbdim_Get_bound_dimension(child % var,lubglob(:,1), 911 911 & lubglob(:,2),nbdim) … … 1059 1059 1060 1060 C 1061 #ifdef AGRIF_MPI1062 C 1063 #include "mpif.h" 1061 #ifdef key_mpp_mpi 1062 C 1063 INCLUDE 'mpif.h' 1064 1064 C 1065 1065 #endif … … 1117 1117 INTEGER :: nbin, ndirin 1118 1118 C 1119 #ifdef AGRIF_MPI1119 #ifdef key_mpp_mpi 1120 1120 C 1121 1121 INTEGER,DIMENSION(nbdim) :: indminglob2,indmaxglob2 … … 1157 1157 & pttab_Parent, 1158 1158 & posvartab_Child,TypeUpdate,loctab_Child 1159 #ifdef AGRIF_MPI1159 #ifdef key_mpp_mpi 1160 1160 & ,pttruetabwhole,cetruetabwhole 1161 1161 #endif 1162 1162 & ) 1163 1163 1164 #ifdef AGRIF_MPI1164 #ifdef key_mpp_mpi 1165 1165 IF (memberin) THEN 1166 1166 Call Agrif_GlobtoLocInd2(childarray, … … 1266 1266 C 1267 1267 C 1268 #ifdef AGRIF_MPI1268 #ifdef key_mpp_mpi 1269 1269 C 1270 1270 C tab2 contains the necessary limits of the parent grid for each processor … … 1391 1391 ENDIF 1392 1392 1393 #ifdef AGRIF_MPI1393 #ifdef key_mpp_mpi 1394 1394 Call Agrif_nbdim_Get_bound_dimension(parent%var, 1395 1395 & lowerbound,upperbound,nbdim) … … 1475 1475 ccc & child % var % root_var % interptab(1:nbdim) .EQ. 'N' 1476 1476 C 1477 #ifdef AGRIF_MPI1477 #ifdef key_mpp_mpi 1478 1478 C 1479 1479 c Allocate(childvalues% var) … … 1513 1513 if (Agrif_UseSpecialValue) then 1514 1514 C 1515 #ifdef AGRIF_MPI1515 #ifdef key_mpp_mpi 1516 1516 C 1517 1517 c Call GiveAgrif_SpecialValueToTab_mpi(parent%var,tempP%var, … … 1678 1678 1679 1679 IF (memberin) THEN 1680 #ifdef AGRIF_MPI1680 #ifdef key_mpp_mpi 1681 1681 Call Agrif_nbdim_deallocation(tempP%var,nbdim) 1682 1682 Call Agrif_nbdim_deallocation(tempC%var,nbdim) … … 1685 1685 ! Deallocate(tempP % var) 1686 1686 ENDIF 1687 #ifdef AGRIF_MPI1687 #ifdef key_mpp_mpi 1688 1688 ! Deallocate(tempPextend%var) 1689 1689 ! IF (.Not.memberin) Deallocate(tempCextend%var) … … 1706 1706 & posvartab_child,TypeUpdate, 1707 1707 & loctab_Child 1708 #ifdef AGRIF_MPI1708 #ifdef key_mpp_mpi 1709 1709 & ,pttruetabwhole,cetruetabwhole 1710 1710 #endif … … 1720 1720 1721 1721 C 1722 #ifdef AGRIF_MPI1722 #ifdef key_mpp_mpi 1723 1723 cccccccccccccccccccccccccc#include "mpif.h" 1724 1724 #endif … … 1738 1738 INTEGER :: i 1739 1739 REAL,DIMENSION(nbdim) :: dim_newmin,dim_newmax 1740 #ifdef AGRIF_MPI1740 #ifdef key_mpp_mpi 1741 1741 INTEGER,DIMENSION(nbdim) :: pttruetabwhole,cetruetabwhole 1742 1742 REAL :: positionmin,positionmax … … 1759 1759 & agrif_int((dim_newmax(i)-s_Parent(i))/ds_Parent(i)) 1760 1760 C 1761 #ifdef AGRIF_MPI1761 #ifdef key_mpp_mpi 1762 1762 positionmin = s_Parent(i) + (indmin(i)- 1763 1763 & pttab_Parent(i))*ds_Parent(i) … … 1816 1816 s_Child_temp(i) = dim_newmin(i) 1817 1817 1818 #ifdef AGRIF_MPI1818 #ifdef key_mpp_mpi 1819 1819 s_Child_temp(i) = positionmin 1820 1820 #endif … … 2521 2521 End Subroutine Agrif_Compute_nbdim_update 2522 2522 2523 #if defined AGRIF_MPI2523 #if defined key_mpp_mpi 2524 2524 Subroutine Agrif_Find_list_update(list_update,pttab,petab, 2525 2525 & pttab_Child,pttab_Parent,nbdim, -
branches/DEV_r1879_FCM/NEMOGCM/EXTERNAL/AGRIF/AGRIF_FILES/modutil.F
r1901 r2019 62 62 External :: procname 63 63 C 64 #ifdef AGRIF_MPI64 #ifdef key_mpp_mpi 65 65 Logical :: mpi_was_called 66 66 Integer :: code, ierr 67 #include "mpif.h" 67 INCLUDE 'mpif.h' 68 68 C 69 69 C … … 670 670 C definition of the probdim and modtypes variables 671 671 C 672 #ifdef AGRIF_MPI673 #include "mpif.h" 672 #ifdef key_mpp_mpi 673 INCLUDE 'mpif.h' 674 674 Agrif_MPIPREC = MPI_DOUBLE_PRECISION 675 675 #endif
Note: See TracChangeset
for help on using the changeset viewer.