Skip to content

Commit

Permalink
S. Riette 23 Nov 2023: Harmonization between the different testprogs
Browse files Browse the repository at this point in the history 
Use of DIFF in rain_ice_old testprog
Remove useless dimension in other testprogs

Another part of #17
  • Loading branch information
@SebastienRietteMTO
SebastienRietteMTO committed Nov 23, 2023
1 parent 8e2cb42 commit 8046717
Show file tree
Hide file tree
Showing 12 changed files with 1,877 additions and 1,989 deletions.
302 changes: 151 additions & 151 deletions src/testprogs/ice_adjust/getdata_ice_adjust_mod.F90
View file

Large diffs are not rendered by default.

114 changes: 57 additions & 57 deletions src/testprogs/ice_adjust/main_ice_adjust.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,41 +15,41 @@ PROGRAM MAIN_ICE_ADJUST
INTEGER :: KLEV
INTEGER :: KRR

REAL, ALLOCATABLE :: PRHODJ (:,:,:,:)
REAL, ALLOCATABLE :: PEXNREF (:,:,:,:)
REAL, ALLOCATABLE :: PRHODREF (:,:,:,:)
REAL, ALLOCATABLE :: PPABSM (:,:,:,:)
REAL, ALLOCATABLE :: PTHT (:,:,:,:)
REAL, ALLOCATABLE :: PSIGS (:,:,:,:)
REAL, ALLOCATABLE :: PMFCONV (:,:,:,:)
REAL, ALLOCATABLE :: PRC_MF (:,:,:,:)
REAL, ALLOCATABLE :: PRI_MF (:,:,:,:)
REAL, ALLOCATABLE :: PCF_MF (:,:,:,:)
REAL, ALLOCATABLE :: PTHS (:,:,:,:)
REAL, ALLOCATABLE :: PRS (:,:,:,:,:)
REAL, ALLOCATABLE :: PSRCS (:,:,:,:)
REAL, ALLOCATABLE :: PCLDFR (:,:,:,:)
REAL, ALLOCATABLE :: PHLC_HRC (:,:,:,:)
REAL, ALLOCATABLE :: PHLC_HCF (:,:,:,:)
REAL, ALLOCATABLE :: PHLI_HRI (:,:,:,:)
REAL, ALLOCATABLE :: PHLI_HCF (:,:,:,:)
REAL, ALLOCATABLE :: ZRS (:,:,:,:,:)
REAL, ALLOCATABLE :: ZZZ (:,:,:,:)
REAL, ALLOCATABLE :: ZSIGQSAT (:,:,:)
REAL, ALLOCATABLE :: ZICE_CLD_WGT (:,:,:)
REAL, ALLOCATABLE :: ZDUM1 (:,:,:,:)
REAL, ALLOCATABLE :: ZDUM2 (:,:,:,:)
REAL, ALLOCATABLE :: ZDUM3 (:,:,:,:)
REAL, ALLOCATABLE :: ZDUM4 (:,:,:,:)
REAL, ALLOCATABLE :: ZDUM5 (:,:,:,:)

