- Timestamp:
- Nov 25, 2020, 7:24:05 PM (4 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 6 edited
-
LMDZ.COMMON/libf/dyn3d_common/infotrac.F90 (modified) (4 diffs)
-
LMDZ.GENERIC/README (modified) (1 diff)
-
LMDZ.GENERIC/deftank/traceur.def.modern (added)
-
LMDZ.GENERIC/libf/phystd/dyn1d/kcm1d.F90 (modified) (3 diffs)
-
LMDZ.GENERIC/libf/phystd/dyn1d/rcm1d.F (modified) (3 diffs)
-
LMDZ.GENERIC/libf/phystd/initracer.F (modified) (5 diffs)
-
LMDZ.GENERIC/libf/phystd/tracer_h.F90 (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/LMDZ.COMMON/libf/dyn3d_common/infotrac.F90
r2307 r2436 115 115 INTEGER :: ifils,ipere,generation ! CRisi 116 116 LOGICAL :: continu,nouveau_traceurdef 117 LOGICAL :: moderntracdef=.false. ! JVO, YJ : For planets modern traceur.def 117 118 INTEGER :: IOstatus ! gestion de la retrocompatibilite de traceur.def 118 119 CHARACTER(len=30) :: tchaine 119 120 120 character(len= 80) :: line ! to store a line of text121 character(len=500) :: line ! to store a line of text 121 122 122 123 character(len=*),parameter :: modname="infotrac_init" … … 240 241 ELSE ! not Earth 241 242 OPEN(90,file='traceur.def',form='formatted',status='old', iostat=ierr) 242 IF (ierr.EQ.0) THEN243 IF (ierr.EQ.0) THEN 243 244 WRITE(lunout,*) 'Open traceur.def : ok' 244 READ(90,*) nqtrue 245 !! - Modif. by JVO and YJ for modern planetary traceur.def --------------- 246 READ(90,'(A)') line 247 IF (trim(line).ne.'#ModernTrac-v1') THEN ! Test modern traceur.def 248 READ(line,*) nqtrue ! Try standard traceur.def 249 ELSE 250 moderntracdef = .true. 251 DO 252 READ(90,'(A)',iostat=ierr1) line 253 IF (ierr1==0) THEN 254 IF (index(line,'#').ne.1) THEN ! Allows arbitary number of comments lines in the header 255 READ(line,*) nbtr 256 WRITE(lunout,*) trim(modname),': Number of tracers in the physics: nbtr=',nbtr 257 EXIT 258 ! JVO 20 : Here nbtr corresponds to ALL what we consider as modern 'tracers' (species) 259 ! from physics, including non-dynamic species (radiative, compo..), and nqtrue will be set 260 ! below, according to the flags in traceur.def, by read and rewind. 261 ENDIF 262 ELSE ! If pb, or if reached EOF without having found nbtr 263 CALL abort_gcm('infotrac_init','Unable to read numbers of tracers in traceur.def',1) 264 ENDIF 265 ENDDO 266 ENDIF ! if modern or standard traceur.def 267 !! ----------------------------------------------------------------------- 245 268 ELSE 246 269 WRITE(lunout,*) 'Problem in opening traceur.def' … … 257 280 ! Allocate variables depending on nqtrue and nbtr 258 281 ! 259 ALLOCATE(tnom_0(nqtrue), hadv(nqtrue), vadv(nqtrue),tnom_transp(nqtrue))282 IF (.NOT.moderntracdef) ALLOCATE(tnom_0(nqtrue), hadv(nqtrue), vadv(nqtrue),tnom_transp(nqtrue)) 260 283 ! 261 284 !jyg< … … 526 549 527 550 ELSE ! not Earth 528 ! Other planets (for now); we have the same number of tracers 529 ! in the dynamics than in the physics 530 nbtr=nqtrue 531 ! NB: Reading a traceur.def with isotopes remains to be done... 532 IF(ierr.EQ.0) THEN 533 ! Continue to read tracer.def 534 DO iq=1,nqtrue 535 !READ(90,*) hadv(iq),vadv(iq),tnom_0(iq) 536 ! try to be smart when reading traceur.def 537 read(90,'(80a)') line ! store the line from traceur.def 538 ! if format is hadv, vadv, tnom_0, tnom_transp 539 read(line,*,iostat=ierr1) hadv(iq),vadv(iq),tnom_0(iq),tnom_transp(iq) 540 if (ierr1.ne.0) then 541 ! assume format is hadv,vadv,tnom_0 542 read(line,*,iostat=ierr2) hadv(iq),vadv(iq),tnom_0(iq) 543 if (ierr2.ne.0) then 544 ! maybe format is tnom0,hadv,vadv 545 read(line,*,iostat=ierr3) tnom_0(iq),hadv(iq),vadv(iq) 546 if (ierr3.ne.0) then 547 !assuming values of hadv et vadv 548 hadv(iq)=10 549 vadv(iq)=10 550 read(line,*, iostat=ierr4) tnom_0(iq), tnom_transp(iq) 551 if (ierr4.ne.0) then 552 ! assume only tnom0 is provided (hadv and vadv default to 10) 553 read(line,*) tnom_0(iq) 554 tnom_transp(iq)='air' 555 endif 556 else 557 !format is tnom0,hadv,vadv 558 tnom_transp(iq)='air' ! no isotopes 559 endif ! of if (ierr3.ne.0) 560 else 561 ! format is hadv,vadv,tnom_0 562 tnom_transp(iq)='air' ! no isotopes 563 endif ! of if (ierr2.ne.0) 564 endif ! of if(ierr1.ne.0) 565 END DO ! of DO iq=1,nqtrue 566 CLOSE(90) 567 ELSE ! Without tracer.def 568 hadv(1) = 10 569 vadv(1) = 10 570 tnom_0(1) = 'dummy' 571 tnom_transp(1)='air' 572 END IF 551 552 IF (.not.moderntracdef) THEN ! Standard traceur.def or no traceur.def file 553 554 ! Other planets (for now); we have the same number of tracers 555 ! in the dynamics than in the physics 556 nbtr=nqtrue 557 ! NB: Reading a traceur.def with isotopes remains to be done... 558 IF(ierr.EQ.0) THEN 559 ! Continue to read tracer.def 560 DO iq=1,nqtrue 561 !READ(90,*) hadv(iq),vadv(iq),tnom_0(iq) 562 ! try to be smart when reading traceur.def 563 read(90,'(80a)') line ! store the line from traceur.def 564 ! if format is hadv, vadv, tnom_0, tnom_transp 565 read(line,*,iostat=ierr1) hadv(iq),vadv(iq),tnom_0(iq),tnom_transp(iq) 566 if (ierr1.ne.0) then 567 ! assume format is hadv,vadv,tnom_0 568 read(line,*,iostat=ierr2) hadv(iq),vadv(iq),tnom_0(iq) 569 if (ierr2.ne.0) then 570 ! maybe format is tnom0,hadv,vadv 571 read(line,*,iostat=ierr3) tnom_0(iq),hadv(iq),vadv(iq) 572 if (ierr3.ne.0) then 573 !assuming values of hadv et vadv 574 hadv(iq)=10 575 vadv(iq)=10 576 read(line,*, iostat=ierr4) tnom_0(iq), tnom_transp(iq) 577 if (ierr4.ne.0) then 578 ! assume only tnom0 is provided (hadv and vadv default to 10) 579 read(line,*) tnom_0(iq) 580 tnom_transp(iq)='air' 581 endif 582 else 583 !format is tnom0,hadv,vadv 584 tnom_transp(iq)='air' ! no isotopes 585 endif ! of if (ierr3.ne.0) 586 else 587 ! format is hadv,vadv,tnom_0 588 tnom_transp(iq)='air' ! no isotopes 589 endif ! of if (ierr2.ne.0) 590 endif ! of if(ierr1.ne.0) 591 END DO ! of DO iq=1,nqtrue 592 CLOSE(90) 593 ELSE ! Without tracer.def 594 hadv(1) = 10 595 vadv(1) = 10 596 tnom_0(1) = 'dummy' 597 tnom_transp(1)='air' 598 END IF 573 599 600 ELSE ! Modern traceur.def (moderntracdef=true) - Authors : JVO, YJ - 2020 601 602 nqtrue = 0 603 DO iq=1,nbtr ! This loops on ALL the 'tracers' including the non-dyn ones. 604 READ(90,'(A)') line ! store the line from traceur.def 605 IF (index(line,'is_dyn=0').ne.0) CYCLE ! Only if explicitly not dyn., otherwise default behaviour 606 nqtrue = nqtrue + 1 607 ENDDO 608 WRITE(lunout,*) trim(modname),': Number of tracers in the dynamics: nqtrue=',nqtrue 609 ALLOCATE(tnom_0(nqtrue), hadv(nqtrue), vadv(nqtrue),tnom_transp(nqtrue)) 610 611 ! Now that we know the dyn. tracers and allocated variables, let's read again the file. 612 REWIND(90) 613 DO 614 READ(90,'(A)') line ! no need to check on iostat, already done at first read 615 IF (index(line,'#').ne.1) THEN ! Skip arbitary number of commented lines in the header 616 READ(line,*) ! This is the line of nbtr (see above) 617 EXIT 618 ENDIF 619 ENDDO 620 iiq=0 621 DO iq=1,nbtr ! This loops on ALL the 'tracers' including the non-dyn ones. 622 623 READ(90,'(A)') line ! store the line from traceur.def 624 IF (index(line,'is_dyn=0').ne.0) CYCLE ! Skip the non-dyn ones 625 iiq = iiq + 1 ! This ensure that iiq is on 1:nqtrue and not 1:nbtr 626 ! Name must be first parameter in this version, but all others can be in any order 627 read(line,*) tnom_0(iiq) 628 write(*,*)"infotrac_init: iq=",iiq,"noms(iq)=",trim(tnom_0(iiq)) 629 630 if (index(line,'vadv=') /= 0) then 631 read(line(index(line,'vadv=' )+len('vadv='):),*) vadv(iiq) 632 write(*,*) ' Parameter value (traceur.def) : vadv=', vadv(iiq) 633 else 634 vadv(iiq)=10 635 write(*,*) ' Parameter value (default) : vadv=',vadv(iiq) 636 end if 637 638 if (index(line,'hadv=') /= 0) then 639 read(line(index(line,'hadv=' )+len('hadv='):),*) hadv(iiq) 640 write(*,*) ' Parameter value (traceur.def) : hadv=', hadv(iiq) 641 else 642 hadv(iiq)=10 643 write(*,*) ' Parameter value (default) : hadv=',hadv(iiq) 644 end if 645 646 if (index(line,'tnom_transp=' ) /= 0) then 647 read(line(index(line,'tnom_transp=' )+len('tnom_transp='):),*) tnom_transp(iiq) 648 write(*,*) ' Parameter value (traceur.def) : tnom_transp=', tnom_transp(iiq) 649 else 650 tnom_transp(iiq)='air' 651 write(*,*) ' Parameter value (default) : tnom_transp=',tnom_transp(iiq) 652 end if 653 654 ENDDO 655 CLOSE(90) 656 657 ENDIF ! if (moderntracdef) 658 574 659 WRITE(lunout,*) trim(modname),': Valeur de traceur.def :' 575 660 WRITE(lunout,*) trim(modname),': nombre de traceurs ',nqtrue -
trunk/LMDZ.GENERIC/README
r2428 r2436 1606 1606 Bug fix on mass_redistribution; argument rnat should be real, not integer. 1607 1607 Turned it into a mass_redistribution_mod module. 1608 1609 == 24/11/2020 == YJ + JVO 1610 Implementation of an option for a new reading process of "traceur.def" 1611 Use "#ModernTrac-v1" flag as first line of "traceur.def" to use this option 1612 Further details in "LMDZ.GENERIC/deftank/traceur.def.modern" -
trunk/LMDZ.GENERIC/libf/phystd/dyn1d/kcm1d.F90
r1714 r2436 90 90 real :: latitude(1), longitude(1), cell_area(1), phisfi(1) 91 91 92 ! added by JVO and YJ to read modern traceur.def 93 character(len=500) :: line ! to store a line of text 94 LOGICAL :: moderntracdef=.false. ! JVO, YJ : modern traceur.def 95 92 96 ! -------------- 93 97 ! Initialisation … … 162 166 write(*,*) "kcm1d: Reading file traceur.def" 163 167 ! read number of tracers: 164 read(90,*,iostat=ierr) nq 168 !! - Modif. by JVO and YJ for modern planetary traceur.def --------------- 169 READ(90,'(A)') line 170 IF (trim(line).ne.'#ModernTrac-v1') THEN ! Test modern traceur.def 171 READ(line,*,iostat=ierr) nq ! Try standard traceur.def 172 ELSE 173 moderntracdef = .true. 174 DO 175 READ(90,'(A)',iostat=ierr) line 176 IF (ierr.eq.0) THEN 177 IF (index(line,'#').ne.1) THEN ! Allows arbitary number of comments lines in the header 178 READ(line,*,iostat=ierr) nq 179 EXIT 180 ENDIF 181 ELSE ! If pb, or if reached EOF without having found nbtr 182 write(*,*) "rcm1d: error reading number of tracers" 183 write(*,*) " (first line of traceur.def) " 184 stop 185 ENDIF 186 ENDDO 187 ENDIF ! if modern or standard traceur.def 165 188 if (ierr.ne.0) then 166 189 write(*,*) "kcm1d: error reading number of tracers" … … 184 207 endif 185 208 enddo !of do iq=1,nq 209 close(90) 186 210 endif 187 211 -
trunk/LMDZ.GENERIC/libf/phystd/dyn1d/rcm1d.F
r2354 r2436 144 144 real :: latitude(1), longitude(1), cell_area(1) 145 145 146 ! added by JVO and YJ to read modern traceur.def 147 character(len=500) :: line ! to store a line of text 148 LOGICAL :: moderntracdef=.false. ! JVO, YJ : modern traceur.def 149 146 150 c======================================================================= 147 151 c INITIALISATION … … 152 156 & iostat=ierr) 153 157 if (ierr.eq.0) then 154 read(90,*,iostat=ierr) nq 158 ! read number of tracers: 159 !! - Modif. by JVO and YJ for modern planetary traceur.def --------------- 160 READ(90,'(A)') line 161 IF (trim(line).ne.'#ModernTrac-v1') THEN ! Test modern traceur.def 162 READ(line,*,iostat=ierr) nq ! Try standard traceur.def 163 ELSE 164 moderntracdef = .true. 165 DO 166 READ(90,'(A)',iostat=ierr) line 167 IF (ierr.eq.0) THEN 168 IF (index(line,'#').ne.1) THEN ! Allows arbitary number of comments lines in the header 169 READ(line,*,iostat=ierr) nq 170 EXIT 171 ENDIF 172 ELSE ! If pb, or if reached EOF without having found nbtr 173 write(*,*) "rcm1d: error reading number of tracers" 174 write(*,*) " (first line of traceur.def) " 175 stop 176 ENDIF 177 ENDDO 178 ENDIF ! if modern or standard traceur.def 155 179 else 156 180 nq=0 … … 243 267 write(*,*) "rcm1d: Reading file traceur.def" 244 268 ! read number of tracers: 245 read(90,*,iostat=ierr) nq 269 !! - Modif. by JVO and YJ for modern planetary traceur.def --------------- 270 READ(90,'(A)') line 271 IF (trim(line).ne.'#ModernTrac-v1') THEN ! Test modern traceur.def 272 READ(line,*,iostat=ierr) nq ! Try standard traceur.def 273 ELSE 274 moderntracdef = .true. 275 DO 276 READ(90,'(A)',iostat=ierr) line 277 IF (ierr.eq.0) THEN 278 IF (index(line,'#').ne.1) THEN ! Allows arbitary number of comments lines in the header 279 READ(line,*,iostat=ierr) nq 280 EXIT 281 ENDIF 282 ELSE ! If pb, or if reached EOF without having found nbtr 283 write(*,*) "rcm1d: error reading number of tracers" 284 write(*,*) " (first line of traceur.def) " 285 stop 286 ENDIF 287 ENDDO 288 ENDIF ! if modern or standard traceur.def 246 289 nqtot=nq ! set value of nqtot (in infotrac module) as nq 247 290 if (ierr.ne.0) then -
trunk/LMDZ.GENERIC/libf/phystd/initracer.F
r2278 r2436 20 20 c ------ 21 21 c Ehouarn Millour (oct. 2008) identify tracers by their names 22 c Y Jaziri & J. Vatant d'Ollone (2020) : Modern traceur.def 22 23 c======================================================================= 23 24 … … 25 26 character(len=30),intent(in) :: nametrac(nq) ! name of the tracer from dynamics 26 27 27 character(len= 30) :: txt ! to store some text28 integer iq,ig,count29 real r0_lift , reff_lift28 character(len=500) :: tracline ! to read traceur.def lines 29 character(len=30) :: txt ! to store some text 30 integer iq,ig,count,ierr 30 31 31 32 … … 43 44 c----------------------------------------------------------------------- 44 45 46 moderntracdef=.false. ! For modern traceur.def (default false, old type) 47 48 open(407, form = 'formatted', status = 'old', 49 $ file = 'traceur.def', iostat=ierr) 50 if (ierr /=0) then 51 call abort_physic('initracer', 52 $ 'Problem in opening traceur.def',1) 53 end if 54 !! - Modif. by JVO and YJ for modern planetary traceur.def --------------- 55 READ(407,'(A)') tracline 56 IF (trim(tracline).ne.'#ModernTrac-v1') THEN ! Test modern traceur.def 57 READ(tracline,*) nqtot ! Try standard traceur.def 58 ELSE 59 moderntracdef = .true. 60 DO 61 READ(407,'(A)',iostat=ierr) tracline 62 IF (ierr==0) THEN 63 IF (index(tracline,'#').ne.1) THEN ! Allows arbitary number of comments lines in the header 64 READ(tracline,*) nqtot 65 ! Temporary not implemented solution 66 if (nqtot/=nq) then 67 call abort_physic('initracer','Different number of& 68 & tracers in dynamics and physics not managed yet',1) 69 endif 70 EXIT 71 ENDIF 72 ELSE ! If pb, or if reached EOF without having found nqtot 73 call abort_physic('initracer','Unable to read numbers& 74 & of tracers in traceur.def',1) 75 ENDIF 76 ENDDO 77 ENDIF ! if modern or standard traceur.def 78 !! ----------------------------------------------------------------------- 79 !! For the moment number of tracers in dynamics and physics are equal 45 80 nqtot=nq 46 81 !! we allocate once for all arrays in common in tracer_h.F90 … … 339 374 endif 340 375 376 ! Get data of tracers 377 do iq=1,nqtot 378 read(407,'(A)') tracline 379 call get_tracdat(iq, tracline) 380 enddo 381 382 close(407) 341 383 342 384 c------------------------------------------------------------ … … 410 452 write(*,*) 411 453 454 contains 455 456 subroutine get_tracdat(iq,tracline) 457 !-------------------ADDING NEW OPTIONS------------------- 458 ! Duplicate if sentence for adding new options 459 ! Do not forget to add the new variables in tracer_h.F90 460 ! Do not forget to allocate and initialize the new variables above 461 ! Please update list of options in "LMDZ.GENERIC/deftank/traceur.def.modern" 462 !------------------------------------------------------- 463 use tracer_h 464 implicit none 465 integer, intent(in) :: iq ! tracer index 466 character(len=500),intent(in) :: tracline ! traceur.def lines with parameters 467 468 read(tracline,*) noms(iq) 469 ! JVO 20 : We should add a sanity check aborting when duplicates in names ! 470 write(*,*)"initracer: iq=",iq,"noms(iq)=",trim(noms(iq)) 471 if (index(tracline,'mmol=' ) /= 0) then 472 read(tracline(index(tracline,'mmol=')+len('mmol='):),*) 473 $ mmol(iq) 474 write(*,*) ' Parameter value (traceur.def) : mmol=', 475 $ mmol(iq) 476 else 477 write(*,*) ' Parameter value (default) : mmol=', 478 $ mmol(iq) 479 end if 480 end subroutine get_tracdat 481 412 482 end 483 -
trunk/LMDZ.GENERIC/libf/phystd/tracer_h.F90
r1980 r2436 6 6 integer, save :: nqtot ! total number of tracers 7 7 !$OMP THREADPRIVATE(nqtot) 8 9 logical :: moderntracdef=.false. ! Standard or modern traceur.def 10 !$OMP THREADPRIVATE(moderntracdef) 8 11 9 12 character*30, save, allocatable :: noms(:) ! name of the tracer
Note: See TracChangeset
for help on using the changeset viewer.
