Skip to content
Snippets Groups Projects
Commit 9446368e authored by Gaelle DELAUTIER's avatar Gaelle DELAUTIER
Browse files

Revert "Christine 25/11/2016 : Correction on the flag for Strang splitting to... 

Revert "Christine 25/11/2016 : Correction on the flag for Strang splitting to insure reproducibility between START and RESTA"

This reverts commit d4b7d37a.
parent 5b8528e9
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/MNH/advection_metsv.f90
+ 7
− 5
View file @ 9446368e
......@@ -473,10 +473,10 @@ IF (GTKE) PRTKES_ADV(:,:,:) = 0.
!* time splitting loop
DO JSPL=1,KSPLIT
!
ZRTHS_PPM(:,:,:) = 0.
ZRTKES_PPM(:,:,:) = 0.
IF (KRR /=0) ZRRS_PPM(:,:,:,:) = 0.
IF (KSV /=0) ZRSVS_PPM(:,:,:,:) = 0.
!ZRTHS_PPM(:,:,:) = 0.
!ZRTKES_PPM(:,:,:) = 0.
!IF (KRR /=0) ZRRS_PPM(:,:,:,:) = 0.
!IF (KSV /=0) ZRSVS_PPM(:,:,:,:) = 0.
!
IF (LNEUTRAL) ZTH=ZTH-PTHVREF !* To be removed with the new PPM scheme ?
CALL PPM_MET (HLBCX,HLBCY, KRR, TPDTCUR,ZRUCPPM, ZRVCPPM, ZRWCPPM, PTSTEP,ZTSTEP_PPM, &
......@@ -495,6 +495,7 @@ DO JSPL=1,KSPLIT
IF (KRR /=0) PRRS (:,:,:,:) = PRRS (:,:,:,:) + ZRRS_PPM (:,:,:,:) / KSPLIT
IF (KSV /=0 ) PRSVS (:,:,:,:) = PRSVS (:,:,:,:) + ZRSVS_PPM (:,:,:,:) / KSPLIT
!
IF (JSPL<KSPLIT) THEN
!
! Guesses of the field inside the time splitting loop
!
......@@ -513,7 +514,7 @@ DO JSPL=1,KSPLIT
! Top and bottom Boundaries and LBC for the guesses
!
CALL ADV_BOUNDARIES (HLBCX, HLBCY, ZTH, PTHT )
CALL ADV_BOUNDARIES (HLBCX, HLBCY, ZTKE, PTKET)
IF (GTKE) CALL ADV_BOUNDARIES (HLBCX, HLBCY, ZTKE, PTKET)
DO JR = 1, KRR
CALL ADV_BOUNDARIES (HLBCX, HLBCY, ZR(:,:,:,JR), PRT(:,:,:,JR))
END DO
......@@ -536,6 +537,7 @@ DO JSPL=1,KSPLIT
CALL UPDATE_HALO_ll(TZFIELDS1_ll,IINFO_ll)
CALL CLEANLIST_ll(TZFIELDS1_ll)
!!$ END IF
END IF
!
END DO
!
......
src/MNH/ppm_met.f90
+ 7
− 18
View file @ 9446368e
......@@ -39,8 +39,8 @@ REAL, INTENT(IN) :: PTSTEP_PPM ! Time Step PPM
REAL, DIMENSION(:,:,:), INTENT(IN) :: PTHT, PTKET ! Vars at t
REAL, DIMENSION(:,:,:,:), INTENT(IN) :: PRT
!
REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PRTHS, PRTKES! Source terms
REAL, DIMENSION(:,:,:,:), INTENT(INOUT) :: PRRS
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PRTHS, PRTKES! Source terms
REAL, DIMENSION(:,:,:,:), INTENT(OUT) :: PRRS
!
END SUBROUTINE PPM_MET
!
......@@ -131,8 +131,8 @@ REAL, INTENT(IN) :: PTSTEP_PPM ! Time Step PPM
REAL, DIMENSION(:,:,:), INTENT(IN) :: PTHT, PTKET ! Vars at t
REAL, DIMENSION(:,:,:,:), INTENT(IN) :: PRT
!
REAL, DIMENSION(:,:,:), INTENT(INOUT) :: PRTHS, PRTKES! Source terms
REAL, DIMENSION(:,:,:,:), INTENT(INOUT) :: PRRS
REAL, DIMENSION(:,:,:), INTENT(OUT) :: PRTHS, PRTKES! Source terms
REAL, DIMENSION(:,:,:,:), INTENT(OUT) :: PRRS
!
!* 0.2 Declarations of local variables :
!
......@@ -142,11 +142,6 @@ LOGICAL :: GTKEALLOC ! true if TKE arrays are not zero-sized
!
INTEGER :: IGRID ! localisation on the model grid
!
!* Variables specific to ppm scheme
!
! Advection source term calulated in the PPM algorithm
REAL, DIMENSION(SIZE(PCRU,1),SIZE(PCRU,2),SIZE(PCRU,3)) :: ZSRC
!
!-------------------------------------------------------------------------------
!
!* 1. COMPUTES THE DOMAIN DIMENSIONS
......@@ -166,9 +161,7 @@ IGRID = 1
!
CALL ADVEC_PPM_ALGO(HMET_ADV_SCHEME, HLBCX, HLBCY, IGRID, PTHT, PRHODJ, PTSTEP, &
PTSTEP_PPM,PRHOX1, PRHOX2, PRHOY1, PRHOY2, PRHOZ1, PRHOZ2, &
ZSRC, TPDTCUR, PCRU, PCRV, PCRW)
! add the advection to the sources
PRTHS = PRTHS + ZSRC
PRTHS, TPDTCUR, PCRU, PCRV, PCRW)
!
!
! Turbulence variables
......@@ -176,8 +169,7 @@ PRTHS = PRTHS + ZSRC
IF (GTKEALLOC) THEN
CALL ADVEC_PPM_ALGO(HMET_ADV_SCHEME, HLBCX, HLBCY, IGRID, PTKET,PRHODJ,PTSTEP, &
PTSTEP_PPM,PRHOX1, PRHOX2, PRHOY1, PRHOY2, PRHOZ1, PRHOZ2, &
ZSRC, TPDTCUR, PCRU, PCRV, PCRW)
PRTKES = PRTKES + ZSRC
PRTKES, TPDTCUR, PCRU, PCRV, PCRW)
!
!
END IF
......@@ -187,13 +179,10 @@ END IF
! Case with KRR moist variables
!
DO JRR=1,KRR
!
CALL ADVEC_PPM_ALGO(HMET_ADV_SCHEME, HLBCX, HLBCY, IGRID, &
PRT(:,:,:,JRR), PRHODJ, PTSTEP, PTSTEP_PPM, &
PRHOX1, PRHOX2, PRHOY1, PRHOY2, PRHOZ1, PRHOZ2, &
ZSRC, TPDTCUR, PCRU, PCRV, PCRW )
PRRS(:,:,:,JRR) = PRRS(:,:,:,JRR) + ZSRC(:,:,:)
!
PRRS(:,:,:,JRR), TPDTCUR, PCRU, PCRV, PCRW )
END DO
!
!
......
src/MNH/ppm_scalar.f90
+ 3
− 13
View file @ 9446368e
......@@ -41,7 +41,7 @@ REAL, INTENT(IN) :: PTSTEP_PPM ! Time Step PPM
!
REAL, DIMENSION(:,:,:,:), INTENT(IN) :: PSVT ! Vars at t
!
REAL, DIMENSION(:,:,:,:), INTENT(INOUT) :: PRSVS ! Source terms
REAL, DIMENSION(:,:,:,:), INTENT(OUT ) :: PRSVS ! Source terms
!
!
END SUBROUTINE PPM_SCALAR
......@@ -129,7 +129,7 @@ REAL, INTENT(IN) :: PTSTEP_PPM ! Time Step PPM
!
REAL, DIMENSION(:,:,:,:), INTENT(IN) :: PSVT
!
REAL, DIMENSION(:,:,:,:), INTENT(INOUT) :: PRSVS ! Source terms
REAL, DIMENSION(:,:,:,:), INTENT(OUT) :: PRSVS ! Source terms
!
!
!* 0.2 Declarations of local variables :
......@@ -138,12 +138,6 @@ INTEGER :: JSV ! Loop index for Scalar Variables
!
INTEGER :: IGRID ! localisation on the model grid
!
!* Variables specific to ppm scheme
!
! Advection source term calulated in the PPM algorithm
REAL, DIMENSION(SIZE(PCRU,1),SIZE(PCRU,2),SIZE(PCRU,3)) :: ZSRC
!
!
!-------------------------------------------------------------------------------
!
!* 1. CALL THE ADVEC_PPM_ALGO ROUTINE FOR EACH FIELD
......@@ -154,14 +148,10 @@ IGRID = 1
! Case with KSV tracers
!
DO JSV=1,KSV
!
CALL ADVEC_PPM_ALGO(HSV_ADV_SCHEME, HLBCX, HLBCY, IGRID, PSVT(:,:,:,JSV), &
PRHODJ, PTSTEP, PTSTEP_PPM, &
PRHOX1, PRHOX2, PRHOY1, PRHOY2, PRHOZ1, PRHOZ2, &
ZSRC, TPDTCUR, PCRU, PCRV, PCRW)
! add the advection to the sources
PRSVS(:,:,:,JSV) = PRSVS(:,:,:,JSV) + ZSRC(:,:,:)
!
PRSVS(:,:,:,JSV), TPDTCUR, PCRU, PCRV, PCRW)
END DO
!
!
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Documentation | Mentions légales | CGU | Accessibilité : non conforme