REAL, ALLOCATABLE :: PRS_OUT (:,:,:,:,:)
REAL, ALLOCATABLE :: PSRCS_OUT (:,:,:,:)
REAL, ALLOCATABLE :: PCLDFR_OUT (:,:,:,:)
REAL, ALLOCATABLE :: PHLC_HRC_OUT (:,:,:,:)
REAL, ALLOCATABLE :: PHLC_HCF_OUT (:,:,:,:)
REAL, ALLOCATABLE :: PHLI_HRI_OUT (:,:,:,:)
REAL, ALLOCATABLE :: PHLI_HCF_OUT (:,:,:,:)
REAL, ALLOCATABLE :: PRHODJ (:,:,:)
REAL, ALLOCATABLE :: PEXNREF (:,:,:)
REAL, ALLOCATABLE :: PRHODREF (:,:,:)
REAL, ALLOCATABLE :: PPABSM (:,:,:)
REAL, ALLOCATABLE :: PTHT (:,:,:)
REAL, ALLOCATABLE :: PSIGS (:,:,:)
REAL, ALLOCATABLE :: PMFCONV (:,:,:)
REAL, ALLOCATABLE :: PRC_MF (:,:,:)
REAL, ALLOCATABLE :: PRI_MF (:,:,:)
REAL, ALLOCATABLE :: PCF_MF (:,:,:)
REAL, ALLOCATABLE :: PTHS (:,:,:)
REAL, ALLOCATABLE :: PRS (:,:,:,:)
REAL, ALLOCATABLE :: PSRCS (:,:,:)
REAL, ALLOCATABLE :: PCLDFR (:,:,:)
REAL, ALLOCATABLE :: PHLC_HRC (:,:,:)
REAL, ALLOCATABLE :: PHLC_HCF (:,:,:)
REAL, ALLOCATABLE :: PHLI_HRI (:,:,:)
REAL, ALLOCATABLE :: PHLI_HCF (:,:,:)
REAL, ALLOCATABLE :: ZRS (:,:,:,:)
REAL, ALLOCATABLE :: ZZZ (:,:,:)
REAL, ALLOCATABLE :: ZSIGQSAT (:,:)
REAL, ALLOCATABLE :: ZICE_CLD_WGT (:,:)
REAL, ALLOCATABLE :: ZDUM1 (:,:,:)
REAL, ALLOCATABLE :: ZDUM2 (:,:,:)
REAL, ALLOCATABLE :: ZDUM3 (:,:,:)
REAL, ALLOCATABLE :: ZDUM4 (:,:,:)
REAL, ALLOCATABLE :: ZDUM5 (:,:,:)

REAL, ALLOCATABLE :: PRS_OUT (:,:,:,:)
REAL, ALLOCATABLE :: PSRCS_OUT (:,:,:)
REAL, ALLOCATABLE :: PCLDFR_OUT (:,:,:)
REAL, ALLOCATABLE :: PHLC_HRC_OUT (:,:,:)
REAL, ALLOCATABLE :: PHLC_HCF_OUT (:,:,:)
REAL, ALLOCATABLE :: PHLI_HRI_OUT (:,:,:)
REAL, ALLOCATABLE :: PHLI_HCF_OUT (:,:,:)

INTEGER :: NPROMA, NGPBLKS, NFLEVG
INTEGER :: IBL, JLON, JLEV
Expand Down Expand Up @@ -108,8 +108,8 @@ PROGRAM MAIN_ICE_ADJUST
& PHLI_HRI, PHLI_HCF, ZRS, ZZZ, PRS_OUT, PSRCS_OUT, PCLDFR_OUT, PHLC_HRC_OUT, PHLC_HCF_OUT, &
& PHLI_HRI_OUT, PHLI_HCF_OUT, LLVERBOSE)

KLEV = SIZE (PRS, 3)
KRR = SIZE (PRS, 4)
KLEV = SIZE (PRS, 2)
KRR = SIZE (PRS, 3)

IF (LLVERBOSE) PRINT *, " KLEV = ", KLEV, " KRR = ", KRR

Expand Down Expand Up @@ -206,22 +206,22 @@ PROGRAM MAIN_ICE_ADJUST

