Christine 25/06/2014 : correction pour pouvoir avoir LUSERI=T si ZUVTHLMR

src/MNH/set_rsou.f90

@@ -419,14 +419,14 @@ ENDIF
 !  STOP
 !ENDIF
 !
-IF(LUSERI .AND. YKIND=='ZUVTHLMR') THEN
-  WRITE(ILUOUT,FMT=*) 'USE OF ICE FOR YKIND=ZUVTHLMR IS NOT ALLOWED'
-  WRITE(ILUOUT,FMT=*)'JOB ABORTED '
- !callabortstop
-  CALL CLOSE_ll(CLUOUT,IOSTAT=IRESP)
-  CALL ABORT
-  STOP
-ENDIF
+!IF(LUSERI .AND. YKIND=='ZUVTHLMR') THEN
+!  WRITE(ILUOUT,FMT=*) 'USE OF ICE FOR YKIND=ZUVTHLMR IS NOT ALLOWED'
+!  WRITE(ILUOUT,FMT=*)'JOB ABORTED '
+! !callabortstop
+! CALL CLOSE_ll(CLUOUT,IOSTAT=IRESP)
+! CALL ABORT
+! STOP
+!ENDIF
 !
 IF(YKIND=='ZUVTHLMR' .AND. .NOT. LUSERC) THEN
   WRITE(ILUOUT,FMT=*) 'LUSERC=T IS REQUIRED FOR YKIND=ZUVTHLMR'
@@ -1037,9 +1037,10 @@ SELECT CASE(YKIND)
 !
 !   Read the data at each mass level of the RS
     DO JKM= 2,ILEVELM
-      IF(LUSERI) THEN
-        READ(ILUPRE,*) ZHEIGHTM(JKM),ZTHL(JKM),ZMR(JKM),ZMRC(JKM),ZMRI(JKM)
-      ELSEIF (GUSERC) THEN
+!     IF(LUSERI) THEN
+!       READ(ILUPRE,*) ZHEIGHTM(JKM),ZTHL(JKM),ZMR(JKM),ZMRC(JKM),ZMRI(JKM)
+!     ELSEIF (GUSERC) THEN
+      IF (GUSERC) THEN
         READ(ILUPRE,*) ZHEIGHTM(JKM),ZTHL(JKM),ZMR(JKM),ZMRC(JKM)
       ELSE
         READ(ILUPRE,*) ZHEIGHTM(JKM),ZTHL(JKM),ZMR(JKM)
@@ -1050,7 +1051,7 @@ SELECT CASE(YKIND)
     ZTHL(1)     = ZTHLGROUND
     ZMR(1)      = ZMRGROUND
     IF(GUSERC) ZMRC(1) = ZMRC(2)
-    IF(LUSERI) ZMRI(1) = ZMRI(2)
+!   IF(LUSERI) ZMRI(1) = ZMRI(2)
 !
 !   Compute Rt
     ZRT(:)=ZMR+ZMRC+ZMRI