Changeset 4488 for LMDZ6/branches/LMDZ_ECRad
- Timestamp:
- Mar 31, 2023, 6:09:54 PM (20 months ago)
- Location:
- LMDZ6/branches/LMDZ_ECRad/libf
- Files:
-
- 2 edited
-
dyn3d_common/infotrac.F90 (modified) (2 diffs)
-
phylmd/infotrac_phy.F90 (modified) (9 diffs)
Legend:
- Unmodified
- Added
- Removed
-
LMDZ6/branches/LMDZ_ECRad/libf/dyn3d_common/infotrac.F90
r4482 r4488 6 6 USE readTracFiles_mod, ONLY: trac_type, readTracersFiles, tracers, setGeneration, itZonIso, nzone, tran0, isoZone, & 7 7 delPhase, niso, getKey, isot_type, readIsotopesFile, isotope, maxTableWidth, iqIsoPha, nphas, ixIso, isoPhas, & 8 addPhase, iH2O, nbIso, isoSelect, testTracersFiles, isoKeys, indexUpdate, isoCheck, nzone, ntiso, isoName, & 9 addKey 8 addPhase, iH2O, addKey, isoSelect, testTracersFiles, isoKeys, indexUpdate, isoCheck, nbIso, ntiso, isoName 10 9 IMPLICIT NONE 11 10 … … 169 168 !------------------------------------------------------------------------------------------------------------------------------ 170 169 suff = ['x ','y ','z ','xx','xy','xz','yy','yz','zz'] 170 descrq( 1:30) = ' ' 171 171 descrq( 1: 2) = ['LMV','BAK'] 172 172 descrq(10:20) = ['VL1','VLP','FH1','FH2','VLH',' ','PPM','PPS','PPP',' ','SLP'] -
LMDZ6/branches/LMDZ_ECRad/libf/phylmd/infotrac_phy.F90
r4482 r4488 4 4 5 5 USE strings_mod, ONLY: msg, fmsg, maxlen, cat, dispTable, int2str, bool2str, strStack, strParse, strIdx 6 USE readTracFiles_mod, ONLY: trac_type, nphas, readTracersFiles, tracers, setGeneration, itZonIso, nbIso, tran0, delPhase, &7 getKey, isot_type, nzone, readIsotopesFile, isotope, maxTableWidth, iqIsoPha, ntiso, ixIso, addPhase, &8 indexUpdate, isoSelect, niso, testTracersFiles, isoPhas, isoZone, isoName, isoKeys, iH2O, isoCheck, addKey6 USE readTracFiles_mod, ONLY: trac_type, readTracersFiles, tracers, setGeneration, itZonIso, nzone, tran0, isoZone, & 7 delPhase, niso, getKey, isot_type, readIsotopesFile, isotope, maxTableWidth, iqIsoPha, nphas, ixIso, isoPhas, & 8 addPhase, iH2O, addKey, isoSelect, testTracersFiles, isoKeys, indexUpdate, isoCheck, nbIso, ntiso, isoName 9 9 IMPLICIT NONE 10 10 … … 25 25 PUBLIC :: isoSelect, ixIso !--- Isotopes family selection tool + selected family index 26 26 !=== FOR ISOTOPES: Specific to water 27 PUBLIC :: iH2O !--- H2O isotopes index27 PUBLIC :: iH2O !--- H2O isotopes class index 28 28 !=== FOR ISOTOPES: Depending on the selected isotopes family 29 29 PUBLIC :: isotope, isoKeys !--- Selected isotopes database + associated keys (cf. getKey) … … 71 71 ! | component | Name(s) of the merged/cumulated section(s) | / | coma-separated names | 72 72 ! | iGeneration | Generation (>=1) | / | | 73 ! | isInPhysics | tracers not extracted from the main table in physics | / | nqtottr .TRUE. values |74 73 ! | iqParent | Index of the parent tracer | iqpere | 1:nqtot | 75 74 ! | iqDescen | Indexes of the childs (all generations) | iqfils | 1:nqtot | … … 77 76 ! | nqChildren | Number of childs (1st generation only) | nqfils | 1:nqtot | 78 77 ! | keys | key/val pairs accessible with "getKey" routine | / | | 78 ! | isAdvected | advected tracers flag (.TRUE. if iadv >= 0) | / | nqtrue .TRUE. values | 79 ! | isInPhysics | tracers not extracted from the main table in physics | / | nqtottr .TRUE. values | 79 80 ! | iso_iGroup | Isotopes group index in isotopes(:) | / | 1:nbIso | 80 81 ! | iso_iName | Isotope name index in isotopes(iso_iGroup)%trac(:) | iso_indnum | 1:niso | … … 247 248 IF(fType == 0) CALL abort_gcm(modname, 'Missing tracers file: "traceur.def", "tracer.def" or "tracer_<keyword>.def file.',1) 248 249 !--------------------------------------------------------------------------------------------------------------------------- 249 IF(fType == 1 .AND. ANY(['inca','inco']==type_trac) .AND. lInit) THEN !=== OLD STYLE INCA "traceur.def" (single type_trac)250 IF(fType == 1 .AND. ANY(['inca','inco']==type_trac) .AND. lInit) THEN !=== FOUND OLD STYLE INCA "traceur.def" 250 251 !--------------------------------------------------------------------------------------------------------------------------- 251 252 #ifdef INCA … … 278 279 CALL addKey('phase', t1%phase, t1%keys) 279 280 END DO 280 IF(setGeneration(tracers)) CALL abort_gcm(modname,'See below',1) !- SET FIELDS %iGeneration, %gen0Name281 IF(setGeneration(tracers)) CALL abort_gcm(modname,'See above',1) !- SET FIELDS %iGeneration, %gen0Name 281 282 DEALLOCATE(had, hadv_inca, vad, vadv_inca, conv_flg_inca, pbl_flg_inca, solsym_inca) 282 283 #endif … … 327 328 328 329 !============================================================================================================================== 329 ! 3) Determine the advection scheme ; needed to compute the full tracers list, the long names and nqtot.330 ! 3) Determine the advection scheme ; needed to compute the full tracers list, the long names, nqtot and %isAdvected 330 331 !============================================================================================================================== 331 332 ALLOCATE(ttr(nqtot)) … … 341 342 IF(iad == -1) CALL abort_gcm(modname, msg1, 1) 342 343 343 !--- SET FIELDS %longName, %is InPhysics344 !--- SET FIELDS %longName, %isAdvected, %isInPhysics 344 345 t1%longName = t1%name; IF(iad > 0) t1%longName=TRIM(t1%name)//descrq(iad) 346 t1%isAdvected = iad >= 0 345 347 t1%isInPhysics= delPhase(t1%gen0Name) /= 'H2O' & 346 348 .OR. t1%component /= 'lmdz' !=== OTHER EXCEPTIONS TO BE ADDED: CO2i, SURSATURATED WATER CLOUD... … … 356 358 ttr(jq+1:jq+nm)%parent = [(TRIM(t1%parent) //'-'//TRIM(suff(im)), im=1, nm) ] 357 359 ttr(jq+1:jq+nm)%longName = [(TRIM(t1%longName)//'-'//TRIM(suff(im)), im=1, nm) ] 360 ttr(jq+1:jq+nm)%isAdvected = [(.FALSE., im=1, nm) ] 358 361 jq = jq + nm 359 362 END DO
Note: See TracChangeset
for help on using the changeset viewer.
