diff --git a/src/MNH/lima_adjust.f90 b/src/MNH/lima_adjust.f90 index 6f580b31182173ac74877525f84381189f4c3ce9..404b7e731e45cd60a0e5ab8acf599fa0e2be3a89 100644 --- a/src/MNH/lima_adjust.f90 +++ b/src/MNH/lima_adjust.f90 @@ -264,8 +264,6 @@ REAL, DIMENSION(SIZE(PRHODJ,1),SIZE(PRHODJ,2),SIZE(PRHODJ,3)) & REAL, DIMENSION(:,:,:,:), ALLOCATABLE & :: PNFS, & ! Free CCN C. source PNAS, & ! Activated CCN C. source - PNFT, & ! Free CCN C. - PNAT, & ! Activated CCN C. PIFS, & ! Free IFN C. source PINS, & ! Nucleated IFN C. source PNIS ! Acti. IMM. nuclei C. source @@ -283,12 +281,7 @@ REAL, DIMENSION(SIZE(PRHODJ,1),SIZE(PRHODJ,2),SIZE(PRHODJ,3)) & ZW2, & ZLV, & ! guess of the Lv at t+1 ZLS, & ! guess of the Ls at t+1 - ZMASK,& - ZRV, & - ZRC, & - ZRI, & - ZSIGS, & - ZW_MF + ZMASK LOGICAL, DIMENSION(SIZE(PRHODJ,1),SIZE(PRHODJ,2),SIZE(PRHODJ,3)) & :: GMICRO, GMICRO_RI, GMICRO_RC ! Test where to compute cond/dep proc. INTEGER :: IMICRO @@ -361,8 +354,6 @@ ZCTMIN(:) = XCTMIN(:) / ZDT ! ! Prepare 3D water mixing ratios ! -PTHT = PTHS*PTSTEP -! PRVT(:,:,:) = PRT(:,:,:,1) PRVS(:,:,:) = PRS(:,:,:,1) ! @@ -405,12 +396,8 @@ IF ( LSCAV .AND. LAERO_MASS ) PMAS(:,:,:) = PSVS(:,:,:,NSV_LIMA_SCAVMASS) IF ( LWARM .AND. NMOD_CCN.GE.1 ) THEN ALLOCATE( PNFS(SIZE(PRHODJ,1),SIZE(PRHODJ,2),SIZE(PRHODJ,3),NMOD_CCN) ) ALLOCATE( PNAS(SIZE(PRHODJ,1),SIZE(PRHODJ,2),SIZE(PRHODJ,3),NMOD_CCN) ) - ALLOCATE( PNFT(SIZE(PRHODJ,1),SIZE(PRHODJ,2),SIZE(PRHODJ,3),NMOD_CCN) ) - ALLOCATE( PNAT(SIZE(PRHODJ,1),SIZE(PRHODJ,2),SIZE(PRHODJ,3),NMOD_CCN) ) PNFS(:,:,:,:) = PSVS(:,:,:,NSV_LIMA_CCN_FREE:NSV_LIMA_CCN_FREE+NMOD_CCN-1) PNAS(:,:,:,:) = PSVS(:,:,:,NSV_LIMA_CCN_ACTI:NSV_LIMA_CCN_ACTI+NMOD_CCN-1) - PNFT(:,:,:,:) = PSVT(:,:,:,NSV_LIMA_CCN_FREE:NSV_LIMA_CCN_FREE+NMOD_CCN-1) - PNAT(:,:,:,:) = PSVT(:,:,:,NSV_LIMA_CCN_ACTI:NSV_LIMA_CCN_ACTI+NMOD_CCN-1) END IF ! IF ( LCOLD .AND. NMOD_IFN .GE. 1 ) THEN @@ -1343,8 +1330,6 @@ DEALLOCATE(ZRTMIN) DEALLOCATE(ZCTMIN) IF (ALLOCATED(PNFS)) DEALLOCATE(PNFS) IF (ALLOCATED(PNAS)) DEALLOCATE(PNAS) -IF (ALLOCATED(PNFT)) DEALLOCATE(PNFT) -IF (ALLOCATED(PNAT)) DEALLOCATE(PNAT) IF (ALLOCATED(PIFS)) DEALLOCATE(PIFS) IF (ALLOCATED(PINS)) DEALLOCATE(PINS) IF (ALLOCATED(PNIS)) DEALLOCATE(PNIS) diff --git a/src/MNH/lima_adjust_split.f90 b/src/MNH/lima_adjust_split.f90 index ff33a384a0a4d89ea91b6073745a26b7917d34e3..280d9f78bbeb86cdd0ad92c8825865b2d150c7ba 100644 --- a/src/MNH/lima_adjust_split.f90 +++ b/src/MNH/lima_adjust_split.f90 @@ -258,10 +258,10 @@ REAL, DIMENSION(:,:,:,:), ALLOCATABLE & :: PNFS, & ! Free CCN C. source PNAS, & ! Activated CCN C. source PNFT, & ! Free CCN C. - PNAT, & ! Activated CCN C. - PIFS, & ! Free IFN C. source - PINS, & ! Nucleated IFN C. source - PNIS ! Acti. IMM. nuclei C. source + PNAT ! Activated CCN C. +! PIFS, & ! Free IFN C. source +! PINS, & ! Nucleated IFN C. source +! PNIS ! Acti. IMM. nuclei C. source ! ! ! @@ -385,13 +385,13 @@ IF ( KRR .GE. 6 ) PRGS(:,:,:) = PRS(:,:,:,6) PCCT(:,:,:) = 0. PCIT(:,:,:) = 0. PCCS(:,:,:) = 0. -PCIS(:,:,:) = 0. +! PCIS(:,:,:) = 0. ! IF ( LWARM ) PCCT(:,:,:) = PSVT(:,:,:,NSV_LIMA_NC) IF ( LCOLD ) PCIT(:,:,:) = PSVT(:,:,:,NSV_LIMA_NI) ! IF ( LWARM ) PCCS(:,:,:) = PSVS(:,:,:,NSV_LIMA_NC) -IF ( LCOLD ) PCIS(:,:,:) = PSVS(:,:,:,NSV_LIMA_NI) +! IF ( LCOLD ) PCIS(:,:,:) = PSVS(:,:,:,NSV_LIMA_NI) ! IF ( LSCAV .AND. LAERO_MASS ) PMAS(:,:,:) = PSVS(:,:,:,NSV_LIMA_SCAVMASS) ! @@ -406,17 +406,17 @@ IF ( LWARM .AND. NMOD_CCN.GE.1 ) THEN PNAT(:,:,:,:) = PSVT(:,:,:,NSV_LIMA_CCN_ACTI:NSV_LIMA_CCN_ACTI+NMOD_CCN-1) END IF ! -IF ( LCOLD .AND. NMOD_IFN .GE. 1 ) THEN - ALLOCATE( PIFS(SIZE(PRHODJ,1),SIZE(PRHODJ,2),SIZE(PRHODJ,3),NMOD_IFN) ) - ALLOCATE( PINS(SIZE(PRHODJ,1),SIZE(PRHODJ,2),SIZE(PRHODJ,3),NMOD_IFN) ) - PIFS(:,:,:,:) = PSVS(:,:,:,NSV_LIMA_IFN_FREE:NSV_LIMA_IFN_FREE+NMOD_IFN-1) - PINS(:,:,:,:) = PSVS(:,:,:,NSV_LIMA_IFN_NUCL:NSV_LIMA_IFN_NUCL+NMOD_IFN-1) -END IF +! IF ( LCOLD .AND. NMOD_IFN .GE. 1 ) THEN +! ALLOCATE( PIFS(SIZE(PRHODJ,1),SIZE(PRHODJ,2),SIZE(PRHODJ,3),NMOD_IFN) ) +! ALLOCATE( PINS(SIZE(PRHODJ,1),SIZE(PRHODJ,2),SIZE(PRHODJ,3),NMOD_IFN) ) +! PIFS(:,:,:,:) = PSVS(:,:,:,NSV_LIMA_IFN_FREE:NSV_LIMA_IFN_FREE+NMOD_IFN-1) +! PINS(:,:,:,:) = PSVS(:,:,:,NSV_LIMA_IFN_NUCL:NSV_LIMA_IFN_NUCL+NMOD_IFN-1) +! END IF ! -IF ( NMOD_IMM .GE. 1 ) THEN - ALLOCATE( PNIS(SIZE(PRHODJ,1),SIZE(PRHODJ,2),SIZE(PRHODJ,3),NMOD_IMM) ) - PNIS(:,:,:,:) = PSVS(:,:,:,NSV_LIMA_IMM_NUCL:NSV_LIMA_IMM_NUCL+NMOD_IMM-1) -END IF +! IF ( NMOD_IMM .GE. 1 ) THEN +! ALLOCATE( PNIS(SIZE(PRHODJ,1),SIZE(PRHODJ,2),SIZE(PRHODJ,3),NMOD_IMM) ) +! PNIS(:,:,:,:) = PSVS(:,:,:,NSV_LIMA_IMM_NUCL:NSV_LIMA_IMM_NUCL+NMOD_IMM-1) +! END IF ! ! if ( nbumod == kmi .and. lbu_enable ) then @@ -727,11 +727,6 @@ IF ( OSUBG_COND ) THEN PNAS(:,:,:,:) = PNAT(:,:,:,:) / PTSTEP PTHS(:,:,:) = PTHS(:,:,:) + & ZW1(:,:,:) * ZLV(:,:,:) / (ZCPH(:,:,:) * PEXNREF(:,:,:)) - ! - ! Cloud fraction - ! - ! PCLDFR(:,:,:) = MAX(PCLDFR(:,:,:),PICEFR(:,:,:)) - ! END IF ! fin test OSUBG_COND IF ( tpfile%lopened ) THEN @@ -764,7 +759,7 @@ IF ( KRR .GE. 6 ) PRS(:,:,:,6) = PRGS(:,:,:) ! Prepare 3D number concentrations ! IF ( LWARM ) PSVS(:,:,:,NSV_LIMA_NC) = PCCS(:,:,:) -IF ( LCOLD ) PSVS(:,:,:,NSV_LIMA_NI) = PCIS(:,:,:) +! IF ( LCOLD ) PSVS(:,:,:,NSV_LIMA_NI) = PCIS(:,:,:) ! IF ( LSCAV .AND. LAERO_MASS ) PSVS(:,:,:,NSV_LIMA_SCAVMASS) = PMAS(:,:,:) ! @@ -773,14 +768,14 @@ IF ( LWARM .AND. NMOD_CCN .GE. 1 ) THEN PSVS(:,:,:,NSV_LIMA_CCN_ACTI:NSV_LIMA_CCN_ACTI+NMOD_CCN-1) = PNAS(:,:,:,:) END IF ! -IF ( LCOLD .AND. NMOD_IFN .GE. 1 ) THEN - PSVS(:,:,:,NSV_LIMA_IFN_FREE:NSV_LIMA_IFN_FREE+NMOD_IFN-1) = PIFS(:,:,:,:) - PSVS(:,:,:,NSV_LIMA_IFN_NUCL:NSV_LIMA_IFN_NUCL+NMOD_IFN-1) = PINS(:,:,:,:) -END IF +! IF ( LCOLD .AND. NMOD_IFN .GE. 1 ) THEN +! PSVS(:,:,:,NSV_LIMA_IFN_FREE:NSV_LIMA_IFN_FREE+NMOD_IFN-1) = PIFS(:,:,:,:) +! PSVS(:,:,:,NSV_LIMA_IFN_NUCL:NSV_LIMA_IFN_NUCL+NMOD_IFN-1) = PINS(:,:,:,:) +! END IF ! -IF ( LCOLD .AND. NMOD_IMM .GE. 1 ) THEN - PSVS(:,:,:,NSV_LIMA_IMM_NUCL:NSV_LIMA_IMM_NUCL+NMOD_IMM-1) = PNIS(:,:,:,:) -END IF +! IF ( LCOLD .AND. NMOD_IMM .GE. 1 ) THEN +! PSVS(:,:,:,NSV_LIMA_IMM_NUCL:NSV_LIMA_IMM_NUCL+NMOD_IMM-1) = PNIS(:,:,:,:) +! END IF ! ! write SSI in LFI ! @@ -848,9 +843,9 @@ IF (ALLOCATED(PNFS)) DEALLOCATE(PNFS) IF (ALLOCATED(PNAS)) DEALLOCATE(PNAS) IF (ALLOCATED(PNFT)) DEALLOCATE(PNFT) IF (ALLOCATED(PNAT)) DEALLOCATE(PNAT) -IF (ALLOCATED(PIFS)) DEALLOCATE(PIFS) -IF (ALLOCATED(PINS)) DEALLOCATE(PINS) -IF (ALLOCATED(PNIS)) DEALLOCATE(PNIS) +! IF (ALLOCATED(PIFS)) DEALLOCATE(PIFS) +! IF (ALLOCATED(PINS)) DEALLOCATE(PINS) +! IF (ALLOCATED(PNIS)) DEALLOCATE(PNIS) !--cb-- ! !------------------------------------------------------------------------------ diff --git a/src/MNH/write_stationn.f90 b/src/MNH/write_stationn.f90 index 119791adb9cf9b354675a96a101bf77444033ddf..398d122cab218274a707ce9ffe13318c991c3210 100644 --- a/src/MNH/write_stationn.f90 +++ b/src/MNH/write_stationn.f90 @@ -136,7 +136,6 @@ REAL, DIMENSION(:,:,:,:,:,:), ALLOCATABLE :: ZW6 ! contains temporal series t REAL, DIMENSION(:,:,:,:), ALLOCATABLE :: ZSV, ZN0, ZSIG, ZRG REAL, DIMENSION(:,:,:,:,:), ALLOCATABLE :: ZPTOTA REAL, DIMENSION(:,:,:), ALLOCATABLE :: ZRHO -REAL, DIMENSION(:,:,:), ALLOCATABLE :: ZTRAJX, ZTRAJY, ZTRAJZ ! INTEGER, DIMENSION(:), ALLOCATABLE :: IGRID ! grid indicator CHARACTER(LEN= 8) :: YGROUP ! group title @@ -181,13 +180,6 @@ IGRID = 1 YGROUP = TSTATION%NAME(II) JPROC = 0 ! -ALLOCATE (ZTRAJX(1,1,1)) -ALLOCATE (ZTRAJY(1,1,1)) -ALLOCATE (ZTRAJZ(1,1,1)) -! -ZTRAJX(:,:,:)=TSTATION%X(II) -ZTRAJY(:,:,:)=TSTATION%Y(II) -ZTRAJZ(:,:,:)=TSTATION%Z(II) !---------------------------------------------------------------------------- ! JPROC = JPROC + 1