From a2e5ab9bc0a5295e69e8e407adfebc1eb3d676e0 Mon Sep 17 00:00:00 2001 From: Jean-Pierre Chaboureau <jean-pierre.chaboureau@aero.obs-mip.fr> Date: Mon, 27 Nov 2017 17:02:46 +0100 Subject: [PATCH] Jean-Pierre 27/11/2017: small corrections for 2D ideal set-up --- src/MNH/ini_seriesn.f90 | 3 ++- src/MNH/set_frc.f90 | 8 +++++++- src/MNH/write_lfin.f90 | 17 +++++++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/MNH/ini_seriesn.f90 b/src/MNH/ini_seriesn.f90 index e28bca423..99f8d66b9 100644 --- a/src/MNH/ini_seriesn.f90 +++ b/src/MNH/ini_seriesn.f90 @@ -43,6 +43,7 @@ !! Original 4/03/2002 !! Oct. 2011 : (P.Le Moigne) Surface series !! June 2016: P. Wautelet: corrected writes +!! Nov. 2017: J.-P. Chaboureau: fix a bug in dimension check !! !------------------------------------------------------------------------------- ! @@ -121,7 +122,7 @@ IF ( ( NFREQSERIES*XTSTEP < XSEGLEN ) .AND. & ( NJBOXL < IJB_ll ) .OR. & ( NJBOXL > NJBOXH ) .OR. & ( NJBOXH > IJE_ll ) .OR. & - ( NBJSLICE >= IJE_ll ) .OR. & + ( NBJSLICE > IJE_ll ) .OR. & ( NBJSLICE > SIZE(NJSLICEL(:),1) ) .OR. & ( NJSLICEL(1) < IJB_ll ) .OR. & ( NJSLICEL(1) > IJE_ll ) .OR. & diff --git a/src/MNH/set_frc.f90 b/src/MNH/set_frc.f90 index c219771b1..5ef77c3ca 100644 --- a/src/MNH/set_frc.f90 +++ b/src/MNH/set_frc.f90 @@ -95,6 +95,7 @@ END MODULE MODI_SET_FRC !! 06/12 (Masson) Removes extrapolations below or above forcing !! data. Reproduces the same data instead. !! 09/2017 Q.Rodier add LTEND_UV_FRC +!! 27/11/17 (Chaboureau) fix bug in allocation relative to LTEND_UV_FRC !! !------------------------------------------------------------------------------- ! @@ -295,6 +296,8 @@ DO JKT = 1,NFRC DEALLOCATE(ZRVF) DEALLOCATE(ZGXRF) DEALLOCATE(ZGYRF) + DEALLOCATE(ZTUF) + DEALLOCATE(ZTVF) END IF ALLOCATE(ZPRESSUF(ILEVELF)) ALLOCATE(ZTHVUF(ILEVELF)) @@ -306,11 +309,14 @@ DO JKT = 1,NFRC ALLOCATE(ZRVF(ILEVELF)) ALLOCATE(ZGXRF(ILEVELF)) ALLOCATE(ZGYRF(ILEVELF)) + ALLOCATE(ZTUF(ILEVELF)) + ALLOCATE(ZTVF(ILEVELF)) ! DO JKU =1,ILEVELF READ(ILUPRE,*) ZPRESSUF(JKU) & ,ZUF(JKU),ZVF(JKU),ZTHF(JKU),ZRVF(JKU) & - ,ZWF(JKU),ZGXRF(JKU),ZGYRF(JKU) + ,ZWF(JKU),ZGXRF(JKU),ZGYRF(JKU),ZTUF(JKU)& + ,ZTVF(JKU) END DO ! ! read sounding diff --git a/src/MNH/write_lfin.f90 b/src/MNH/write_lfin.f90 index fcb96a4c4..d4c07e5cd 100644 --- a/src/MNH/write_lfin.f90 +++ b/src/MNH/write_lfin.f90 @@ -164,6 +164,7 @@ END MODULE MODI_WRITE_LFIFM_n !! J.escobar 04/08/2015 suit Pb with writ_lfin JSA increment , modif in ini_nsv to have good order initialization !! Modification 01/2016 (JP Pinty) Add LIMA !! M.Mazoyer 04/16 : Add supersaturation fields +!! JP Chaboureau 27/11/2017 add wind tendency forcing !! !------------------------------------------------------------------------------- ! @@ -2380,6 +2381,22 @@ IF (LFORCING) THEN CALL FMWRIT(HFMFILE,YRECFM,CLUOUT,YDIR,XTENDRVFRC(:,JT),IGRID,ILENCH, & YCOMMENT,IRESP) ! +! + YRECFM='TENDUFRC'//YFRC + YCOMMENT=' ' + IGRID=1 + ILENCH=LEN(YCOMMENT) + CALL FMWRIT(HFMFILE,YRECFM,CLUOUT,YDIR,XTENDUFRC(:,JT),IGRID,ILENCH, & + YCOMMENT,IRESP) +! +! + YRECFM='TENDVFRC'//YFRC + YCOMMENT=' ' + IGRID=1 + ILENCH=LEN(YCOMMENT) + CALL FMWRIT(HFMFILE,YRECFM,CLUOUT,YDIR,XTENDVFRC(:,JT),IGRID,ILENCH, & + YCOMMENT,IRESP) +! ! YRECFM='GXTHFRC'//YFRC YCOMMENT=' ' -- GitLab