CALL ICE_ADJUST (D, PHYEX%CST, PHYEX%RAIN_ICE_PARAMN, PHYEX%NEBN, PHYEX%TURBN, PHYEX%PARAM_ICEN, &
& PHYEX%MISC%TBUCONF, PHYEX%MISC%KRR, PHYEX%MISC%HBUNAME, &
& PHYEX%MISC%PTSTEP, ZSIGQSAT (:, :, IBL), PRHODJ=PRHODJ (:, :, :, IBL), &
& PEXNREF=PEXNREF (:, :, :, IBL), &
& PRHODREF=PRHODREF (:, :, :, IBL), PSIGS=PSIGS (:, :, :, IBL), LMFCONV=PHYEX%MISC%LMFCONV, PMFCONV=PMFCONV (:, :, :, IBL), &
& PPABST=PPABSM (:, :, :, IBL), PZZ=ZZZ (:, :, :, IBL), PEXN=PEXNREF (:, :, :, IBL), PCF_MF=PCF_MF (:, :, :, IBL), &
& PRC_MF=PRC_MF (:, :, :, IBL), PRI_MF=PRI_MF (:, :, :, IBL), &
& PICLDFR=ZDUM1(:, :, :, IBL), PWCLDFR=ZDUM2(:, :, :, IBL), PSSIO=ZDUM3(:, :, :, IBL), &
& PSSIU=ZDUM4(:, :, :, IBL), PIFR=ZDUM5(:, :, :, IBL), &
& PRV=ZRS(:, :, :, 1, IBL), PRC=ZRS(:, :, :, 2, IBL), &
& PRVS=PRS(:, :, :, 1, IBL), PRCS=PRS(:, :, :, 2, IBL), PTH=ZRS(:, :, :, 0, IBL), PTHS=PTHS (:, :, :, IBL), &
& PHYEX%MISC%PTSTEP, ZSIGQSAT (:, IBL), PRHODJ=PRHODJ (:, :, IBL), &
& PEXNREF=PEXNREF (:, :, IBL), &
& PRHODREF=PRHODREF (:, :, IBL), PSIGS=PSIGS (:, :, IBL), LMFCONV=PHYEX%MISC%LMFCONV, PMFCONV=PMFCONV (:, :, IBL), &
& PPABST=PPABSM (:, :, IBL), PZZ=ZZZ (:, :, IBL), PEXN=PEXNREF (:, :, IBL), PCF_MF=PCF_MF (:, :, IBL), &
& PRC_MF=PRC_MF (:, :, IBL), PRI_MF=PRI_MF (:, :, IBL), &
& PICLDFR=ZDUM1(:, :, IBL), PWCLDFR=ZDUM2(:, :, IBL), PSSIO=ZDUM3(:, :, IBL), &
& PSSIU=ZDUM4(:, :, IBL), PIFR=ZDUM5(:, :, IBL), &
& PRV=ZRS(:, :, 1, IBL), PRC=ZRS(:, :, 2, IBL), &
& PRVS=PRS(:, :, 1, IBL), PRCS=PRS(:, :, 2, IBL), PTH=ZRS(:, :, 0, IBL), PTHS=PTHS (:, :, IBL), &
& OCOMPUTE_SRC=PHYEX%MISC%OCOMPUTE_SRC, &
& PSRCS=PSRCS (:, :, :, IBL), PCLDFR=PCLDFR (:, :, :, IBL), PRR=ZRS(:, :, :, 3, IBL), PRI=ZRS(:, :, :, 4, IBL), &
& PRIS=PRS(:, :, :, 4, IBL), PRS=ZRS(:, :, :, 5, IBL), PRG=ZRS(:, :, :, 6, IBL), &
& PSRCS=PSRCS (:, :, IBL), PCLDFR=PCLDFR (:, :, IBL), PRR=ZRS(:, :, 3, IBL), PRI=ZRS(:, :, 4, IBL), &
& PRIS=PRS(:, :, 4, IBL), PRS=ZRS(:, :, 5, IBL), PRG=ZRS(:, :, 6, IBL), &
& TBUDGETS=PHYEX%MISC%YLBUDGET, KBUDGETS=PHYEX%MISC%NBUDGET, &
& PICE_CLD_WGT=ZICE_CLD_WGT(:, :, IBL), &
& PHLC_HRC=PHLC_HRC(:, :, :, IBL), PHLC_HCF=PHLC_HCF(:, :, :, IBL), &
& PHLI_HRI=PHLI_HRI(:, :, :, IBL), PHLI_HCF=PHLI_HCF(:, :, :, IBL) &
& PICE_CLD_WGT=ZICE_CLD_WGT(:, IBL), &
& PHLC_HRC=PHLC_HRC(:, :, IBL), PHLC_HCF=PHLC_HCF(:, :, IBL), &
& PHLI_HRI=PHLI_HRI(:, :, IBL), PHLI_HCF=PHLI_HCF(:, :, IBL) &
#ifdef USE_STACK
& , YDSTACK=YLSTACK &
#endif
Expand Down Expand Up @@ -263,12 +263,12 @@ PROGRAM MAIN_ICE_ADJUST
IF (LLCHECK .OR. LLSTAT .OR. LLCHECKDIFF) THEN
DO IBL = IBLOCK1, IBLOCK2
PRINT *, " IBL = ", IBL
CALL DIFF ("PSRCS", PSRCS_OUT (:,:,:,IBL), PSRCS (:,:,:,IBL), LLSTAT, LLCHECK, NPROMA, LLCHECKDIFF, LLDIFF)
CALL DIFF ("PCLDFR", PCLDFR_OUT (:,:,:,IBL), PCLDFR (:,:,:,IBL), LLSTAT, LLCHECK, NPROMA, LLCHECKDIFF, LLDIFF)
CALL DIFF ("PHLC_HRC", PHLC_HRC_OUT (:,:,:,IBL), PHLC_HRC (:,:,:,IBL), LLSTAT, LLCHECK, NPROMA, LLCHECKDIFF, LLDIFF)
CALL DIFF ("PHLC_HCF", PHLC_HCF_OUT (:,:,:,IBL), PHLC_HCF (:,:,:,IBL), LLSTAT, LLCHECK, NPROMA, LLCHECKDIFF, LLDIFF)
CALL DIFF ("PHLI_HRI", PHLI_HRI_OUT (:,:,:,IBL), PHLI_HRI (:,:,:,IBL), LLSTAT, LLCHECK, NPROMA, LLCHECKDIFF, LLDIFF)
CALL DIFF ("PHLI_HCF", PHLI_HCF_OUT (:,:,:,IBL), PHLI_HCF (:,:,:,IBL), LLSTAT, LLCHECK, NPROMA, LLCHECKDIFF, LLDIFF)
CALL DIFF ("PSRCS", PSRCS_OUT (:,:,IBL), PSRCS (:,:,IBL), LLSTAT, LLCHECK, NPROMA, LLCHECKDIFF, LLDIFF)
CALL DIFF ("PCLDFR", PCLDFR_OUT (:,:,IBL), PCLDFR (:,:,IBL), LLSTAT, LLCHECK, NPROMA, LLCHECKDIFF, LLDIFF)
CALL DIFF ("PHLC_HRC", PHLC_HRC_OUT (:,:,IBL), PHLC_HRC (:,:,IBL), LLSTAT, LLCHECK, NPROMA, LLCHECKDIFF, LLDIFF)
CALL DIFF ("PHLC_HCF", PHLC_HCF_OUT (:,:,IBL), PHLC_HCF (:,:,IBL), LLSTAT, LLCHECK, NPROMA, LLCHECKDIFF, LLDIFF)
CALL DIFF ("PHLI_HRI", PHLI_HRI_OUT (:,:,IBL), PHLI_HRI (:,:,IBL), LLSTAT, LLCHECK, NPROMA, LLCHECKDIFF, LLDIFF)
CALL DIFF ("PHLI_HCF", PHLI_HCF_OUT (:,:,IBL), PHLI_HCF (:,:,IBL), LLSTAT, LLCHECK, NPROMA, LLCHECKDIFF, LLDIFF)
ENDDO
ENDIF

Expand Down
Loading

0 comments on commit 8046717

Please sign in to comment.