Juan fix/merge , M.Leriche 11/2016 : Chemistry

src/SURFEX/ch_init_emissionn.F90

@@ -42,9 +42,6 @@ USE MODI_GET_LUOUT
 USE MODI_BUILD_EMISSTAB_n
 USE MODI_BUILD_PRONOSLIST_n
 USE MODI_READ_SURF
-USE MODI_OPEN_NAMELIST
-USE MODI_CLOSE_NAMELIST
-USE MODI_READ_SURF_FIELD2D
 !
 USE MODI_OPEN_NAMELIST
 USE MODI_CLOSE_NAMELIST
@@ -141,7 +138,6 @@ ELSE
   WRITE(ILUOUT,*) 'CEMIS_NAME already allocated with SIZE :',SIZE(CHE%CEMIS_NAME)
 END IF
 
-
 IF (.NOT. ASSOCIATED(CHE%CEMIS_AREA))   ALLOCATE(CHE%CEMIS_AREA(CHE%NEMISPEC_NBR))
 IF (.NOT. ASSOCIATED(CHE%NEMIS_TIME))   ALLOCATE(CHE%NEMIS_TIME(CHE%NEMIS_NBR))
  CHE%NEMIS_TIME(:) = -1
@@ -225,16 +221,6 @@ DO JSPEC = 1,CHE%NEMISPEC_NBR ! Loop on the number of species
     DEALLOCATE(ZWORK2D)
   END IF
 ! 
-!*      2.     Simple reading of emission fields
-
-  IF (HINIT /= "ALL") THEN
-    YRECFM='E_'//TRIM(ADJUSTL(YSPEC_NAME))
-    ALLOCATE(ZWORK2D(KLU,INBTS))
-    CALL READ_SURF_FIELD2D(HPROGRAM,ZWORK2D(:,:),YRECFM,YCOMMENT)
-    XEMIS_FIELDS(:,IIND1:IIND2) = ZWORK2D(:,:)
-    CEMIS_COMMENT(IIND1:IIND2) = YCOMMENT
-    DEALLOCATE(ZWORK2D)
-  END IF
 END DO
 !
 WRITE(ILUOUT,*) '---- Nunmer of OFFLINE species = ',INBOFF

src/SURFEX/zoom_pgd_surf_atm.F90

@@ -192,11 +192,7 @@ YSC%DUU%NDUMMY_NBR = 0
 !*   10.      Chemical Emission fields
 !             ------------------------
 !
-<<<<<<< HEAD
 YSC%CHU%LCH_EMIS = .FALSE.
-=======
-LCH_EMIS = .FALSE.
->>>>>>> MNH-52X-BUG2
 IF (LHOOK) CALL DR_HOOK('ZOOM_PGD_SURF_ATM',1,ZHOOK_HANDLE)
 !_______________________________________________________________________________
 !