Skip to content
Snippets Groups Projects
Commit e25a2950 authored by RODIER Quentin's avatar RODIER Quentin
Browse files

Quentin 25/05/2021: bugfix make coherent test for pack/unpack variables for...

Quentin 25/05/2021: bugfix make coherent test for pack/unpack variables for the modification of the subgrid condensation scheme
parent 525b15c3
No related branches found
No related tags found
No related merge requests found
......@@ -278,7 +278,7 @@ DO JJ = 1, SIZE(GDRY)
ZDRY(JJ)=MAX(0., -SIGN(1., XRTMIN(5)-PRST(JJ))) * & ! WHERE(PRST(:)>XRTMIN(5))
&MAX(0., -SIGN(1., XRTMIN(6)-PRGT(JJ))) * & ! WHERE(PRGT(:)>XRTMIN(6))
&PCOMPUTE(JJ)
IF (PRST(JJ)>XRTMIN(5) .AND. PRGT(JJ)>XRTMIN(6) .AND. PCOMPUTE(JJ)>0.) THEN
IF (ZDRY(JJ)>0) THEN
IGDRY = IGDRY + 1
I1(IGDRY) = JJ
GDRY(JJ) = .TRUE.
......@@ -354,7 +354,7 @@ DO JJ = 1, SIZE(GDRY)
ZDRY(JJ)=MAX(0., -SIGN(1., XRTMIN(3)-PRRT(JJ))) * & ! WHERE(PRRT(:)>XRTMIN(3))
&MAX(0., -SIGN(1., XRTMIN(6)-PRGT(JJ))) * & ! WHERE(PRGT(:)>XRTMIN(6))
&PCOMPUTE(JJ)
IF (PRRT(JJ)>XRTMIN(3) .AND. PRGT(JJ)>XRTMIN(6) .AND. PCOMPUTE(JJ)>0.) THEN
IF (ZDRY(JJ)>0) THEN
IGDRY = IGDRY + 1
I1(IGDRY) = JJ
GDRY(JJ) = .TRUE.
......
......@@ -212,7 +212,7 @@ DO JJ = 1, SIZE(GWET)
ZWET(JJ) = MAX(0., -SIGN(1., XRTMIN(7)-PRHT(JJ))) * & ! WHERE(PRHT(:)>XRTMIN(7))
&MAX(0., -SIGN(1., XRTMIN(5)-PRST(JJ))) * & ! WHERE(PRST(:)>XRTMIN(5))
&PCOMPUTE(JJ)
IF (PRHT(JJ)>XRTMIN(7) .AND. PRST(JJ)>XRTMIN(5) .AND. PCOMPUTE(JJ)>0.) THEN
IF (ZWET(JJ)>0) THEN
IGWET = IGWET + 1
I1(IGWET) = JJ
GWET(JJ) = .TRUE.
......@@ -287,7 +287,7 @@ DO JJ = 1, SIZE(GWET)
ZWET(JJ)=MAX(0., -SIGN(1., XRTMIN(7)-PRHT(JJ))) * & ! WHERE(PRHT(:)>XRTMIN(7))
&MAX(0., -SIGN(1., XRTMIN(6)-PRGT(JJ))) * & ! WHERE(PRGT(:)>XRTMIN(6))
&PCOMPUTE(JJ)
IF (PRHT(JJ)>XRTMIN(7) .AND. PRGT(JJ)>XRTMIN(6) .AND. PCOMPUTE(JJ)>0.) THEN
IF (ZWET(JJ)>0) THEN
IGWET = IGWET + 1
I1(IGWET) = JJ
GWET(JJ) = .TRUE.
......@@ -366,7 +366,7 @@ DO JJ = 1, SIZE(GWET)
ZWET(JJ)=MAX(0., -SIGN(1., XRTMIN(7)-PRHT(JJ))) * & ! WHERE(PRHT(:)>XRTMIN(7))
&MAX(0., -SIGN(1., XRTMIN(3)-PRRT(JJ))) * & ! WHERE(PRRT(:)>XRTMIN(3))
&PCOMPUTE(JJ)
IF (PRHT(JJ)>XRTMIN(7) .AND. PRRT(JJ)>XRTMIN(3) .AND. PCOMPUTE(JJ)>0.) THEN
IF (ZWET(JJ)>0) THEN
IGWET = IGWET + 1
I1(IGWET) = JJ
GWET(JJ) = .TRUE.
......
......@@ -192,7 +192,7 @@ DO JJ = 1, SIZE(GRIM)
ZRIM(JJ)=MAX(0., -SIGN(1., XRTMIN(2)-PRCT(JJ))) * & !WHERE(PRCT(:)>XRTMIN(2))
&MAX(0., -SIGN(1., XRTMIN(5)-PRST(JJ))) * & !WHERE(PRST(:)>XRTMIN(5))
&PCOMPUTE(JJ)
IF (PRCT(JJ)>XRTMIN(2) .AND. PRST(JJ)>XRTMIN(5) .AND. PCOMPUTE(JJ)>0.) THEN
IF (ZRIM(JJ)>0) THEN
IGRIM = IGRIM + 1
I1(IGRIM) = JJ
GRIM(JJ) = .TRUE.
......@@ -321,7 +321,7 @@ DO JJ = 1, SIZE(GACC)
ZACC(JJ)=MAX(0., -SIGN(1., XRTMIN(3)-PRRT(JJ))) * & !WHERE(PRRT(:)>XRTMIN(3))
&MAX(0., -SIGN(1., XRTMIN(5)-PRST(JJ))) * & !WHERE(PRST(:)>XRTMIN(5))
&PCOMPUTE(JJ)
IF (PRRT(JJ)>XRTMIN(3) .AND. PRST(JJ)>XRTMIN(5) .AND. PCOMPUTE(JJ)>0.) THEN
IF (ZACC(JJ)>0) THEN
IGACC = IGACC + 1
I1(IGACC) = JJ
GACC(JJ) = .TRUE.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment