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

Merge branch 'master' of https://github.com/UMR-CNRM/PHYEX

parents 98198bf0 e4bd9cbc
No related branches found
No related tags found
No related merge requests found
...@@ -148,7 +148,8 @@ LSEDIC=LDSEDIC ...@@ -148,7 +148,8 @@ LSEDIC=LDSEDIC
! !
! 2. Set implicit default values for MODD_RAIN_ICE_DESCR ! 2. Set implicit default values for MODD_RAIN_ICE_DESCR
! et MODD_RAIN_ICE_PARAM ! et MODD_RAIN_ICE_PARAM
LSNOW_T=.FALSE.
LRED=CMICRO=='ICE3' .OR. CMICRO=='ICE4'
CALL INI_RAIN_ICE (KULOUT, PTSTEP, 20.,KSPLITR,CMICRO) CALL INI_RAIN_ICE (KULOUT, PTSTEP, 20.,KSPLITR,CMICRO)
CALL INI_TIWMX CALL INI_TIWMX
......
...@@ -158,7 +158,11 @@ IF(.NOT. LDSOFT) THEN ...@@ -158,7 +158,11 @@ IF(.NOT. LDSOFT) THEN
! 5.1.1 select the PLBDAS ! 5.1.1 select the PLBDAS
! !
DO JJ = 1, IGRIM DO JJ = 1, IGRIM
#if defined(REPRO48) || defined(REPRO55)
ZVEC1(JJ) = PLBDAS(I1(JJ))
#else
ZVEC1(JJ) = (PLBDAS(I1(JJ))**ICED%XALPHAS + ICED%XFVELOS**ICED%XALPHAS)**(1./ICED%XALPHAS) ZVEC1(JJ) = (PLBDAS(I1(JJ))**ICED%XALPHAS + ICED%XFVELOS**ICED%XALPHAS)**(1./ICED%XALPHAS)
#endif
END DO END DO
! !
! 5.1.2 find the next lower indice for the PLBDAS in the geometrical ! 5.1.2 find the next lower indice for the PLBDAS in the geometrical
......
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