Changeset 762 for LMDZ4/trunk/libf/dyn3d
- Timestamp:
- Jun 4, 2007, 3:34:26 PM (17 years ago)
- Location:
- LMDZ4/trunk/libf/dyn3d
- Files:
-
- 11 edited
-
advtrac.F (modified) (4 diffs)
-
advtrac.h (modified) (2 diffs)
-
caladvtrac.F (modified) (3 diffs)
-
create_etat0_limit.F (modified) (4 diffs)
-
etat0_netcdf.F (modified) (5 diffs)
-
gcm.F (modified) (5 diffs)
-
guide.F (modified) (1 diff)
-
iniadvtrac.F (modified) (2 diffs)
-
leapfrog.F (modified) (4 diffs)
-
limit_netcdf.F (modified) (2 diffs)
-
write_paramLMDZ_dyn.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
LMDZ4/trunk/libf/dyn3d/advtrac.F
r616 r762 8 8 * p, masse,q,iapptrac,teta, 9 9 * flxw, 10 * pk, 11 * mmt_adj, 12 * hadv_flg) 10 * pk) 13 11 #else 14 12 SUBROUTINE advtrac(pbaru,pbarv , … … 51 49 REAL pk(ip1jmp1,llm) 52 50 #ifdef INCA 53 INTEGER :: hadv_flg(nqmx)54 REAL :: mmt_adj(ip1jmp1,llm,1)55 51 REAL :: flxw(ip1jmp1,llm) 56 52 #endif … … 215 211 #ifdef INCA 216 212 do iiq = iq+1, iq+3 217 q(:,:,iiq)=q(:,:,iiq)*mmt_adj(:,:,1) 213 c q(:,:,iiq)=q(:,:,iiq)*mmt_adj(:,:,1) 214 q(:,:,iiq)=q(:,:,iiq)*1 218 215 enddo 219 216 #endif … … 233 230 #ifdef INCA 234 231 do iiq = iq+1, iq+9 235 q(:,:,iiq)=q(:,:,iiq)*mmt_adj(:,:,1) 232 c q(:,:,iiq)=q(:,:,iiq)*mmt_adj(:,:,1) 233 q(:,:,iiq)=q(:,:,iiq)*1 236 234 enddo 237 235 #endif -
LMDZ4/trunk/libf/dyn3d/advtrac.h
r524 r762 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 19 integer nbtrac 20 integer nprath 21 real mmt_adj(iim+1,jjm+1,llm, 1) 22 integer hadv_flg(nqmx) 23 integer vadv_flg(nqmx) 24 integer conv_flg(nqmx-2) 25 integer pbl_flg(nqmx-2) 26 character*8 tracnam(nqmx-2) 15 27 c----------------------------------------------------------------------- -
LMDZ4/trunk/libf/dyn3d/caladvtrac.F
r616 r762 8 8 * p ,masse, dq , teta, 9 9 * flxw, 10 * pk, 11 * mmt_adj, 12 * hadv_flg) 10 * pk) 13 11 #else 14 12 SUBROUTINE caladvtrac(q,pbaru,pbarv , … … 42 40 REAL teta( ip1jmp1,llm),pk( ip1jmp1,llm) 43 41 #ifdef INCA 44 INTEGER :: hadv_flg(nqmx)45 REAL :: mmt_adj(iip1,jjp1,llm,1)46 42 REAL :: flxw(ip1jmp1,llm) 47 43 #endif … … 77 73 * p, masse,q,iapptrac, teta, 78 74 . flxw, 79 . pk, 80 . mmt_adj, 81 . hadv_flg) 75 . pk) 82 76 #else 83 77 CALL advtrac( pbaru,pbarv, -
LMDZ4/trunk/libf/dyn3d/create_etat0_limit.F
r524 r762 3 3 ! 4 4 PROGRAM create_etat0_limit 5 USE dimphy 6 USE comgeomphy 7 5 8 c 6 9 c … … 18 21 c 19 22 c on cree le masque dans etat0 que l'on passe ensuite dans limit pour 20 c garder les coh érences23 c garder les coherences 21 24 22 25 LOGICAL interbar, extrap , oldice … … 25 28 #include "paramet.h" 26 29 #include "indicesol.h" 27 #include "dimphy.h" 30 cym#include "dimphy.h" 28 31 REAL :: masque(iip1,jjp1) 29 REAL :: pctsrf( klon, nbsrf)32 REAL :: pctsrf(iim*(jjm-1)+2, nbsrf) 30 33 34 35 call InitDimphy 36 call init_phys_openmp 37 call InitComgeomphy 38 31 39 WRITE(6,*) ' ********************* ' 32 40 WRITE(6,*) ' interbar = ',interbar … … 38 46 WRITE(6,*) ' ********************* ' 39 47 WRITE(6,1) 40 c 48 49 c 41 50 CALL limit_netcdf ( interbar, extrap , oldice, masque, pctsrf ) 42 51 -
LMDZ4/trunk/libf/dyn3d/etat0_netcdf.F
r724 r762 8 8 USE startvar 9 9 USE ioipsl 10 USE dimphy 10 11 ! 11 12 IMPLICIT NONE … … 23 24 #include "comconst.h" 24 25 #include "indicesol.h" 25 #include "dimphy.h"26 c#include "dimphy.h" 26 27 #include "dimsoil.h" 27 28 #include "temps.h" … … 510 511 C verif que somme des sous surface = 1 511 512 C 512 ji=count( abs(sum(pctsrf(1 : klon, 1 : nbsrf), dim = 2) - 1.0)513 ji=count( (abs( sum(pctsrf(1 : klon, 1 : nbsrf),dim=2))-1.0) 513 514 $ .GT. EPSFRA) 514 515 IF (ji .NE. 0) THEN … … 671 672 rnebcon = 0.0 672 673 ratqs = 0.0 673 run_off_lic_0 = 0.0 674 run_off_lic_0 = 0.0 674 675 675 676 cIM call phyredem("startphy.nc",phystep,radpas, co2_ppm, solaire, 677 676 678 call phyredem("startphy.nc",phystep,radpas, 677 679 $ latfi, lonfi, pctsrf, tsolsrf, tsoil, tslab, seaice, … … 683 685 $ t_ancien, q_ancien, rnebcon, ratqs, clwcon, 684 686 $ run_off_lic_0) 685 print*,'sortie phyredem'686 687 687 688 C Sortie Visu pour les champs dynamiques -
LMDZ4/trunk/libf/dyn3d/gcm.F
r691 r762 9 9 USE IOIPSL 10 10 #endif 11 11 USE dimphy 12 USE comgeomphy 12 13 IMPLICIT NONE 13 14 … … 57 58 #include "iniprint.h" 58 59 #include "tracstoke.h" 59 60 #include "advtrac.h" 60 61 61 62 INTEGER longcles … … 144 145 dynhistave_file = 'dyn_hist_ave.nc' 145 146 147 c initialisation Anne 148 hadv_flg(:) = 0. 149 vadv_flg(:) = 0. 150 conv_flg(:) = 0. 151 pbl_flg(:) = 0. 152 tracnam(:) = ' ' 153 nprath = 1 154 nbtrac = 0 155 mmt_adj(:,:,:,:) = 1 156 157 146 158 c-------------------------------------------------------------------------- 147 159 c Iflag_phys controle l'appel a la physique : … … 183 195 CALL defrun( 99, .TRUE. , clesphy0 ) 184 196 #endif 197 198 call InitDimphy 199 call init_phys_openmp 200 call InitComgeomphy 201 202 #ifdef INCA 203 call init_const_lmdz(nbtrac,anneeref,dayref,iphysiq,day_step,nday) 204 call init_inca_para(iim,jjm+1,klon2,phy_size,klon_para_nb) 205 #endif 206 207 c 208 c 209 c------------------------------------ 210 c Initialisation partie parallele 211 c------------------------------------ 212 185 213 c 186 214 c … … 211 239 endif 212 240 241 #ifdef INCA 242 call init_inca_dim(klon,llm,iim,jjm, 243 $ rlonu,rlatu,rlonv,rlatv) 244 #endif 213 245 214 246 -
LMDZ4/trunk/libf/dyn3d/guide.F
r644 r762 367 367 if (first.and.ini_anal) vcov(ij,l)=a 368 368 enddo 369 if (first.and.ini_anal) vcov(ij,l)=a370 369 enddo 371 370 endif -
LMDZ4/trunk/libf/dyn3d/iniadvtrac.F
r616 r762 6 6 subroutine iniadvtrac(nq) 7 7 USE ioipsl 8 #ifdef INCA9 USE transport_controls, only : hadv_flg, vadv_flg10 USE species_names11 USE chemshut12 #endif13 8 IMPLICIT NONE 14 9 c======================================================================= … … 59 54 descrq(20)='SLP' 60 55 descrq(30)='PRA' 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 61 66 62 67 c----------------------------------------------------------------------- -
LMDZ4/trunk/libf/dyn3d/leapfrog.F
r692 r762 7 7 & time_0) 8 8 9 #ifdef INCA10 USE transport_controls, ONLY : hadv_flg, mmt_adj11 #endif12 9 13 10 cIM : pour sortir les param. du modele dans un fis. netcdf 110106 … … 61 58 #include "com_io_dyn.h" 62 59 #include "iniprint.h" 63 60 #include "advtrac.h" 64 61 c#include "tracstoke.h" 65 62 … … 297 294 * p, masse, dq, teta, 298 295 . flxw, 299 . pk, 300 . mmt_adj, 301 . hadv_flg) 296 . pk) 302 297 #else 303 298 CALL caladvtrac(q,pbaru,pbarv, … … 515 510 516 511 IF( itau. EQ. itaufinp1 ) then 517 c$$$write(79,*) 'ucov',ucov518 c$$$write(80,*) 'vcov',vcov519 c$$$write(81,*) 'teta',teta520 c$$$write(82,*) 'ps',ps521 c$$$write(83,*) 'q',q522 c$$$WRITE(85,*) 'q1 = ',q(:,:,1)523 c$$$WRITE(86,*) 'q3 = ',q(:,:,3)512 write(79,*) 'ucov',ucov 513 write(80,*) 'vcov',vcov 514 write(81,*) 'teta',teta 515 write(82,*) 'ps',ps 516 write(83,*) 'q',q 517 WRITE(85,*) 'q1 = ',q(:,:,1) 518 WRITE(86,*) 'q3 = ',q(:,:,3) 524 519 525 520 abort_message = 'Simulation finished' -
LMDZ4/trunk/libf/dyn3d/limit_netcdf.F
r677 r762 5 5 C 6 6 SUBROUTINE limit_netcdf(interbar, extrap, oldice, masque, pctsrf) 7 c 7 USE dimphy 8 8 IMPLICIT none 9 9 c … … 30 30 #include "comgeom2.h" 31 31 #include "comconst.h" 32 #include "dimphy.h"32 cy#include "dimphy.h" 33 33 #include "indicesol.h" 34 34 c -
LMDZ4/trunk/libf/dyn3d/write_paramLMDZ_dyn.h
r721 r762 120 120 . zx_tmp_2d,iip1*jjp1,ndex2d) 121 121 c 122 zx_tmp_2d(1:iip1,1:jjp1)= ecritphy122 zx_tmp_2d(1:iip1,1:jjp1)=FLOAT(ecritphy) 123 123 CALL histwrite(nid_ctesGCM, "ecritphy", itau_dyn, 124 124 . zx_tmp_2d,iip1*jjp1,ndex2d)
Note: See TracChangeset
for help on using the changeset viewer.
