Changeset 726 for LMDZ4/branches/V3_test/libf/dyn3dpar
- Timestamp:
- Nov 6, 2006, 4:51:16 PM (18 years ago)
- Location:
- LMDZ4/branches/V3_test/libf/dyn3dpar
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
LMDZ4/branches/V3_test/libf/dyn3dpar/advtrac.h
r709 r726 5 5 c INCLUDE 'advtrac.h' 6 6 7 COMMON/advtr/iadv,hadv,vadv,tnom,tname,ttext,niadv 7 COMMON/advtr/iadv,hadv,vadv,tnom,tname,ttext,niadv, 8 & nbtrac, nprath, mmt_adj, hadv_flg, vadv_flg, conv_flg, 9 & pbl_flg, tracnam 8 10 INTEGER iadv(nqmx) ! indice schema de transport 9 11 INTEGER hadv(nqmx) ! indice schema transport horizontal … … 13 15 character*10 tname(nqmx) ! nom du traceur pour restart 14 16 character*13 ttext(nqmx) ! nom long du traceur pour sorties 17 18 integer nbtrac 19 integer nprath 20 real mmt_adj(iim+1,jjm+1,llm, 1) 21 integer hadv_flg(nqmx) 22 integer vadv_flg(nqmx) 23 integer conv_flg(nqmx-2) 24 integer pbl_flg(nqmx-2) 25 character*8 tracnam(nqmx-2) 15 26 c----------------------------------------------------------------------- -
LMDZ4/branches/V3_test/libf/dyn3dpar/caladvtrac_p.F
r709 r726 9 9 * flxw, 10 10 * pk, 11 * mmt_adj, 12 * hadv_flg,iapptrac) 11 * iapptrac) 13 12 #else 14 13 SUBROUTINE caladvtrac_p(q,pbaru,pbarv , … … 41 40 REAL p( ip1jmp1,llmp1),q( ip1jmp1,llm,nqmx),dq( ip1jmp1,llm,2 ) 42 41 REAL teta( ip1jmp1,llm),pk( ip1jmp1,llm) 43 #ifdef INCA_CH4 44 cym INTEGER :: hadv_flg(nq) 45 INTEGER :: hadv_flg(nqmx) 46 REAL :: mmt_adj(iip1,jjp1,llm) 42 #ifdef INCA 47 43 REAL :: flxw(ip1jmp1,llm) 48 44 #endif … … 78 74 c print *,'appel a advtrac' 79 75 80 #ifdef INCA _CH476 #ifdef INCA 81 77 CALL advtrac_p( pbaru,pbarv, 82 78 * p, masse,q,iapptrac, teta, 83 79 . flxw, 84 . pk, 85 . mmt_adj, 86 . hadv_flg) 80 . pk) 87 81 #else 88 82 CALL advtrac_p( pbaru,pbarv, -
LMDZ4/branches/V3_test/libf/dyn3dpar/gcm.F
r709 r726 14 14 USE mod_hallo 15 15 USE Bands 16 #ifdef INCA17 USE inca_dim18 #endif19 16 IMPLICIT NONE 20 17 … … 64 61 #include "iniprint.h" 65 62 #include "tracstoke.h" 66 63 #include "advtrac.h" 67 64 68 65 INTEGER longcles … … 157 154 dynhist_file = 'dyn_hist' 158 155 dynhistave_file = 'dyn_hist_ave' 156 157 158 c initialisation Anne 159 hadv_flg(:) = 0. 160 vadv_flg(:) = 0. 161 conv_flg(:) = 0. 162 pbl_flg(:) = 0. 163 tracnam(:) = ' ' 164 nprath = 1 165 nbtrac = 0 166 mmt_adj(:,:,:,:) = 1 167 159 168 160 169 c-------------------------------------------------------------------------- … … 221 230 c$OMP END PARALLEL 222 231 #ifdef INCA 223 call init_inca_dim 232 call init_const_lmdz(nbtrac,anneeref,dayref,iphysiq,day_step,nday) 233 call init_inca_para(iim,jjm+1,klon2,phy_size,klon_para_nb) 224 234 #endif 225 235 … … 250 260 endif 251 261 262 #ifdef INCA 263 call init_inca_dim(klon,llm,iim,jjm, 264 $ rlonu,rlatu,rlonv,rlatv) 265 #endif 252 266 253 267 -
LMDZ4/branches/V3_test/libf/dyn3dpar/iniadvtrac.F
r709 r726 6 6 subroutine iniadvtrac(nq) 7 7 USE ioipsl 8 #ifdef INCA9 USE transport_controls, only : hadv_flg, vadv_flg10 cym USE chemshut11 USE species_names12 #endif13 8 IMPLICIT NONE 14 9 c======================================================================= … … 60 55 descrq(30)='PRA' 61 56 57 #ifdef INCA 58 59 CALL init_transport( 60 $ hadv_flg, 61 $ vadv_flg, 62 $ conv_flg, 63 $ pbl_flg, 64 $ tracnam) 65 #endif 66 62 67 c----------------------------------------------------------------------- 63 68 c Choix des schemas d'advection pour l'eau et les traceurs … … 110 115 tnom(2)='H2Ol' 111 116 nq=nbtrac+2 117 112 118 if (nq.gt.nqmx) then 113 print*,'nombre de traceurs incompatible INCA/LMDZT' 119 print*,'nombre de traceurs incompatible INCA/LMDZT', nq, nbtrac 114 120 stop 115 121 endif -
LMDZ4/branches/V3_test/libf/dyn3dpar/leapfrog_p.F
r709 r726 19 19 USE Write_Field_p 20 20 USE vampir 21 22 #ifdef INCA23 USE transport_controls, ONLY : hadv_flg, mmt_adj24 #endif25 21 26 22 IMPLICIT NONE … … 76 72 #include "academic.h" 77 73 #include "clesphys.h" 78 74 #include "advtrac.h" 79 75 80 76 include 'mpif.h' … … 148 144 149 145 REAL alpha(ip1jmp1,llm),beta(ip1jmp1,llm) 150 #ifdef INCA _CH4146 #ifdef INCA 151 147 REAL :: flxw(ip1jmp1,llm) 152 148 #endif … … 528 524 c$OMP PARALLEL DEFAULT(SHARED) 529 525 c 530 #ifdef INCA _CH4526 #ifdef INCA 531 527 CALL caladvtrac_p(q,pbaru,pbarv, 532 528 * p, masse, dq, teta, 533 529 . flxw, 534 . pk, 535 . mmt_adj, 536 . hadv_flg,iapptrac) 530 . pk, 531 . iapptrac) 537 532 #else 538 533 CALL caladvtrac_p(q,pbaru,pbarv, … … 680 675 * jj_Nb_physic,2,2,Request_physic) 681 676 enddo 682 #ifdef INCA _CH4677 #ifdef INCA 683 678 call Register_SwapFieldHallo(flxw,flxw,ip1jmp1,llm, 684 679 * jj_Nb_physic,2,2,Request_physic) … … 698 693 $ ucov,vcov,teta,q,masse,ps,p,pk,phis,phi , 699 694 $ du,dv,dteta,dq,w, 700 #ifdef INCA _CH4695 #ifdef INCA 701 696 $ flxw, 702 697 #endif -
LMDZ4/branches/V3_test/libf/dyn3dpar/mod_hallo.F90
r718 r726 3 3 implicit none 4 4 ! include 'mpif.h' 5 integer, parameter :: MaxRequest= 805 integer, parameter :: MaxRequest=200 6 6 integer, parameter :: MaxProc=80 7 7 integer, parameter :: MaxBufferSize=1024*1024*16 … … 430 430 type(request_SR),pointer :: Req 431 431 type(Hallo),pointer :: PtrHallo 432 integer, dimension( 2*mpi_size) :: TabRequest433 integer, dimension(MPI_STATUS_SIZE, 2*mpi_size) :: TabStatus432 integer, dimension(4) :: TabRequest 433 integer, dimension(MPI_STATUS_SIZE,4) :: TabStatus 434 434 integer :: NbRequest 435 435 integer :: i,rank,pos,ij,l,ierr … … 512 512 type(request_SR),pointer :: Req 513 513 type(Hallo),pointer :: PtrHallo 514 integer, dimension( mpi_size) :: TabRequest515 integer, dimension(MPI_STATUS_SIZE, mpi_size) :: TabStatus514 integer, dimension(4) :: TabRequest 515 integer, dimension(MPI_STATUS_SIZE,4) :: TabStatus 516 516 integer :: NbRequest 517 517 integer :: i,rank,pos,ij,l,ierr … … 553 553 type(request_SR),pointer :: Req 554 554 type(Hallo),pointer :: PtrHallo 555 integer, dimension( mpi_size) :: TabRequest556 integer, dimension(MPI_STATUS_SIZE, mpi_size) :: TabStatus555 integer, dimension(4) :: TabRequest 556 integer, dimension(MPI_STATUS_SIZE,4) :: TabStatus 557 557 integer :: NbRequest 558 558 integer :: i,rank,pos,ij,l,ierr
Note: See TracChangeset
for help on using the changeset viewer.