Gaelle 25/3/2015 : phasage WENO

src/MNH/mnh2lpdm_ech.f90

@@ -95,20 +95,20 @@ print 20300, ICURJJ,ICURMM,ICURAA,ICURHH,ICURMN,ICURSS
 !
 !*	2.3 Lecture des champs Meso-NH de base.
 !
-CALL FMREAD(HFM,'UM',HFLOG,'XY',XUM,IGRID,ILONCOM,YCOM,IREP)
-CALL FMREAD(HFM,'VM',HFLOG,'XY',XVM,IGRID,ILONCOM,YCOM,IREP)
-CALL FMREAD(HFM,'WM',HFLOG,'XY',XWM,IGRID,ILONCOM,YCOM,IREP)
-CALL FMREAD(HFM,'THM',HFLOG,'XY',XTHM,IGRID,ILONCOM,YCOM,IREP)
-CALL FMREAD(HFM,'TKEM',HFLOG,'XY',XTKEM,IGRID,ILONCOM,YCOM,IREP)
+CALL FMREAD(HFM,'UT',HFLOG,'XY',XUT,IGRID,ILONCOM,YCOM,IREP)
+CALL FMREAD(HFM,'VT',HFLOG,'XY',XVT,IGRID,ILONCOM,YCOM,IREP)
+CALL FMREAD(HFM,'WT',HFLOG,'XY',XWT,IGRID,ILONCOM,YCOM,IREP)
+CALL FMREAD(HFM,'THT',HFLOG,'XY',XTHT,IGRID,ILONCOM,YCOM,IREP)
+CALL FMREAD(HFM,'TKET',HFLOG,'XY',XTKET,IGRID,ILONCOM,YCOM,IREP)
 CALL FMREAD(HFM,'LM',HFLOG,'XY',XLM,IGRID,ILONCOM,YCOM,IREP)
 CALL FMREAD(HFM,'THW_FLX',HFLOG,'XY',XWPTHP,IGRID,ILONCOM,YCOM,IREP)
 CALL FMREAD(HFM,'DISS',HFLOG,'XY',XDISSIP,IGRID,ILONCOM,YCOM,IREP)
 CALL FMREAD(HFM,'FMU',HFLOG,'XY',XSFU,IGRID,ILONCOM,YCOM,IREP)
 CALL FMREAD(HFM,'FMV',HFLOG,'XY',XSFV,IGRID,ILONCOM,YCOM,IREP)
 CALL FMREAD(HFM,'INPRT',HFLOG,'XY',XINRT,IGRID,ILONCOM,YCOM,IREP)
-CALL FMREAD(HFM,'RVM',HFLOG,'XY',XRMVM,IGRID,ILONCOM,YCOM,IREP)
-CALL FMREAD(HFM,'RCM',HFLOG,'XY',XRMCM,IGRID,ILONCOM,YCOM,IREP)
-CALL FMREAD(HFM,'RRM',HFLOG,'XY',XRMRM,IGRID,ILONCOM,YCOM,IREP)
+CALL FMREAD(HFM,'RVT',HFLOG,'XY',XRMVT,IGRID,ILONCOM,YCOM,IREP)
+CALL FMREAD(HFM,'RCT',HFLOG,'XY',XRMCT,IGRID,ILONCOM,YCOM,IREP)
+CALL FMREAD(HFM,'RRT',HFLOG,'XY',XRMRT,IGRID,ILONCOM,YCOM,IREP)
 !
 !              Lecture des donnees Meso-NH terminee.'
 !
@@ -123,18 +123,18 @@ CALL FMCLOS_LL(HFM,'KEEP',HFLOG,IREP)
 !
 !*	3.2 Niveaux altitude "hors-sol" (1:NKMAX).
 !
-XSU(:,:,1:NKMAX) = XUM(NSIB:NSIE,NSJB:NSJE,NKB:NKE)
-XSV(:,:,1:NKMAX) = XVM(NSIB:NSIE,NSJB:NSJE,NKB:NKE)
-XSW(:,:,1:NKMAX) = XWM(NSIB:NSIE,NSJB:NSJE,NKB:NKE)
-XSTH(:,:,1:NKMAX) = XTHM(NSIB:NSIE,NSJB:NSJE,NKB:NKE)
-XSTKE(:,:,1:NKMAX) = XTKEM(NSIB:NSIE,NSJB:NSJE,NKB:NKE)
+XSU(:,:,1:NKMAX) = XUT(NSIB:NSIE,NSJB:NSJE,NKB:NKE)
+XSV(:,:,1:NKMAX) = XVT(NSIB:NSIE,NSJB:NSJE,NKB:NKE)
+XSW(:,:,1:NKMAX) = XWT(NSIB:NSIE,NSJB:NSJE,NKB:NKE)
+XSTH(:,:,1:NKMAX) = XTHT(NSIB:NSIE,NSJB:NSJE,NKB:NKE)
+XSTKE(:,:,1:NKMAX) = XTKET(NSIB:NSIE,NSJB:NSJE,NKB:NKE)
 XSLM(:,:,1:NKMAX) = XLM(NSIB:NSIE,NSJB:NSJE,NKB:NKE)
 XSDISSIP(:,:,1:NKMAX) = XDISSIP(NSIB:NSIE,NSJB:NSJE,NKB:NKE)
 XSINRT(:,:) = XINRT(NSIB:NSIE,NSJB:NSJE)
 XSWPTHP(:,:,1:NKMAX) = XWPTHP(NSIB:NSIE,NSJB:NSJE,NKB:NKE)
