Changeset 2000
- Timestamp:
- Sep 19, 2018, 10:53:15 AM (6 years ago)
- Location:
- trunk/ICOSA_LMDZ/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ICOSA_LMDZ/src/distrib_icosa_lmdz.f90
r1696 r2000 90 90 INTEGER,POINTER :: index(:) 91 91 92 !$OMP BARRIER 92 93 pos=0 93 94 DO ind=1,ndomain_distrib … … 114 115 INTEGER :: l 115 116 117 !$OMP BARRIER 116 118 DO l=1,size(field_lmdz,2) 117 119 pos=0 … … 141 143 INTEGER :: l,q 142 144 145 !$OMP BARRIER 143 146 DO q=1,size(field_lmdz,3) 144 147 DO l=1,size(field_lmdz,2) … … 167 170 INTEGER,POINTER :: index(:) 168 171 172 !$OMP BARRIER 169 173 pos=0 170 174 DO ind=1,ndomain_distrib … … 189 193 INTEGER :: l 190 194 195 !$OMP BARRIER 191 196 DO l=1,size(field_lmdz,2) 192 197 pos=0 … … 215 220 INTEGER :: l,q 216 221 222 !$OMP BARRIER 217 223 DO q=1,size(field_lmdz,3) 218 224 DO l=1,size(field_lmdz,2) -
trunk/ICOSA_LMDZ/src/phystd/interface_icosa_lmdz.f90
r1982 r2000 255 255 ENDDO 256 256 257 !$OMP BARRIER258 257 259 258 CALL transfer_icosa_to_lmdz(f_ind_cell_glo,ind_cell_glo) … … 276 275 277 276 ! Initialize tracer names, numbers, etc. for physics 278 !$OMP MASTER279 277 !Config Key = type_trac 280 278 !Config Desc = Choix de couplage avec model de chimie INCA ou REPROBUS … … 290 288 ! nqo=2 291 289 ! nbtr=2 290 !$OMP MASTER 292 291 ALLOCATE(tname(nqtot)) 292 !$OMP END MASTER 293 !$OMP BARRIER 293 294 ! ALLOCATE(ttext(nqtot)) 294 295 ! ALLOCATE(niadv(nqtot)) … … 299 300 300 301 ! read tname() from traceur.def file 302 IF (is_mpi_root) THEN 303 !$OMP MASTER 301 304 OPEN(unit=42,file="traceur.def",form="formatted",status="old",iostat=ierr) 302 305 IF (ierr==0) THEN … … 313 316 !$OMP END MASTER 314 317 !$OMP BARRIER 318 ENDIF ! of (is_mpi_root) 319 320 DO i=1,nqtot 321 CALL bcast(tname(i)) 322 ENDDO 315 323 316 324 ! CALL init_infotrac_phy(nqtot,nqo,nbtr,tname,ttext,type_trac,& … … 325 333 ! CALL inifis(klon_omp,nlayer,nqtot,pdayref,punjours,nday,ptimestep, & 326 334 ! latitude,longitude,cell_area,prad,pg,pr,pcpp) 327 !$OMP MASTER328 335 329 336 startphy_file=.true. … … 332 339 IF (startphy_file) THEN 333 340 341 IF (is_mpi_root) THEN 342 !$OMP MASTER 334 343 status=nf90_open('startfi.nc',NF90_NOWRITE,ncid) 335 344 if (status.ne.nf90_noerr) then … … 348 357 status=nf90_get_var(ncid,varid,tab_cntrl) 349 358 start_day=tab_cntrl(3) 350 print*," start_day YORGL",start_day359 print*,"initialize_physics_omp: start_day",start_day 351 360 status=nf90_close(ncid) 361 !$OMP END MASTER 362 !$OMP BARRIER 363 ENDIF ! of !IF (is_mpi_root) 364 365 CALL bcast(start_day) 352 366 353 367 ELSE … … 364 378 ndays=nint(itaumax*(dt/day_length))! number of days to run 365 379 physics_timestep=dt*itau_physics 366 !$OMP END MASTER 367 !$OMP BARRIER 380 368 381 CALL inifis(klon_omp,llm,nqtot,start_day,day_length,ndays,physics_timestep, & 369 382 latfi,lonfi,airefi,radius,g,kappa*cpp,cpp) … … 596 609 597 610 DO l=1,llm 598 wflux_phy(:,l)=wflux_phy(:,l)*cell_area(:) 611 ! Warning: In the physics, vertical flux convention is positive if downwards! 612 wflux_phy(:,l)= - wflux_phy(:,l)*cell_area(:) 613 ! Compute relative geopotential 599 614 phi_phy(:,l)=phi_phy(:,l)-phis_phy(:) 600 615 ENDDO -
trunk/ICOSA_LMDZ/src/phyvenus/interface_icosa_lmdz.f90
r1982 r2000 38 38 39 39 CHARACTER(len=30),SAVE,ALLOCATABLE :: tname(:) ! tracer names 40 CHARACTER(len=33),SAVE,ALLOCATABLE :: ttext(:) ! tracer long name for diagnostics 40 41 REAL,SAVE :: pday ! number of ellapsed sols since Ls=0 41 42 REAL,SAVE :: ptime ! "universal time" as fraction of sol (e.g. 0.5 for noon) … … 213 214 CHARACTER(len=4) :: type_trac 214 215 ! CHARACTER(len=30),ALLOCATABLE :: tname(:) ! tracer short name for restart and diagnostics 215 CHARACTER(len=33),ALLOCATABLE :: ttext(:) ! tracer long name for diagnostics216 ! CHARACTER(len=33),ALLOCATABLE :: ttext(:) ! tracer long name for diagnostics 216 217 TYPE(t_field),POINTER,SAVE :: f_ind_cell_glo(:) 217 218 … … 259 260 ENDDO 260 261 261 !$OMP BARRIER262 262 263 263 CALL transfer_icosa_to_lmdz(f_ind_cell_glo,ind_cell_glo) … … 284 284 285 285 ! Initialize tracer names, numbers, etc. for physics 286 287 ! init tracers model for standard lmdz case 286 288 !$OMP MASTER 287 288 ! init tracers model for standard lmdz case289 289 ALLOCATE(tname(nqtot)) 290 290 ALLOCATE(ttext(nqtot)) 291 !$OMP END MASTER 292 !$OMP BARRIER 291 293 292 294 ! read tname() from traceur.def file 295 IF (is_mpi_root) THEN 296 !$OMP MASTER 293 297 OPEN(unit=42,file="traceur.def",form="formatted",status="old",iostat=ierr) 294 298 IF (ierr==0) THEN … … 306 310 !$OMP END MASTER 307 311 !$OMP BARRIER 312 ENDIF ! of (is_mpi_root) 313 314 DO i=1,nqtot 315 CALL bcast(tname(i)) 316 CALL bcast(ttext(i)) 317 ENDDO 308 318 309 319 ! Get/set some constants for the physics 310 320 311 !$OMP MASTER312 321 313 322 startphy_file=.true. … … 326 335 ! Read in some information from the startphy.nc file 327 336 337 IF (is_mpi_root) THEN 338 !$OMP MASTER 328 339 status=nf90_open('startphy.nc',NF90_NOWRITE,ncid) 329 340 if (status.ne.nf90_noerr) then … … 347 358 348 359 status=nf90_close(ncid) 360 !$OMP END MASTER 361 !$OMP BARRIER 362 ENDIF ! of !IF (is_mpi_root) 363 364 CALL bcast(day_ini) 365 CALL bcast(annee_ref) 366 CALL bcast(ptime) 349 367 350 368 ELSE … … 365 383 CALL getin('iflag_trac',iflag_trac) 366 384 367 !$OMP END MASTER368 !$OMP BARRIER369 385 370 386 ! Initialize some physical constants … … 597 613 598 614 DO l=1,llm 599 wflux_phy(:,l)=wflux_phy(:,l)*cell_area(:) 615 ! Warning: In the physics, vertical flux convention is positive if downwards! 616 wflux_phy(:,l)= - wflux_phy(:,l)*cell_area(:) 617 ! Compute relative geopotential 600 618 phi_phy(:,l)=phi_phy(:,l)-phis_phy(:) 601 619 ENDDO
Note: See TracChangeset
for help on using the changeset viewer.