diff --git a/src/MNH/compute_r00.f90 b/src/MNH/compute_r00.f90 index 5aff724d5cec58ccf7752d673c1ecc6c70db0687..8e3794f4fae02155e152f4e5d4c14c072274ffcb 100644 --- a/src/MNH/compute_r00.f90 +++ b/src/MNH/compute_r00.f90 @@ -130,7 +130,7 @@ USE MODD_FIELD_n USE MODD_IO, ONLY: TFILEDATA USE MODD_LAGR_TRAJ USE MODD_LUNIT_n -USE MODD_NSV, ONLY: NSV, NSV_LGBEG, NSV_LGEND, NSV_LIMA_CCN_FREE, NSV_LIMA_CCN_ACTI, & +USE MODD_NSV, ONLY: NSV, NSV_LGBEG, NSV_LGEND, NSV_LIMA_BEG, NSV_LIMA_END, NSV_LIMA_CCN_FREE, NSV_LIMA_CCN_ACTI, & NSV_LIMA_IFN_FREE, NSV_LIMA_IFN_NUCL, TSVLIST USE MODD_PARAM_n, ONLY: CCLOUD USE MODD_PARAM_LIMA, ONLY : NMOD_CCN, NMOD_IFN @@ -323,7 +323,7 @@ CALL IO_FIELD_CREATE( TPFILE, TZFIELD_Y0 ) TZFIELD_Z0 = TFIELDMETADATA( & CMNHNAME = 'Z_TRAJ', & CSTDNAME = '', & - CLONGNAME = 'Z0', & + CLONGNAME = 'Z_TRAJ', & CUNITS = 'km', & CDIR = 'XY', & CCOMMENT = 'X_Y_Z_Z_TRAJ', & @@ -538,14 +538,15 @@ DO JFILECUR=1,NFILES END IF ! IF (CCLOUD == 'LIMA') THEN - DO JSV = 1, NSV - TZFIELD = TSVLIST(JSV) + DO JSV = NSV_LIMA_BEG, NSV_LIMA_END IF (JSV .GE. NSV_LIMA_CCN_FREE .AND. JSV .LT. NSV_LIMA_CCN_ACTI) THEN + TZFIELD = TSVLIST(JSV) ISV=JSV - NSV_LIMA_CCN_FREE + 1 CALL IO_Field_read(TZTRACFILE,TZFIELD,ZCCN_FREE0(:,:,:,ISV)) ZCCN_FREE0(:,:,:,ISV)=ZCCN_FREE0(:,:,:,ISV)*1.E-6*XRHODREF(:,:,:) ! in cm-3 END IF IF (JSV .GE. NSV_LIMA_IFN_FREE .AND. JSV .LT. NSV_LIMA_IFN_NUCL) THEN + TZFIELD = TSVLIST(JSV) ISV=JSV - NSV_LIMA_IFN_FREE + 1 CALL IO_Field_read(TZTRACFILE,TZFIELD,ZIFN_FREE0(:,:,:,ISV)) ZIFN_FREE0(:,:,:,ISV)=ZIFN_FREE0(:,:,:,ISV)*1.E-6*XRHODREF(:,:,:) ! in cm-3