-XSRMV(:,:,1:NKMAX) = XRMVM(NSIB:NSIE,NSJB:NSJE,NKB:NKE)
-XSRMC(:,:,1:NKMAX) = XRMCM(NSIB:NSIE,NSJB:NSJE,NKB:NKE)
-XSRMR(:,:,1:NKMAX) = XRMRM(NSIB:NSIE,NSJB:NSJE,NKB:NKE)
+XSRMV(:,:,1:NKMAX) = XRMVT(NSIB:NSIE,NSJB:NSJE,NKB:NKE)
+XSRMC(:,:,1:NKMAX) = XRMCT(NSIB:NSIE,NSJB:NSJE,NKB:NKE)
+XSRMR(:,:,1:NKMAX) = XRMRT(NSIB:NSIE,NSJB:NSJE,NKB:NKE)
 XSSFU(:,:) = XSFU(NSIB:NSIE,NSJB:NSJE)
 XSSFV(:,:) = XSFV(NSIB:NSIE,NSJB:NSJE)
 !

src/MNH/mnh2lpdm_ini.f90

@@ -182,17 +182,17 @@ NKE = NKU-JPVEXT
 ALLOCATE( XZHAT(NKU) )
 ALLOCATE( XZS(NIU,NJU) )
 ALLOCATE( XZ0(NIU,NJU) )
-ALLOCATE( XUM(NIU,NJU,NKU))
-ALLOCATE( XVM(NIU,NJU,NKU))
-ALLOCATE( XWM(NIU,NJU,NKU))
-ALLOCATE( XTHM(NIU,NJU,NKU))
-ALLOCATE( XTKEM(NIU,NJU,NKU))
+ALLOCATE( XUT(NIU,NJU,NKU))
+ALLOCATE( XVT(NIU,NJU,NKU))
+ALLOCATE( XWT(NIU,NJU,NKU))
+ALLOCATE( XTHT(NIU,NJU,NKU))
+ALLOCATE( XTKET(NIU,NJU,NKU))
 ALLOCATE( XLM(NIU,NJU,NKU))
 ALLOCATE( XDISSIP(NIU,NJU,NKU))
 ALLOCATE( XWPTHP(NIU,NJU,NKU))
-ALLOCATE( XRMVM(NIU,NJU,NKU))
-ALLOCATE( XRMCM(NIU,NJU,NKU))
-ALLOCATE( XRMRM(NIU,NJU,NKU))
+ALLOCATE( XRMVT(NIU,NJU,NKU))
+ALLOCATE( XRMCT(NIU,NJU,NKU))
+ALLOCATE( XRMRT(NIU,NJU,NKU))
 ALLOCATE( XINRT(NIU,NJU))
 ALLOCATE( XSFU(NIU,NJU))
 ALLOCATE( XSFV(NIU,NJU))

src/MNH/modd_mnh2lpdm.f90

@@ -42,16 +42,16 @@ INTEGER, SAVE :: NIB,NIE,NJB,NJE,NKB,NKE ! Bornes du domaine physiques.
 !
 !*	Champs Meso-NH a extraire.
 !
-REAL, DIMENSION(:,:,:),ALLOCATABLE :: XUM,XVM,XWM  ! Vent.
-REAL, DIMENSION(:,:,:),ALLOCATABLE :: XTHM         ! Tempe potentielle.
-REAL, DIMENSION(:,:,:),ALLOCATABLE :: XTKEM  ! m2/s2
+REAL, DIMENSION(:,:,:),ALLOCATABLE :: XUT,XVT,XWT  ! Vent.
+REAL, DIMENSION(:,:,:),ALLOCATABLE :: XTHT         ! Tempe potentielle.
+REAL, DIMENSION(:,:,:),ALLOCATABLE :: XTKET  ! m2/s2
 REAL, DIMENSION(:,:),  ALLOCATABLE :: XINRT ! Taux de precipitation en mm/h
 REAL, DIMENSION(:,:,:),ALLOCATABLE :: XLM  ! m
 REAL, DIMENSION(:,:,:),ALLOCATABLE :: XDISSIP  ! J/Kg
-REAL, DIMENSION(:,:,:),ALLOCATABLE :: XRMVM ! Rapport de melange en vapeur d eau
-REAL, DIMENSION(:,:,:), ALLOCATABLE :: XRMCM ! Rapport de melange en eau liquide
+REAL, DIMENSION(:,:,:),ALLOCATABLE :: XRMVT ! Rapport de melange en vapeur d eau
+REAL, DIMENSION(:,:,:), ALLOCATABLE :: XRMCT ! Rapport de melange en eau liquide
                                             ! nuageuse
-REAL, DIMENSION(:,:,:),ALLOCATABLE :: XRMRM ! Rapport de melange en eau liquide
+REAL, DIMENSION(:,:,:),ALLOCATABLE :: XRMRT ! Rapport de melange en eau liquide
                                             ! pluie
 REAL, DIMENSION(:,:),ALLOCATABLE :: XSFU, XSFV ! flux cinematiques w'u' et w'v'
 REAL, DIMENSION(:,:,:),ALLOCATABLE :: XWPTHP ! flux de chaleur sensible