Skip to content
Snippets Groups Projects
Commit fa8e0455 authored by VIE Benoît's avatar VIE Benoît
Browse files

bugfix RAIN_ICE_RED LSNOW=T - ongoing work

parent 6a8721e3
No related branches found
No related tags found
No related merge requests found
...@@ -173,11 +173,13 @@ IF(LDSOFT) THEN ...@@ -173,11 +173,13 @@ IF(LDSOFT) THEN
ENDDO ENDDO
ELSE ELSE
PRVDEPS(:) = 0. PRVDEPS(:) = 0.
WHERE(ZMASK(:)==1.) DO JL=1, KSIZE
PRVDEPS(:) = ( PRST(:)*PSSI(:)/PAI(:)) * & IF (ZMASK(JL)==1.) THEN
( X0DEPS*PLBDAS(:)**XEX0DEPS + (X1DEPS*PCJ(:)*(1+(PLBDAS(:)/(2*XFVELOS)**XALPHAS))**(-XNUS+XEX1DEPS) & PRVDEPS(JL) = ( PRST(JL)*PSSI(JL)/PAI(JL) ) * &
*(PLBDAS(:))**(XBS+XEX1DEPS))) ( X0DEPS*PLBDAS(JL)**XEX0DEPS + X1DEPS*PCJ(JL) * (1+(XFVELOS/(2*PLBDAS(JL)))**XALPHAS)**(-XNUS+XEX1DEPS) &
END WHERE *(PLBDAS(JL))**(XBS+XEX1DEPS) )
END IF
END DO
ENDIF ENDIF
DO JL=1, KSIZE DO JL=1, KSIZE
PA_RS(JL) = PA_RS(JL) + PRVDEPS(JL) PA_RS(JL) = PA_RS(JL) + PRVDEPS(JL)
......
...@@ -411,7 +411,9 @@ ELSE ...@@ -411,7 +411,9 @@ ELSE
ZLBDAS(:) = MAX(MIN(XLBDAS_MAX, 10**(6.226-0.0106*ZT(:))),XLBDAS_MIN)*XTRANS_MP_GAMMAS ZLBDAS(:) = MAX(MIN(XLBDAS_MAX, 10**(6.226-0.0106*ZT(:))),XLBDAS_MIN)*XTRANS_MP_GAMMAS
END WHERE END WHERE
ELSE ELSE
ZLBDAS(:) = MAX(MIN(XLBDAS_MAX,XLBS*(PRHODREF(:)*ZRST(:))**XLBEXS),XLBDAS_MIN) WHERE (ZRST(:).GE.XRTMIN(5))
ZLBDAS(:) = MAX(MIN(XLBDAS_MAX,XLBS*(PRHODREF(:)*ZRST(:))**XLBEXS),XLBDAS_MIN)
END WHERE
END IF END IF
CALL ICE4_RSRIMCG_OLD(KSIZE, ODSOFT, PCOMPUTE==1., & CALL ICE4_RSRIMCG_OLD(KSIZE, ODSOFT, PCOMPUTE==1., &
&PRHODREF, & &PRHODREF, &
...@@ -487,7 +489,9 @@ IF(KSIZE>0) THEN ...@@ -487,7 +489,9 @@ IF(KSIZE>0) THEN
ZLBDAS(:) = MAX(MIN(XLBDAS_MAX, 10**(6.226-0.0106*ZT(:))),XLBDAS_MIN)*XTRANS_MP_GAMMAS ZLBDAS(:) = MAX(MIN(XLBDAS_MAX, 10**(6.226-0.0106*ZT(:))),XLBDAS_MIN)*XTRANS_MP_GAMMAS
END WHERE END WHERE
ELSE ELSE
ZLBDAS(:) = MAX(MIN(XLBDAS_MAX,XLBS*(PRHODREF(:)*ZRST(:))**XLBEXS),XLBDAS_MIN) WHERE (ZRST(:).GE.XRTMIN(5))
ZLBDAS(:) = MAX(MIN(XLBDAS_MAX,XLBS*(PRHODREF(:)*ZRST(:))**XLBEXS),XLBDAS_MIN)
END WHERE
END IF END IF
ZLBDAG(:)=0. ZLBDAG(:)=0.
WHERE(ZRGT(:)>0.) WHERE(ZRGT(:)>0.)
......
...@@ -590,7 +590,9 @@ DO JK = 1, KKT ...@@ -590,7 +590,9 @@ DO JK = 1, KKT
END IF END IF
END IF END IF
ELSE ELSE
ZLBDAS(JI,JJ,JK) = MAX(MIN(XLBDAS_MAX,XLBS*(PRHODREF(JI,JJ,JK)*PRST(JI,JJ,JK))**XLBEXS),XLBDAS_MIN) IF (PRST(JI,JJ,JK).GT.XRTMIN(5)) THEN
ZLBDAS(JI,JJ,JK) = MAX(MIN(XLBDAS_MAX,XLBS*(PRHODREF(JI,JJ,JK)*PRST(JI,JJ,JK))**XLBEXS),XLBDAS_MIN)
END IF
END IF END IF
END DO END DO
END DO END DO
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment