S. Riette 8 Mar 2023: arome compilation and execution

src/arome/ext/aro_rain_ice.F90

@@ -213,6 +213,8 @@ SUBROUTINE  ARO_RAIN_ICE(KPROMA,KKA,KKU,KKL,KLON,KLEV, KFDIA, KRR, KTCOUNT, KSPL
 
 TYPE(TBUDGETDATA), DIMENSION(NBUDGET_RH) :: YLBUDGET !NBUDGET_RH is the one with the highest number
 TYPE(DIMPHYEX_t) :: YLDIMPHYEX
+LOGICAL, DIMENSION(KLON,1,KLEV) :: LLMICRO
+INTEGER :: ISIZE
 !
 REAL(KIND=JPRB) :: ZHOOK_HANDLE
 
@@ -433,13 +435,22 @@ SUBROUTINE  ARO_RAIN_ICE(KPROMA,KKA,KKU,KKL,KLON,KLEV, KFDIA, KRR, KTCOUNT, KSPL
     ELSE
      ZKGN_SBGR(:,:) = RAIN_ICE_PARAM%XFRMIN(11)
     ENDIF
-    CALL RAIN_ICE_OLD( OSEDIC=OSEDIC, OCND2=OCND2, LKOGAN=LKOGAN, LMODICEDEP=LMODICEDEP, &
+    LLMICRO(:,:,:)=PRT(:,:,:,2)>RAIN_ICE_DESCR%XRTMIN(2) .OR. &
+                   PRT(:,:,:,3)>RAIN_ICE_DESCR%XRTMIN(3) .OR. &
+                   PRT(:,:,:,4)>RAIN_ICE_DESCR%XRTMIN(4) .OR. &
+                   PRT(:,:,:,5)>RAIN_ICE_DESCR%XRTMIN(5) .OR. &
+                   PRT(:,:,:,6)>RAIN_ICE_DESCR%XRTMIN(6) .OR. &
+                   PRT(:,:,:,7)>RAIN_ICE_DESCR%XRTMIN(7)
+    ISIZE=COUNT(LLMICRO)
+    CALL RAIN_ICE_OLD(YLDIMPHYEX, CST, PARAM_ICE, RAIN_ICE_PARAM, &
+                 &  RAIN_ICE_DESCR, TBUCONF, &
+                 &  OSEDIC=OSEDIC, OCND2=OCND2, LKOGAN=LKOGAN, LMODICEDEP=LMODICEDEP, &
                  &  HSEDIM=CSEDIM, HSUBG_AUCV_RC=CSUBG_AUCV_RC, &
                  &  OWARM=OWARM,KKA=KKA,KKU=KKU,KKL=KKL,KSPLITR=KSPLITR, &
-                 &  PTSTEP=2*PTSTEP, KRR=KRR,                              &
+                 &  PTSTEP=2*PTSTEP, KRR=KRR, KSIZE=ISIZE, GMICRO=LLMICRO, &
                  &  PDZZ=PDZZ, PRHODJ=PRHODJ, PRHODREF=PRHODREF, PEXNREF=PEXNREF,&
                  &  PPABST=PPABSM, PCIT=PCIT, PCLDFR=PCLDFR,  &
-                 &  PICLDFR=PICLDFR, PWCLDFR=PWCLDFR, &
+                 &  PICLDFR=PICLDFR, & !PWCLDFR=PWCLDFR, &
                  &  PSSIO=PSSIO, PSSIU=PSSIU, PIFR=PIFR, &
                  &  PTHT=PTHT,PRVT= PRT(:,:,:,1),PRCT= PRT(:,:,:,2), &
                  &  PRRT=PRT(:,:,:,3), &
@@ -451,7 +462,7 @@ SUBROUTINE  ARO_RAIN_ICE(KPROMA,KKA,KKU,KKL,KLON,KLEV, KFDIA, KRR, KTCOUNT, KSPL
                  &  PINPRC=ZINPRC,PINPRR=PINPRR,PEVAP3D=PEVAP,&
                  &  PINPRS=PINPRS, PINPRG=PINPRG, &
                  &  PSIGS=PSIGS, PSEA=PSEA, PTOWN=PTOWN, &
-                 &  YDDDH=YDDDH,YDLDDH=YDLDDH,YDMDDH=YDMDDH, &
+                 &  TBUDGETS=YLBUDGET, KBUDGETS=SIZE(YLBUDGET), &
                  &  PRHT=PRT(:,:,:,7),&
                  &  PRHS=PRS(:,:,:,7), PINPRH=PINPRH, PFPR=PFPR, &
                  &  PICENU=ZICENU, &
@@ -475,13 +486,21 @@ SUBROUTINE  ARO_RAIN_ICE(KPROMA,KKA,KKU,KKL,KLON,KLEV, KFDIA, KRR, KTCOUNT, KSPL
     ELSE
      ZKGN_SBGR(:,:) = RAIN_ICE_PARAM%XFRMIN(11)
     ENDIF
-    CALL RAIN_ICE_OLD( OSEDIC=OSEDIC, OCND2=OCND2, LKOGAN=LKOGAN, LMODICEDEP=LMODICEDEP, &
+    LLMICRO(:,:,:)=PRT(:,:,:,2)>RAIN_ICE_DESCR%XRTMIN(2) .OR. &                                                                     
+                   PRT(:,:,:,3)>RAIN_ICE_DESCR%XRTMIN(3) .OR. &                                                                     
+                   PRT(:,:,:,4)>RAIN_ICE_DESCR%XRTMIN(4) .OR. &                                                                     
+                   PRT(:,:,:,5)>RAIN_ICE_DESCR%XRTMIN(5) .OR. &                                                                     
+                   PRT(:,:,:,6)>RAIN_ICE_DESCR%XRTMIN(6)
+    ISIZE=COUNT(LLMICRO)
+    CALL RAIN_ICE_OLD(YLDIMPHYEX, CST, PARAM_ICE, RAIN_ICE_PARAM, &
+                 &  RAIN_ICE_DESCR, TBUCONF, &
+                 &  OSEDIC=OSEDIC, OCND2=OCND2, LKOGAN=LKOGAN, LMODICEDEP=LMODICEDEP, &
                  &  HSEDIM=CSEDIM, HSUBG_AUCV_RC=CSUBG_AUCV_RC, &
                  &  OWARM=OWARM,KKA=KKA,KKU=KKU,KKL=KKL,KSPLITR=KSPLITR, &
-                 &  PTSTEP=2*PTSTEP, KRR=KRR,                              &
+                 &  PTSTEP=2*PTSTEP, KRR=KRR, KSIZE=ISIZE, GMICRO=LLMICRO, &
                  &  PDZZ=PDZZ, PRHODJ=PRHODJ, PRHODREF=PRHODREF, PEXNREF=PEXNREF,&
                  &  PPABST=PPABSM, PCIT=PCIT, PCLDFR=PCLDFR,  &
-                 &  PICLDFR=PICLDFR, PWCLDFR=PWCLDFR, &
+                 &  PICLDFR=PICLDFR, & !PWCLDFR=PWCLDFR, &
                  &  PSSIO=PSSIO, PSSIU=PSSIU, PIFR=PIFR, &
                  &  PTHT=PTHT,PRVT= PRT(:,:,:,1),PRCT= PRT(:,:,:,2), &
                  &  PRRT=PRT(:,:,:,3), &
@@ -493,7 +512,7 @@ SUBROUTINE  ARO_RAIN_ICE(KPROMA,KKA,KKU,KKL,KLON,KLEV, KFDIA, KRR, KTCOUNT, KSPL
                  &  PINPRC=ZINPRC,PINPRR=PINPRR,PEVAP3D=PEVAP,&
                  &  PINPRS=PINPRS, PINPRG=PINPRG, &
                  &  PSIGS=PSIGS, PSEA=PSEA, PTOWN=PTOWN, &
-                 &  YDDDH=YDDDH,YDLDDH=YDLDDH,YDMDDH=YDMDDH, &
+                 &  TBUDGETS=YLBUDGET, KBUDGETS=SIZE(YLBUDGET), &
                  &  PFPR=PFPR, &
                  &  PICENU=ZICENU, &
                  &  PKGN_ACON=ZKGN_ACON, &

src/common/aux/mode_budget_phy.F90

@@ -48,18 +48,4 @@ SUBROUTINE BUDGET_STORE_ADD(TPBUDGET, HSOURCE, PVARS)
   REAL, DIMENSION(:,:,:), INTENT(IN)    :: PVARS    ! Current value to be stored
   REAL, DIMENSION(SIZE(PVARS, 1), SIZE(PVARS, 2), SIZE(PVARS, 3)) :: ZVARS
 END SUBROUTINE BUDGET_STORE_ADD
-!
-SUBROUTINE BUDGET_DDH(PVARS, KBUDN, HSOURCE, YDDDH, YDLDDH, YDMDDH, LDISDIFF)
-  USE DDH_MIX, ONLY  : TYP_DDH
-  USE YOMLDDH, ONLY  : TLDDH
-  USE YOMMDDH, ONLY  : TMDDH
-
-  REAL, DIMENSION(:,:), INTENT(IN)    :: PVARS    ! source of the variable
-  INTEGER,              INTENT(IN)    :: KBUDN    ! variable number
-  CHARACTER(LEN=*),     INTENT(IN)    :: HSOURCE  ! Identifier of the Budget
-  TYPE(TYP_DDH),        INTENT(INOUT) :: YDDDH
-  TYPE(TLDDH),          INTENT(IN)    :: YDLDDH
-  TYPE(TMDDH),          INTENT(IN)    :: YDMDDH
-  LOGICAL, OPTIONAL,    INTENT(IN)    :: LDISDIFF ! PVARS contains the increment (default is .FALSE.)
-END SUBROUTINE BUDGET_DDH
 END MODULE MODE_BUDGET_PHY