From 70a00f363df76a8c63362c9fae3cb6131e006303 Mon Sep 17 00:00:00 2001
From: Gaelle Tanguy <gaelle.tanguy@meteo.fr>
Date: Wed, 23 Apr 2014 08:39:03 +0000
Subject: [PATCH] Gaelle 23/4/2014 : remplacement instant M par instant T pour
masdev5.1
---
tools/diachro/src/EXTRACTDIA/extractdia.f90 | 38 ++++++++++-----------
tools/diachro/src/EXTRACTDIA/mesonh2obs.f90 | 30 ++++++++--------
tools/diachro/src/EXTRACTDIA/obs2mesonh.f90 | 10 +++---
3 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/tools/diachro/src/EXTRACTDIA/extractdia.f90 b/tools/diachro/src/EXTRACTDIA/extractdia.f90
index 0a9ab921d..feddfd6b5 100644
--- a/tools/diachro/src/EXTRACTDIA/extractdia.f90
+++ b/tools/diachro/src/EXTRACTDIA/extractdia.f90
@@ -436,14 +436,14 @@ YFLAGWRITE='NEW'
!* 2.4 lecture de la pression pour interpolation
! -----------------------------------------
IF (INDEX(YTYPEOUT(1:4),'p')/=0 .OR. INDEX(YTYPEOUT(1:4),'P')/=0 )THEN
- CALL READVAR('PABSM',YFILEIN,YFLAGREADVAR,ilocverbia,iret)
+ CALL READVAR('PABST',YFILEIN,YFLAGREADVAR,ilocverbia,iret)
IF ( iret /= 0 ) then
- print *, '- PABSM not found, name of the pressure variable ? '
+ print *, '- PABST not found, name of the pressure variable ? '
read *,YGROUP
CALL WRITEDIR(ILUDIR,YGROUP)
CALL READVAR(YGROUP,YFILEIN,YFLAGREADVAR,ilocverbia,iret)
IF ( iret /= 0 ) then
- print *,' interpolation at P=cst not possible because PABSM and ',TRIM(YGROUP),' are not available'
+ print *,' interpolation at P=cst not possible because PABST and ',TRIM(YGROUP),' are not available'
STOP
ENDIF
ENDIF
@@ -464,7 +464,7 @@ DO JGR=1,10000
ino_init_zoom=0
IF (IND_GRB==0) THEN
PRINT*,'- Name of the group in upper case (13 characters max.)'
- PRINT*,' (ex: THM or DD or FF or DD10 or FF10 or LAT or LON or VLEV)'
+ PRINT*,' (ex: THT or DD or FF or DD10 or FF10 or LAT or LON or VLEV)'
PRINT*,'(GROUP for the list of groups, END to stop)?'
READ(5,'(A13)',END=88) CGROUP
CALL WRITEDIR(ILUDIR,CGROUP)
@@ -475,9 +475,9 @@ DO JGR=1,10000
LVAR2D=.FALSE.
PRINT*,'- Name of the group in upper case (13 characters max.)'
PRINT*,' MesoNH field name, grib parameter indicator'
- PRINT*,' (ex: UM 131, VM 132, GROUP for the list of groups, END to stop)'
+ PRINT*,' (ex: UT 131, VT 132, GROUP for the list of groups, END to stop)'
PRINT*,' optional : you can add FOR 2D FIELDS ONLY the altitude (in meters)'
- PRINT*,' of the field after the grib parameter indicator exple : UM10 131 10'
+ PRINT*,' of the field after the grib parameter indicator exple : UT10 131 10'
READ(5,'(A)') YINPLINE
YINPLINE= TRIM(ADJUSTL(YINPLINE))
IF (LEN_TRIM(YINPLINE) == 0) CYCLE ! skip blank line
@@ -532,12 +532,12 @@ DO JGR=1,10000
!
! 3.1.1 Cas particulier pour le vent
!
- IF ( CGROUP(1:2) == 'UM' .OR. &
- CGROUP(1:2) == 'VM' .OR. &
+ IF ( CGROUP(1:2) == 'UT' .OR. &
+ CGROUP(1:2) == 'VT' .OR. &
CGROUP(1:2) == 'DD' .OR. &
CGROUP(1:2) == 'FF' ) THEN
!
- IF ( (CGROUP(1:2)=='UM'.OR.CGROUP(1:2)=='VM') .AND. &
+ IF ( (CGROUP(1:2)=='UT'.OR.CGROUP(1:2)=='VT') .AND. &
YOUTGRID(1:4) /= 'LALO' ) THEN
! Lecture du champ U ou V sans calcul
! les composantes du vent restent dans le plan conforme
@@ -546,16 +546,16 @@ DO JGR=1,10000
! Lecture des 2 composantes du vent : commence par UM...
!(stockees dans les tableaux ZWORK3D et ZWORK3D2)
! max 13 car.
- YGROUP='UM'//CGROUP(3:13)
+ YGROUP='UT'//CGROUP(3:13)
CALL READVAR(YGROUP,YFILEIN,YFLAGREADVAR,ilocverbia,iret)
IF ( iret /= 0 ) then
print *,TRIM(CGROUP),': ',TRIM(YGROUP),' not available'
- ! echec , on tente UT....
- YGROUP='UT'//CGROUP(3:13)
+ ! echec , on tente UM....
+ YGROUP='UM'//CGROUP(3:13)
CALL READVAR(YGROUP,YFILEIN,YFLAGREADVAR,ilocverbia,iret2)
IF ( iret2 /= 0 ) then
print *,'** no processing for ',TRIM(CGROUP), &
- ' because UM and ',TRIM(YGROUP),' are not available'
+ ' because UT and ',TRIM(YGROUP),' are not available'
CYCLE
ENDIF
ENDIF
@@ -564,17 +564,17 @@ DO JGR=1,10000
size(XVAR,4),size(XVAR,5),size(XVAR,6)) )
ZVARSAVE=XVAR
!
- ! deuxieme composante VM....
- YGROUP='VM'//CGROUP(3:13)
+ ! deuxieme composante VT....
+ YGROUP='VT'//CGROUP(3:13)
CALL READVAR(YGROUP,YFILEIN,YFLAGREADVAR,ilocverbia,iret)
IF ( iret /= 0 ) then
print *,TRIM(CGROUP),': ',TRIM(YGROUP),' not available'
- ! echec , on tente VT....
- YGROUP='VT'//CGROUP(3:13)
+ ! echec , on tente VM....
+ YGROUP='VM'//CGROUP(3:13)
CALL READVAR(YGROUP,YFILEIN,YFLAGREADVAR,ilocverbia,iret2)
IF ( iret2 /= 0 ) then
print *,'** no processing for ',TRIM(CGROUP), &
- ' because VM and ',TRIM(YGROUP),' are not available'
+ ' because VT and ',TRIM(YGROUP),' are not available'
CYCLE
ENDIF
iret=iret2
@@ -648,7 +648,7 @@ DO JGR=1,10000
print *,'** processing of ',TRIM(CGROUP),' is not performed for CTYPE= ',CTYPE
CYCLE
ENDIF
- ELSE IF (CGROUP(1:2) == 'UM' .OR. CGROUP(1:2) == 'VM') THEN
+ ELSE IF (CGROUP(1:2) == 'UT' .OR. CGROUP(1:2) == 'VT') THEN
IF (CTYPE=='CART' .OR. CTYPE=='MASK' .OR. CTYPE=='SPXY') THEN
! Calcul des composantes zonale et meridienne
!(YOUTGRID(1:4) == 'LALO') avec la routine UV_TO_ZONAL_AND_MERID
diff --git a/tools/diachro/src/EXTRACTDIA/mesonh2obs.f90 b/tools/diachro/src/EXTRACTDIA/mesonh2obs.f90
index 84ae40592..3ce63ccb3 100644
--- a/tools/diachro/src/EXTRACTDIA/mesonh2obs.f90
+++ b/tools/diachro/src/EXTRACTDIA/mesonh2obs.f90
@@ -252,14 +252,14 @@ DO JLOOPFILE=1,100000
YFLAGWRITE='NEW1H'
!
IF (YTYPEOUT(1:4)=='LLPV' .OR. YTYPEOUT(1:4)=='llpv') THEN
- CALL READVAR('PABSM',YFILEIN,YFLAGREADVAR,ilocverbia,iret)
+ CALL READVAR('PABST',YFILEIN,YFLAGREADVAR,ilocverbia,iret)
IF ( iret /= 0 ) then
- print *, '- PABSM not found, name of the pressure variable ?'
+ print *, '- PABST not found, name of the pressure variable ?'
read *,YGROUP
CALL WRITEDIR(ILUDIR,YGROUP)
CALL READVAR(YGROUP,YFILEIN,YFLAGREADVAR,ilocverbia,iret)
IF ( iret /= 0 ) then
- print *,' interpolation at P=cst not possible because PABSM and ',TRIM(YGROUP), ' are not available'
+ print *,' interpolation at P=cst not possible because PABST and ',TRIM(YGROUP), ' are not available'
STOP
ENDIF
ENDIF
@@ -280,7 +280,7 @@ DO JLOOPFILE=1,100000
DO JGR=1,10000
!
PRINT*, '- Name of the group in upper case (13 characters max.)'
- PRINT*, ' (ex: THM ou DD ou FF ou DD10 ou FF10 )'
+ PRINT*, ' (ex: THT ou DD ou FF ou DD10 ou FF10 )'
PRINT*, '(GROUP for the list of groups, END to stop)?'
READ(5,'(A13)',END=88) CGROUP
CALL WRITEDIR(ILUDIR,CGROUP)
@@ -300,9 +300,9 @@ DO JLOOPFILE=1,100000
!
! Lecture du champ UM et VM apres traitement de UM (voir en 3.2)
IF (LEN(TRIM(CGROUP)) ==2) THEN
- YGROUP='UM'
+ YGROUP='UT'
ELSE IF (LEN(TRIM(CGROUP)) ==4) THEN
- YGROUP='UM'//CGROUP(3:4)
+ YGROUP='UT'//CGROUP(3:4)
ELSE
print*,'** problem with the name of group: ',CGROUP
CYCLE
@@ -311,14 +311,14 @@ DO JLOOPFILE=1,100000
IF ( iret /= 0 ) then
print *,TRIM(CGROUP),': ',TRIM(YGROUP),' not available'
IF (LEN(TRIM(CGROUP)) ==2) THEN
- YGROUP='UT'
+ YGROUP='UM'
ELSE IF (LEN(TRIM(CGROUP)) ==4) THEN
- YGROUP='UT'//CGROUP(3:4)
+ YGROUP='UM'//CGROUP(3:4)
ENDIF
CALL READVAR(YGROUP,YFILEIN,YFLAGREADVAR,ilocverbia,iret2)
IF ( iret2 /= 0 ) then
print *,'** no processing for ',TRIM(CGROUP), &
- ' because UM and ',TRIM(YGROUP),' not available'
+ ' because UT and ',TRIM(YGROUP),' not available'
CYCLE
ENDIF
iret=iret2
@@ -331,27 +331,27 @@ DO JLOOPFILE=1,100000
ALLOCATE(zwork3d(size(XVAR,1),size(XVAR,2),size(XVAR,3)))
zwork3d(:,:,:)=XVAR(:,:,:,1,1,1)
IF (LEN(TRIM(CGROUP)) ==2) THEN
- YGROUP='VM'
+ YGROUP='VT'
ELSE IF (LEN(TRIM(CGROUP)) ==4) THEN
- YGROUP='VM'//CGROUP(3:4)
+ YGROUP='VT'//CGROUP(3:4)
ENDIF
CALL READVAR(YGROUP,YFILEIN,YFLAGREADVAR,ilocverbia,iret)
if ( iret /= 0 ) then
print *,TRIM(CGROUP),': ',TRIM(YGROUP),' not available'
IF (LEN(TRIM(CGROUP)) ==2) THEN
- YGROUP='VT'
+ YGROUP='VM'
ELSE IF (LEN(TRIM(CGROUP)) ==4) THEN
- YGROUP='VT'//CGROUP(3:4)
+ YGROUP='VM'//CGROUP(3:4)
ENDIF
CALL READVAR(YGROUP,YFILEIN,YFLAGREADVAR,ilocverbia,iret2)
IF ( iret2 /= 0 ) then
print *,'** traitement of ',TRIM(CGROUP), &
- ' not possible because VM and ',TRIM(YGROUP), &
+ ' not possible because VT and ',TRIM(YGROUP), &
' are not available'
CYCLE
ENDIF
iret=iret2
- CYCLE
+! CYCLE
endif
! Allocation des tableaux de calcul
ALLOCATE(zffvent(size(XVAR,1),size(XVAR,2),size(XVAR,3)))
diff --git a/tools/diachro/src/EXTRACTDIA/obs2mesonh.f90 b/tools/diachro/src/EXTRACTDIA/obs2mesonh.f90
index 9cae76a70..bf57f2615 100644
--- a/tools/diachro/src/EXTRACTDIA/obs2mesonh.f90
+++ b/tools/diachro/src/EXTRACTDIA/obs2mesonh.f90
@@ -296,12 +296,12 @@ DO JOBS=1,10000
!* 3.1 Lecture du fichier d obs a traiter
! ----------------------
PRINT*, '- Name of the new field to be created:'
- PRINT*, '(if the first letter is:'
- PRINT*, ' W: the field is localised at vertical flux points, ',&
- 'otherwise at mass points '
- PRINT*, ' U: the field (U-component for zonal) will be converted to ',&
+ PRINT*, '(if it is a wind field you have to name the field : '
+ PRINT*, ' WTxx: the field is localised at vertical flux points, ',&
+ 'otherwise at mass points (example : WT10) '
+ PRINT*, ' UTxx: the field (U-component for zonal) will be converted to ',&
'MesoNH wind components'
- PRINT*, ' the V-component must be provided immediately after'
+ PRINT*, 'the V-component must be provided immediately after with VTxx'
PRINT*, '?'
READ(5,'(A9)',END=88) CGROUP
CGROUP=ADJUSTL(CGROUP)
--
GitLab