Quentin 04/10/2024: end OpenACC ice_adjust: must be used with pyft commit...

Quentin 04/10/2024: end OpenACC ice_adjust: must be used with pyft commit 59b7877 (convertTypesInCompute deals with if-then-stmt + handle manualy the transfo of ICED%XRTMIN within a do loop)

src/PHYEX/micro/mode_ice4_stepping.f90

@@ -116,6 +116,7 @@ REAL, DIMENSION(KPROMA) :: &
                         & ZHLI_LCF, &
                         & ZHLI_LRI
 LOGICAL, DIMENSION(KPROMA) :: LLCOMPUTE ! .TRUE. or points where we must compute tendencies,
+REAL, DIMENSION(SIZE(ICED%XRTMIN))   :: ZRSMIN
 !
 !Output packed tendencies (for budgets only)
 REAL, DIMENSION(KPROMA, IBUNUM) :: ZBU_INST
@@ -144,6 +145,7 @@ IF (LHOOK) CALL DR_HOOK('ICE4_STEPPING', 0, ZHOOK_HANDLE)
 !               ------------
 !
 ZINV_TSTEP=1./PTSTEP
+ZRSMIN = ICED%XRTMIN
 !
 IF(BUCONF%LBU_ENABLE) THEN
   DO JV=1, IBUNUM-IBUNUM_EXTRA
@@ -331,7 +333,7 @@ DO WHILE(ANY(ZTIME(1:KMICRO)<PTSTEP)) ! Loop to *really* compute tendencies
     DO JV=1, KRR
 !$acc loop independent
       DO JL=1, KMICRO
-        IF (ZA(JL, JV) < -1.E-20 .AND. PVART(JL, JV) > ICED%XRTMIN(JV)) THEN
+        IF (ZA(JL, JV) < -1.E-20 .AND. PVART(JL, JV) > ZRSMIN(JV)) THEN
           ZMAXTIME(JL)=MIN(ZMAXTIME(JL), -(ZB(JL, JV)+PVART(JL, JV))/ZA(JL, JV))
         ENDIF
       ENDDO
@@ -384,7 +386,7 @@ DO WHILE(ANY(ZTIME(1:KMICRO)<PTSTEP)) ! Loop to *really* compute tendencies
 !$acc loop independent
           DO JL=1, KMICRO
             IF (ZTIME_THRESHOLD1D(JL)>=0 .AND. ZTIME_THRESHOLD1D(JL)<ZMAXTIME(JL) .AND. &
-               &(PVART(JL, JV)>ICED%XRTMIN(JV) .OR. ZA(JL, JV)>0.)) THEN
+               &(PVART(JL, JV)>ZRSMIN(JV) .OR. ZA(JL, JV)>0.)) THEN
               ZMAXTIME(JL)=MIN(ZMAXTIME(JL), ZTIME_THRESHOLD1D(JL))
               LLCOMPUTE(JL)=.FALSE.
             ENDIF

src/Rules.LXnvhpc2202.mk

@@ -343,6 +343,8 @@ PHYEX_SHUMAN = mode_tke_eps_sources.D mode_turb_ver_thermo_flux.D mode_turb_ver_
                mode_turb_hor_thermo_corr.D mode_turb_hor_uv.D mode_turb_hor_sv_corr.D mode_turb_hor_uw.D mode_turb_hor_vw.D \
                mode_turb_hor_tke.D mode_turb_hor_dyn_corr.D mode_turb_hor_sv_flux.D
 
+PHYEX_ICEADJUST = ice_adjust.D
+
 PHYEX_LIST0 = $(call dependance_flist,PHYEX/micro PHYEX/turb)
 PHYEX_LIST_IGNORE = minpack.D $(PHYEX_SHUMAN)
 PHYEX_LIST = $(sort $(filter-out $(PHYEX_LIST_IGNORE), $(PHYEX_LIST0) ) )
@@ -355,4 +357,5 @@ PHYEX_LIST = $(sort $(filter-out $(PHYEX_LIST_IGNORE), $(PHYEX_LIST0) ) )
 
 $(PHYEX_LIST) : PYFT = pyft_tool.py $(PHYEX_OPTDEFAULT)
 $(PHYEX_SHUMAN) : PYFT = pyft_tool.py --shumanFUNCtoCALL --expandAllArraysConcurrent $(PHYEX_OPTDEFAULT)
+$(PHYEX_ICEADJUST) : PYFT = pyft_tool.py --addIncludes --inlineContainedSubroutines $(PHYEX_OPTDEFAULT)