Changeset 847 for trunk/LMDZ.COMMON/libf/dyn3dpar
- Timestamp:
- Nov 18, 2012, 7:15:08 PM (12 years ago)
- Location:
- trunk/LMDZ.COMMON/libf/dyn3dpar
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LMDZ.COMMON/libf/dyn3dpar/calfis_p.F
r841 r847 357 357 358 358 ! ADAPTATION GCM POUR CP(T) 359 call tpot2t_p( ngridmx*llm,zteta,ztfi,zpk)359 call tpot2t_p(klon,llm,zteta,ztfi,zpk) 360 360 361 361 c$OMP DO SCHEDULE(STATIC,OMP_CHUNK) … … 984 984 985 985 ! ADAPTATION GCM POUR CP(T) 986 call t2tpot_p( ngridmx,llm,ztfi,zteta,zpk)986 call t2tpot_p(klon,llm,ztfi,zteta,zpk) 987 987 988 988 -
trunk/LMDZ.COMMON/libf/dyn3dpar/cpdet.F
r37 r847 109 109 integer :: ij,l,ijb,ije 110 110 111 ijb=ij_begin 112 ije=ij_end 113 111 !ijb=ij_begin 112 !ije=ij_end 113 ijb=1 114 ije=ip1jmp1 115 114 116 if (planet_type.eq."venus") then 115 117 !$OMP DO SCHEDULE(STATIC,OMP_CHUNK) … … 165 167 c====================================================================== 166 168 c====================================================================== 167 SUBROUTINE tpot2t_p(ip1jmp1,llm,yteta, yt,ypk)169 SUBROUTINE tpot2t_p(ip1jmp1,llm,yteta,yt,ypk) 168 170 ! Parallel version of tpot2t 169 171 USE parallel … … 177 179 real,intent(in) :: yteta(ip1jmp1,llm) 178 180 real,intent(in) :: ypk(ip1jmp1,llm) 181 179 182 ! local variable: 180 183 integer :: ij,l,ijb,ije 181 182 ijb=ij_begin 183 ije=ij_end 184 185 !ijb=ij_begin 186 !ije=ij_end 187 ijb=1 188 ije=ip1jmp1 184 189 185 190 if (planet_type.eq."venus") then -
trunk/LMDZ.COMMON/libf/dyn3dpar/leapfrog_p.F
r841 r847 521 521 ! call Register_SwapFieldHallo(finvmaold,finvmaold,ip1jmp1,llm, 522 522 ! & jj_Nb_caldyn,0,0,TestRequest) 523 523 524 524 do j=1,nqtot 525 525 call Register_SwapFieldHallo(q(1,1,j),q(1,1,j),ip1jmp1,llm, … … 610 610 call WriteField_p('pkf',reshape(pkf,(/iip1,jmp1,llm/))) 611 611 call WriteField_p('phis',reshape(phis,(/iip1,jmp1/))) 612 if (nqtot > 0) then 612 613 do j=1,nqtot 613 614 call WriteField_p('q'//trim(int2str(j)), 614 615 . reshape(q(:,:,j),(/iip1,jmp1,llm/))) 615 616 enddo 617 endif 616 618 !$OMP END MASTER 617 619 c$OMP BARRIER … … 939 941 * 1,0,0,1,Request_physic) 940 942 943 if (nqtot > 0) then 941 944 do j=1,nqtot 942 945 call Register_Hallo(dqfi(1,1,j),ip1jmp1,llm, 943 946 * 1,0,0,1,Request_physic) 944 947 enddo 948 endif 945 949 946 950 call SendRequest(Request_Physic) … … 1058 1062 c 1059 1063 c Diagnostique de conservation de l'energie : difference 1060 IF ( ip_ebil_dyn.ge.1) THEN1064 IF ((ip_ebil_dyn.ge.1 ) .and. (nqtot > 1)) THEN 1061 1065 ztit='bil phys' 1062 1066 CALL diagedyn(ztit,2,1,1,dtphys … … 1499 1503 write(82,*) 'ps',ps 1500 1504 write(83,*) 'q',q 1501 WRITE(85,*) 'q1 = ',q(:,:,1) 1502 WRITE(86,*) 'q3 = ',q(:,:,3) 1505 if (nqtot > 2) then 1506 WRITE(85,*) 'q1 = ',q(:,:,1) 1507 WRITE(86,*) 'q3 = ',q(:,:,3) 1508 endif 1503 1509 endif 1504 1510 … … 1554 1560 call Gather_Field(pk,ip1jmp1,llm,0) 1555 1561 call Gather_Field(phi,ip1jmp1,llm,0) 1556 do iq=1,nqtot1562 do iq=1,nqtot 1557 1563 call Gather_Field(q(1,1,iq),ip1jmp1,llm,0) 1558 enddo1564 enddo 1559 1565 call Gather_Field(masse,ip1jmp1,llm,0) 1560 1566 call Gather_Field(ps,ip1jmp1,1,0) … … 1626 1632 call Gather_Field(teta,ip1jmp1,llm,0) 1627 1633 call Gather_Field(phi,ip1jmp1,llm,0) 1628 do iq=1,nqtot1634 do iq=1,nqtot 1629 1635 call Gather_Field(q(1,1,iq),ip1jmp1,llm,0) 1630 enddo1636 enddo 1631 1637 call Gather_Field(masse,ip1jmp1,llm,0) 1632 1638 call Gather_Field(ps,ip1jmp1,1,0) … … 1850 1856 call Gather_Field(teta,ip1jmp1,llm,0) 1851 1857 call Gather_Field(phi,ip1jmp1,llm,0) 1852 do iq=1,nqtot1858 do iq=1,nqtot 1853 1859 call Gather_Field(q(1,1,iq),ip1jmp1,llm,0) 1854 enddo1860 enddo 1855 1861 call Gather_Field(masse,ip1jmp1,llm,0) 1856 1862 call Gather_Field(ps,ip1jmp1,1,0) … … 1869 1875 call Gather_Field(teta,ip1jmp1,llm,0) 1870 1876 call Gather_Field(ps,ip1jmp1,1,0) 1871 do iq=1,nqtot1877 do iq=1,nqtot 1872 1878 call Gather_Field(q(1,1,iq),ip1jmp1,llm,0) 1873 enddo1879 enddo 1874 1880 c 1875 1881 if (mpi_rank==0) then
Note: See TracChangeset
for help on using the changeset viewer.