diff --git a/src/MNH/mode_les_diachro.f90 b/src/MNH/mode_les_diachro.f90 index 89496d62baa3f4ba68fa92c3e41cba9c5138f525..1aeec63c152b37e0cd52545de59ca5bbbccd8b5a 100644 --- a/src/MNH/mode_les_diachro.f90 +++ b/src/MNH/mode_les_diachro.f90 @@ -947,7 +947,7 @@ if ( Present( hsuffixes ) ) then 'at the same time (' // Trim( tpfield%cmnhname ) // ')' ) if ( Size( hsuffixes ) /= Size( pfield, 3) ) & call Print_msg( NVERB_FATAL, 'IO', 'Les_diachro_common', 'wrong size for hsuffixes (' // Trim( tpfield%cmnhname ) // ')' ) - ycomment(:) = Trim( tpfield%ccomment(:) ) // hsuffixes(:) + ycomment(:) = Trim( tpfield%ccomment(:) ) // ' ' // hsuffixes(:) else if ( Present( hmasks ) ) then if ( Size( hmasks ) /= Size( pfield, 3) ) & call Print_msg( NVERB_FATAL, 'IO', 'Les_diachro_common', 'wrong size for hmasks (' // Trim( tpfield%cmnhname ) // ')' ) @@ -1018,7 +1018,7 @@ iresp = 0 if ( oavg ) call Les_time_avg_4d( zfield, tzdates, iresp ) if ( Present( hsuffixes ) ) then - ytitle(:) = Trim( tpfield%cmnhname ) // hsuffixes(:) + ytitle(:) = Trim( tpfield%cmnhname ) // '_' // hsuffixes(:) else ytitle(:) = tpfield%cmnhname endif diff --git a/src/MNH/write_les_budgetn.f90 b/src/MNH/write_les_budgetn.f90 index 2897bd97fd59ffa8d20b7258b9b8cec276b6b58f..133166f3f861e434176d94ee9be1545991a2c43f 100644 --- a/src/MNH/write_les_budgetn.f90 +++ b/src/MNH/write_les_budgetn.f90 @@ -129,7 +129,7 @@ gdonorm = Trim( cles_norm_type ) /= 'NONE' !* 1. total (resolved+subgrid) kinetic energy budget ! ------------------------------------ ! -YGROUP= 'BU_KE ' +YGROUP= 'BU_KE' ILES=0 ILES_STA=ILES ! @@ -137,7 +137,7 @@ ILES_STA=ILES ! -------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG TEND' +YSUBTITLE(ILES) = 'SBG_TEND' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_SBG_TKE(:,:,NLES_TEND) ! @@ -146,7 +146,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_SBG_TKE(:,:,NLES_TEND) ! --------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG DP M' +YSUBTITLE(ILES) = 'SBG_DP_M' ! ZLES_BUDGET(:,:,ILES)= - XLES_SUBGRID_WU (:,:,1) * XLES_MEAN_DUDZ(:,:,1) & - XLES_SUBGRID_WV (:,:,1) * XLES_MEAN_DVDZ(:,:,1) & @@ -156,7 +156,7 @@ ZLES_BUDGET(:,:,ILES)= - XLES_SUBGRID_WU (:,:,1) * XLES_MEAN_DUDZ(:,:,1) & ! ------------------------------------------------ ! ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG DP R' +YSUBTITLE(ILES) = 'SBG_DP_R' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_SBG_TKE(:,:,NLES_DP) - ZLES_BUDGET(:,:,2) ! @@ -167,7 +167,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_SBG_TKE(:,:,NLES_DP) - ZLES_BUDGET(:,:,2) ! IF ( ANY(XLES_BU_SBG_TKE(:,:,NLES_ADVM)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG ADVM' +YSUBTITLE(ILES) = 'SBG_ADVM' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_SBG_TKE(:,:,NLES_ADVM) END IF @@ -178,7 +178,7 @@ END IF ! IF ( ANY(XLES_BU_SBG_TKE(:,:,NLES_FORC)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG FORC' +YSUBTITLE(ILES) = 'SBG_FORC' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_SBG_TKE(:,:,NLES_FORC) END IF @@ -188,7 +188,7 @@ END IF ! ------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG TR ' +YSUBTITLE(ILES) = 'SBG_TR' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_SBG_TKE(:,:,NLES_TR) ! @@ -197,7 +197,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_SBG_TKE(:,:,NLES_TR) ! ----------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG ADVR' +YSUBTITLE(ILES) = 'SBG_ADVR' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_SBG_TKE(:,:,NLES_ADVR) ! @@ -207,7 +207,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_SBG_TKE(:,:,NLES_ADVR) ! IF ( ANY(XLES_BU_SBG_TKE(:,:,NLES_PRES)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG PRES' +YSUBTITLE(ILES) = 'SBG_PRES' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_SBG_TKE(:,:,NLES_PRES) END IF @@ -217,7 +217,7 @@ END IF ! ------------------ ! ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG TP' +YSUBTITLE(ILES) = 'SBG_TP' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_SBG_TKE(:,:,NLES_TP) ! @@ -226,7 +226,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_SBG_TKE(:,:,NLES_TP) ! ----------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' DISS' +YSUBTITLE(ILES) = 'DISS' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_SBG_TKE(:,:,NLES_DISS) ! @@ -236,7 +236,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_SBG_TKE(:,:,NLES_DISS) ! IF ( ANY(XLES_BU_SBG_TKE(:,:,NLES_DIFF)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG NUMD' +YSUBTITLE(ILES) = 'SBG_NUMD' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_SBG_TKE(:,:,NLES_DIFF) END IF @@ -246,7 +246,7 @@ END IF ! IF ( ANY(XLES_BU_SBG_TKE(:,:,NLES_RELA)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG RELA' +YSUBTITLE(ILES) = 'SBG_RELA' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_SBG_TKE(:,:,NLES_RELA) END IF @@ -256,7 +256,7 @@ END IF ! IF ( ANY(XLES_BU_SBG_TKE(:,:,NLES_NEST)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG NEST' +YSUBTITLE(ILES) = 'SBG_NEST' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_SBG_TKE(:,:,NLES_NEST) END IF @@ -267,7 +267,7 @@ END IF ! IF ( ANY(XLES_BU_SBG_TKE(:,:,NLES_MISC)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG MISC' +YSUBTITLE(ILES) = 'SBG_MISC' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_SBG_TKE(:,:,NLES_MISC) END IF @@ -277,7 +277,7 @@ END IF ! -------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG RESI' +YSUBTITLE(ILES) = 'SBG_RESI' ! ZLES_BUDGET(:,:,ILES) = 0. DO JLES=ILES_STA+1,ILES-1 @@ -290,7 +290,7 @@ ILES_STA=ILES ! -------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES TEND' +YSUBTITLE(ILES) = 'RES_TEND' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_KE(:,:,NLES_TEND) ! @@ -300,7 +300,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_KE(:,:,NLES_TEND) ! IF ( ANY(XLES_BU_RES_KE(:,:,NLES_ADVM)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES ADV ' +YSUBTITLE(ILES) = 'RES_ADV' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_Ke(:,:,NLES_ADVM) END IF @@ -311,7 +311,7 @@ END IF ! IF ( ANY(XLES_BU_RES_KE(:,:,NLES_FORC)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES FORC' +YSUBTITLE(ILES) = 'RES_FORC' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_Ke(:,:,NLES_FORC) END IF @@ -321,7 +321,7 @@ END IF ! -------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES DP ' +YSUBTITLE(ILES) = 'RES_DP' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_Ke(:,:,NLES_DP) ! @@ -330,7 +330,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_Ke(:,:,NLES_DP) ! ------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES TR ' +YSUBTITLE(ILES) = 'RES_TR' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_KE(:,:,NLES_TR) ! @@ -340,7 +340,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_KE(:,:,NLES_TR) ! ------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES PRES' +YSUBTITLE(ILES) = 'RES_PRES' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_KE(:,:,NLES_PRES) ! @@ -349,7 +349,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_KE(:,:,NLES_PRES) ! ------------------ ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES TP ' +YSUBTITLE(ILES) = 'RES_TP' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_KE(:,:,NLES_GRAV) ! @@ -358,7 +358,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_KE(:,:,NLES_GRAV) ! ---------------------------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES SBGT' +YSUBTITLE(ILES) = 'RES_SBGT' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_KE(:,:,NLES_VTURB) + XLES_BU_RES_KE(:,:,NLES_HTURB) ! @@ -367,7 +367,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_KE(:,:,NLES_VTURB) + XLES_BU_RES_KE(:,:,NLES ! IF ( ANY(XLES_BU_RES_KE(:,:,NLES_COR)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES CORI' +YSUBTITLE(ILES) = 'RES_CORI' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_KE(:,:,NLES_COR) END IF @@ -377,7 +377,7 @@ END IF ! IF ( ANY(XLES_BU_RES_KE(:,:,NLES_DIFF)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES NUMD' +YSUBTITLE(ILES) = 'RES_NUMD' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_KE(:,:,NLES_DIFF) END IF @@ -387,7 +387,7 @@ END IF ! IF ( ANY(XLES_BU_RES_KE(:,:,NLES_RELA)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES RELA' +YSUBTITLE(ILES) = 'RES_RELA' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_KE(:,:,NLES_RELA) END IF @@ -397,7 +397,7 @@ END IF ! IF ( ANY(XLES_BU_RES_KE(:,:,NLES_NEST)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES NEST' +YSUBTITLE(ILES) = 'RES_NEST' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_KE(:,:,NLES_NEST) END IF @@ -409,7 +409,7 @@ END IF IF ( ANY( XLES_BU_RES_KE(:,:,NLES_MISC) & +XLES_BU_RES_KE(:,:,NLES_CURV) /= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES MISC' +YSUBTITLE(ILES) = 'RES_MISC' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_KE(:,:,NLES_MISC) & + XLES_BU_RES_KE(:,:,NLES_CURV) @@ -419,7 +419,7 @@ END IF ! ------------------------------ ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES RESI' +YSUBTITLE(ILES) = 'RES_RESI' ! ZLES_BUDGET(:,:,ILES) = 0. DO JLES=ILES_STA+1,ILES-1 @@ -444,7 +444,7 @@ call Les_diachro( tpdiafile, tzfield, gdoavg, gdonorm, zles_budget(:, :, :iles), !* 2. temperature variance budget ! --------------------------- ! -YGROUP= 'BU_THL2 ' +YGROUP= 'BU_THL2' ILES=0 ! ILES_STA=ILES @@ -453,7 +453,7 @@ ILES_STA=ILES ! ---------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG DP M' +YSUBTITLE(ILES) = 'SBG_DP_M' ILES_P1=ILES ! ZLES_BUDGET(:,:,ILES)= - 2. * XLES_SUBGRID_WThl(:,:,1) * XLES_MEAN_dThldz(:,:,1) @@ -464,7 +464,7 @@ ZLES_BUDGET(:,:,ILES)= - 2. * XLES_SUBGRID_WThl(:,:,1) * XLES_MEAN_dThldz(:,:,1) ! IF ( ANY(XLES_SUBGRID_WThl2(:,:,1)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG TR ' +YSUBTITLE(ILES) = 'SBG_TR' ! DO JK=2,NLES_K-1 ZLES_BUDGET(JK,:,ILES) = - ( XLES_SUBGRID_WThl2 (JK+1,:,1) & @@ -481,7 +481,7 @@ END IF ! -------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG DP R' +YSUBTITLE(ILES) = 'SBG_DP_R' ILES_P2=ILES ! ZLES_BUDGET(:,:,ILES)= - 2. * XLES_RES_ddxa_Thl_SBG_UaThl(:,:,1) & @@ -492,7 +492,7 @@ ZLES_BUDGET(:,:,ILES)= - 2. * XLES_RES_ddxa_Thl_SBG_UaThl(:,:,1) & ! ----------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' DISS ' +YSUBTITLE(ILES) = 'DISS' ! ZLES_BUDGET(:,:,ILES) = XLES_SUBGRID_DISS_Thl2(:,:,1) ! @@ -501,7 +501,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_SUBGRID_DISS_Thl2(:,:,1) ! -------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG RESI' +YSUBTITLE(ILES) = 'SBG_RESI' ! ZLES_BUDGET(:,:,ILES) = 0. DO JLES=ILES_STA+1,ILES-1 @@ -514,7 +514,7 @@ ILES_STA=ILES ! -------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES TEND' +YSUBTITLE(ILES) = 'RES_TEND' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_Thl2(:,:,NLES_TEND) ! @@ -524,7 +524,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_Thl2(:,:,NLES_TEND) ! IF ( ANY(XLES_BU_RES_Thl2(:,:,NLES_ADVM)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES ADV ' +YSUBTITLE(ILES) = 'RES_ADV' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_Thl2(:,:,NLES_ADVM) END IF @@ -535,7 +535,7 @@ END IF ! IF ( ANY(XLES_BU_RES_Thl2(:,:,NLES_FORC)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES FORC' +YSUBTITLE(ILES) = 'RES_FORC' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_Thl2(:,:,NLES_FORC) END IF @@ -545,7 +545,7 @@ END IF ! ---------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES DP ' +YSUBTITLE(ILES) = 'RES_DP' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_Thl2(:,:,NLES_DP) @@ -554,7 +554,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_Thl2(:,:,NLES_DP) ! ------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES TR ' +YSUBTITLE(ILES) = 'RES_TR' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_Thl2(:,:,NLES_TR) ! @@ -563,7 +563,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_Thl2(:,:,NLES_TR) ! ---------------------------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES SBGT' +YSUBTITLE(ILES) = 'RES_SBGT' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_Thl2(:,:,NLES_VTURB) + XLES_BU_RES_Thl2(:,:,NLES_HTURB) ! @@ -572,7 +572,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_Thl2(:,:,NLES_VTURB) + XLES_BU_RES_Thl2(:,:, ! IF ( ANY(XLES_BU_RES_Thl2(:,:,NLES_DIFF)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES NUMD' +YSUBTITLE(ILES) = 'RES_NUMD' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_Thl2(:,:,NLES_DIFF) END IF @@ -582,7 +582,7 @@ END IF ! IF ( ANY(XLES_BU_RES_Thl2(:,:,NLES_RELA)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES RELA' +YSUBTITLE(ILES) = 'RES_RELA' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_Thl2(:,:,NLES_RELA) END IF @@ -592,7 +592,7 @@ END IF ! IF ( ANY(XLES_BU_RES_Thl2(:,:,NLES_NEST)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES NEST' +YSUBTITLE(ILES) = 'RES_NEST' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_Thl2(:,:,NLES_NEST) END IF @@ -605,7 +605,7 @@ IF ( ANY( XLES_BU_RES_Thl2(:,:,NLES_MISC) & +XLES_BU_RES_Thl2(:,:,NLES_MICR) & + XLES_BU_RES_Thl2(:,:,NLES_PREF) /= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES MISC' +YSUBTITLE(ILES) = 'RES_MISC' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_Thl2(:,:,NLES_MISC) & + XLES_BU_RES_Thl2(:,:,NLES_RAD ) & @@ -618,7 +618,7 @@ END IF ! --------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES RESI' +YSUBTITLE(ILES) = 'RES_RESI' ! ZLES_BUDGET(:,:,ILES) = 0. DO JLES=ILES_STA+1,ILES-1 @@ -629,7 +629,7 @@ END DO ! ------------------------ ! ILES=ILES+1 -YSUBTITLE(ILES) = ' NSG TEND' +YSUBTITLE(ILES) = 'NSG_TEND' ! ZLES_BUDGET(:,:,ILES) = 0. IF (NLES_TIMES>2) THEN @@ -648,7 +648,7 @@ END IF ! ---------------------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' NSG ADVM' +YSUBTITLE(ILES) = 'NSG_ADVM' ! DO JK=2,NLES_K-1 ZLES_BUDGET(JK,:,ILES)= -XLES_MEAN_W(JK,:,1) & @@ -665,7 +665,7 @@ ZLES_BUDGET(NLES_K,:,ILES) = ZLES_BUDGET(NLES_K-1,:,ILES) ! ---------------------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' NSG ADVR' +YSUBTITLE(ILES) = 'NSG_ADVR' ! DO JK=2,NLES_K-1 ZLES_BUDGET(JK,:,ILES)= - ( XLES_RES_W_SBG_Thl2 (JK+1,:,1) & @@ -695,7 +695,7 @@ call Les_diachro( tpdiafile, tzfield, gdoavg, gdonorm, zles_budget(:, :, :iles), !* 3. temperature flux budget ! --------------------- ! -YGROUP= 'BU_WTHL ' +YGROUP= 'BU_WTHL' ILES=0 ! ILES_STA=ILES @@ -704,7 +704,7 @@ ILES_STA=ILES ! ----------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG DP M' +YSUBTITLE(ILES) = 'SBG_DP_M' ILES_P1=ILES ! ZLES_BUDGET(:,:,ILES) = - XLES_SUBGRID_W2(:,:,1) * XLES_MEAN_dThldz(:,:,1) @@ -714,7 +714,7 @@ ZLES_BUDGET(:,:,ILES) = - XLES_SUBGRID_W2(:,:,1) * XLES_MEAN_dThldz(:,:,1) ! ------------------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG DP R' +YSUBTITLE(ILES) = 'SBG_DP_R' ! ZLES_BUDGET(:,:,ILES)=- XLES_RES_ddz_Thl_SBG_W2(:,:,1) & - ZLES_BUDGET(:,:,ILES_P1) @@ -725,7 +725,7 @@ ZLES_BUDGET(:,:,ILES)=- XLES_RES_ddz_Thl_SBG_W2(:,:,1) & ! IF ( ANY(XLES_SUBGRID_W2Thl(:,:,1)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG TR ' +YSUBTITLE(ILES) = 'SBG_TR' ! DO JK=2,NLES_K-1 ZLES_BUDGET(JK,:,ILES) = - ( XLES_SUBGRID_W2Thl (JK+1,:,1) & @@ -744,7 +744,7 @@ END IF ! IF ( ANY(XLES_SUBGRID_ThlPz(:,:,1)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG PRES' +YSUBTITLE(ILES) = 'SBG_PRES' ! ZLES_BUDGET(:,:,ILES) = XLES_SUBGRID_ThlPz(:,:,1) END IF @@ -754,7 +754,7 @@ END IF ! ------------------ ! ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG TP ' +YSUBTITLE(ILES) = 'SBG_TP' ! IF (LUSERV) THEN ZLES_BUDGET(:,:,ILEs) = XG * XLES_SUBGRID_ThlThv(:,:,1) & @@ -768,7 +768,7 @@ END IF ! -------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG RESI' +YSUBTITLE(ILES) = 'SBG_RESI' ! ZLES_BUDGET(:,:,ILES) = 0. DO JLES=ILES_STA+1,ILES-1 @@ -781,7 +781,7 @@ ILES_STA=ILES ! -------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES TEND' +YSUBTITLE(ILES) = 'RES_TEND' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WThl(:,:,NLES_TEND) ! @@ -790,7 +790,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WThl(:,:,NLES_TEND) ! IF ( ANY(XLES_BU_RES_WThl(:,:,NLES_ADVM)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES ADV ' +YSUBTITLE(ILES) = 'RES_ADV' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WThl(:,:,NLES_ADVM) END IF @@ -800,7 +800,7 @@ END IF ! IF ( ANY(XLES_BU_RES_WThl(:,:,NLES_FORC)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES FORC' +YSUBTITLE(ILES) = 'RES_FORC' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WThl(:,:,NLES_FORC) END IF @@ -810,7 +810,7 @@ END IF ! ---------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES DP ' +YSUBTITLE(ILES) = 'RES_DP' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WThl(:,:,NLES_DP) ! @@ -818,7 +818,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WThl(:,:,NLES_DP) ! ------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES TR ' +YSUBTITLE(ILES) = 'RES_TR' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WThl(:,:,NLES_TR) ! @@ -827,7 +827,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WThl(:,:,NLES_TR) ! ------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES PRES' +YSUBTITLE(ILES) = 'RES_PRES' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WThl(:,:,NLES_PRES) ! @@ -836,7 +836,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WThl(:,:,NLES_PRES) ! ------------------ ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES TP ' +YSUBTITLE(ILES) = 'RES_TP' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WThl(:,:,NLES_GRAV) ! @@ -845,7 +845,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WThl(:,:,NLES_GRAV) ! ---------------------------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES SBGT' +YSUBTITLE(ILES) = 'RES_SBGT' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WThl(:,:,NLES_VTURB) + XLES_BU_RES_WThl(:,:,NLES_HTURB) ! @@ -854,7 +854,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WThl(:,:,NLES_VTURB) + XLES_BU_RES_WThl(:,:, ! IF ( ANY(XLES_BU_RES_WThl(:,:,NLES_COR)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES CORI' +YSUBTITLE(ILES) = 'RES_CORI' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WThl(:,:,NLES_COR) END IF @@ -864,7 +864,7 @@ END IF ! IF ( ANY(XLES_BU_RES_WThl(:,:,NLES_DIFF)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES NUMD' +YSUBTITLE(ILES) = 'RES_NUMD' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WThl(:,:,NLES_DIFF) END IF @@ -874,7 +874,7 @@ END IF ! IF ( ANY(XLES_BU_RES_WThl(:,:,NLES_RELA)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES RELA' +YSUBTITLE(ILES) = 'RES_RELA' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WThl(:,:,NLES_RELA) END IF @@ -884,7 +884,7 @@ END IF ! IF ( ANY(XLES_BU_RES_WThl(:,:,NLES_NEST)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES NEST' +YSUBTITLE(ILES) = 'RES_NEST' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WThl(:,:,NLES_NEST) END IF @@ -898,7 +898,7 @@ IF ( ANY( XLES_BU_RES_WThl(:,:,NLES_MISC) & +XLES_BU_RES_WThl(:,:,NLES_PREF) & +XLES_BU_RES_WThl(:,:,NLES_CURV) /= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES MISC' +YSUBTITLE(ILES) = 'RES_MISC' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WThl(:,:,NLES_MISC) & + XLES_BU_RES_WThl(:,:,NLES_RAD ) & @@ -912,7 +912,7 @@ END IF ! -------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES RESI' +YSUBTITLE(ILES) = 'RES_RESI' ! ZLES_BUDGET(:,:,ILES) = 0. DO JLES=ILES_STA+1,ILES-1 @@ -923,7 +923,7 @@ END DO ! ------------------------ ! ILES=ILES+1 -YSUBTITLE(ILES) = ' NSG TEND' +YSUBTITLE(ILES) = 'NSG_TEND' ! ZLES_BUDGET(:,:,ILES) = 0. IF (NLES_TIMES>2) THEN @@ -944,7 +944,7 @@ END IF ! ------------------------------------------------ ! ILES=ILES+1 -YSUBTITLE(ILES) = ' NSG ADVM' +YSUBTITLE(ILES) = 'NSG_ADVM' ! DO JK=2,NLES_K-1 ZLES_BUDGET(JK,:,ILES)= - XLES_MEAN_W(JK,:,1) & @@ -961,7 +961,7 @@ ZLES_BUDGET(NLES_K,:,ILES) = ZLES_BUDGET(NLES_K-1,:,ILES) ! ------------------------------------------------ ! ILES=ILES+1 -YSUBTITLE(ILES) = ' NSG ADVR' +YSUBTITLE(ILES) = 'NSG_ADVR' ! DO JK=2,NLES_K-1 ZLES_BUDGET(JK,:,ILES)= - ( XLES_RES_W_SBG_WThl(JK+1,:,1) & @@ -977,7 +977,7 @@ ZLES_BUDGET(NLES_K,:,ILES) = ZLES_BUDGET(NLES_K-1,:,ILES) ! ---------------------------------------------------------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' NSG DPGW' +YSUBTITLE(ILES) = 'NSG_DPGW' ! ZLES_BUDGET(:,:,ILES)=- XLES_RES_ddxa_W_SBG_UaThl(:,:,1) ! @@ -986,7 +986,7 @@ ZLES_BUDGET(:,:,ILES)=- XLES_RES_ddxa_W_SBG_UaThl(:,:,1) ! ------------------------------------------------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' NSG DPGT' +YSUBTITLE(ILES) = 'NSG_DPGT' ! ZLES_BUDGET(:,:,ILES)=-XLES_RES_ddxa_Thl_SBG_UaW(:,:,1) & -ZLES_BUDGET(:,:,ILES_P1) -ZLES_BUDGET(:,:,ILES_P2) diff --git a/src/MNH/write_les_rt_budgetn.f90 b/src/MNH/write_les_rt_budgetn.f90 index 3bda050f1198998de43114a892e2b8eae8a2e073..5948519b0829270154c139cc2087483b4a8d6529 100644 --- a/src/MNH/write_les_rt_budgetn.f90 +++ b/src/MNH/write_les_rt_budgetn.f90 @@ -125,7 +125,7 @@ gdonorm = Trim( cles_norm_type ) /= 'NONE' ! --------------------------- ! ! -YGROUP= 'BU_RT2 ' +YGROUP= 'BU_RT2' ILES=0 ILES_STA=ILES ! @@ -134,7 +134,7 @@ ILES_STA=ILES ! ---------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG DP M' +YSUBTITLE(ILES) = 'SBG_DP_M' ILES_P1=ILES ! ZLES_BUDGET(:,:,ILES)= - 2. * XLES_SUBGRID_WRt(:,:,1) * XLES_MEAN_dRtdz(:,:,1) @@ -144,7 +144,7 @@ ZLES_BUDGET(:,:,ILES)= - 2. * XLES_SUBGRID_WRt(:,:,1) * XLES_MEAN_dRtdz(:,:,1) ! -------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG DP R' +YSUBTITLE(ILES) = 'SBG_DP_R' ! ZLES_BUDGET(:,:,ILES)= - 2. * XLES_RES_ddxa_Rt_SBG_UaRt(:,:,1) & - ZLES_BUDGET(:,:,ILES_P1) @@ -155,7 +155,7 @@ ZLES_BUDGET(:,:,ILES)= - 2. * XLES_RES_ddxa_Rt_SBG_UaRt(:,:,1) & ! IF ( ANY(XLES_SUBGRID_WRt2(:,:,1)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG TR ' +YSUBTITLE(ILES) = 'SBG_TR' ! DO JK=2,NLES_K-1 ZLES_BUDGET(JK,:,ILES) = - ( XLES_SUBGRID_WRt2 (JK+1,:,1) & @@ -172,7 +172,7 @@ END IF ! ----------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' DISS ' +YSUBTITLE(ILES) = 'DISS' ! ZLES_BUDGET(:,:,ILES) = XLES_SUBGRID_DISS_Rt2(:,:,1) ! @@ -181,7 +181,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_SUBGRID_DISS_Rt2(:,:,1) ! -------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG RESI' +YSUBTITLE(ILES) = 'SBG_RESI' ! ZLES_BUDGET(:,:,ILES) = 0. DO JLES=ILES_STA+1,ILES-1 @@ -194,7 +194,7 @@ ILES_STA=ILES ! -------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES TEND' +YSUBTITLE(ILES) = 'RES_TEND' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_Rt2(:,:,NLES_TEND) ! @@ -204,7 +204,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_Rt2(:,:,NLES_TEND) ! IF ( ANY(XLES_BU_RES_Rt2(:,:,NLES_ADVM)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES ADV ' +YSUBTITLE(ILES) = 'RES_ADV' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_Rt2(:,:,NLES_ADVM) END IF @@ -214,7 +214,7 @@ END IF ! IF ( ANY(XLES_BU_RES_Rt2(:,:,NLES_FORC)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES FORC' +YSUBTITLE(ILES) = 'RES_FORC' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_Rt2(:,:,NLES_FORC) END IF @@ -224,7 +224,7 @@ END IF ! ---------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES DP ' +YSUBTITLE(ILES) = 'RES_DP' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_Rt2(:,:,NLES_DP) @@ -233,7 +233,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_Rt2(:,:,NLES_DP) ! ------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES TR ' +YSUBTITLE(ILES) = 'RES_TR' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_Rt2(:,:,NLES_TR) ! @@ -242,7 +242,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_Rt2(:,:,NLES_TR) ! ---------------------------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES SBGT' +YSUBTITLE(ILES) = 'RES_SBGT' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_Rt2(:,:,NLES_VTURB) + XLES_BU_RES_Rt2(:,:,NLES_HTURB) ! @@ -252,7 +252,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_Rt2(:,:,NLES_VTURB) + XLES_BU_RES_Rt2(:,:,NL ! IF ( ANY(XLES_BU_RES_Rt2(:,:,NLES_DIFF)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES NUMD' +YSUBTITLE(ILES) = 'RES_NUMD' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_Rt2(:,:,NLES_DIFF) END IF @@ -262,7 +262,7 @@ END IF ! IF ( ANY(XLES_BU_RES_Rt2(:,:,NLES_RELA)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES RELA' +YSUBTITLE(ILES) = 'RES_RELA' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_Rt2(:,:,NLES_RELA) END IF @@ -272,7 +272,7 @@ END IF ! IF ( ANY(XLES_BU_RES_Rt2(:,:,NLES_NEST)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES NEST' +YSUBTITLE(ILES) = 'RES_NEST' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_Rt2(:,:,NLES_NEST) END IF @@ -283,7 +283,7 @@ END IF IF ( ANY( XLES_BU_RES_Rt2(:,:,NLES_MISC) & +XLES_BU_RES_Rt2(:,:,NLES_MICR)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES MISC' +YSUBTITLE(ILES) = 'RES_MISC' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_Rt2(:,:,NLES_MISC) & + XLES_BU_RES_Rt2(:,:,NLES_MICR) @@ -294,7 +294,7 @@ END IF ! --------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES RESI' +YSUBTITLE(ILES) = 'RES_RESI' ! ZLES_BUDGET(:,:,ILES) = 0. DO JLES=ILES_STA+1,ILES-1 @@ -305,7 +305,7 @@ END DO ! ------------------------ ! ILES=ILES+1 -YSUBTITLE(ILES) = ' NSG TEND' +YSUBTITLE(ILES) = 'NSG_TEND' ! ZLES_BUDGET(:,:,ILES) = 0. IF (NLES_TIMES>2) THEN @@ -324,7 +324,7 @@ END IF ! ---------------------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' NSG ADVM' +YSUBTITLE(ILES) = 'NSG_ADVM' ! DO JK=2,NLES_K-1 ZLES_BUDGET(JK,:,ILES)= -XLES_MEAN_W(JK,:,1) & @@ -341,7 +341,7 @@ ZLES_BUDGET(NLES_K,:,ILES) = ZLES_BUDGET(NLES_K-1,:,ILES) ! ---------------------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' NSG ADVR' +YSUBTITLE(ILES) = 'NSG_ADVR' ! DO JK=2,NLES_K-1 ZLES_BUDGET(JK,:,ILES)= - ( XLES_RES_W_SBG_Rt2 (JK+1,:,1) & @@ -371,7 +371,7 @@ call Les_diachro( tpdiafile, tzfield, gdoavg, gdonorm, zles_budget(:, :, :iles), ! ----------------------- ! ! -YGROUP= 'BU_WRT ' +YGROUP= 'BU_WRT' ILES=0 ILES_STA=ILES ! @@ -379,7 +379,7 @@ ILES_STA=ILES ! ----------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG DP M' +YSUBTITLE(ILES) = 'SBG_DP_M' ILES_P1=ILES ! ZLES_BUDGET(:,:,ILES) = - XLES_SUBGRID_W2(:,:,1) * XLES_MEAN_dRtdz(:,:,1) @@ -389,7 +389,7 @@ ZLES_BUDGET(:,:,ILES) = - XLES_SUBGRID_W2(:,:,1) * XLES_MEAN_dRtdz(:,:,1) ! ------------------------------------------- ! ILES=ILES+1 -YSUBTITLE(2) = ' SBG DP R' +YSUBTITLE(2) = 'SBG_DP_R' ILES_P2=ILES ! ZLES_BUDGET(:,:,ILES)=- XLES_RES_ddz_Rt_SBG_W2(:,:,1) & @@ -402,7 +402,7 @@ ZLES_BUDGET(:,:,ILES)=- XLES_RES_ddz_Rt_SBG_W2(:,:,1) & ! IF ( ANY(XLES_SUBGRID_W2Rt(:,:,1)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG TR ' +YSUBTITLE(ILES) = 'SBG_TR' ! DO JK=2,NLES_K-1 ZLES_BUDGET(JK,:,ILES) = - ( XLES_SUBGRID_W2Rt (JK+1,:,1) & @@ -420,7 +420,7 @@ END IF ! ------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG PRES' +YSUBTITLE(ILES) = 'SBG_PRES' ! ZLES_BUDGET(:,:,ILES) = XLES_SUBGRID_RtPz(:,:,1) ! @@ -429,7 +429,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_SUBGRID_RtPz(:,:,1) ! ------------------ ! ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG TP ' +YSUBTITLE(ILES) = 'SBG_TP' ! ZLES_BUDGET(:,:,ILES) = XG * XLES_SUBGRID_RtThv(:,:,1) & / XLES_MEAN_Thv (:,:,1) @@ -439,7 +439,7 @@ ZLES_BUDGET(:,:,ILES) = XG * XLES_SUBGRID_RtThv(:,:,1) & ! ----------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' DISS ' +YSUBTITLE(ILES) = 'DISS' ! ZLES_BUDGET(:,:,ILES) = 0. ! @@ -448,7 +448,7 @@ ZLES_BUDGET(:,:,ILES) = 0. ! -------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG RESI' +YSUBTITLE(ILES) = 'SBG_RESI' ! ZLES_BUDGET(:,:,ILES) = 0. DO JLES=ILES_STA+1,ILES-1 @@ -461,7 +461,7 @@ ILES_STA=ILES ! -------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES TEND' +YSUBTITLE(ILES) = 'RES_TEND' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WRt(:,:,NLES_TEND) ! @@ -470,7 +470,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WRt(:,:,NLES_TEND) ! IF ( ANY(XLES_BU_RES_WRt(:,:,NLES_ADVM)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES ADV ' +YSUBTITLE(ILES) = 'RES_ADV' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WRt(:,:,NLES_ADVM) END IF @@ -480,7 +480,7 @@ END IF ! IF ( ANY(XLES_BU_RES_WRt(:,:,NLES_FORC)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES FORC' +YSUBTITLE(ILES) = 'RES_FORC' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WRt(:,:,NLES_FORC) END IF @@ -489,7 +489,7 @@ END IF ! ---------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES DP ' +YSUBTITLE(ILES) = 'RES_DP' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WRt(:,:,NLES_DP) ! @@ -497,7 +497,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WRt(:,:,NLES_DP) ! ------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES TR ' +YSUBTITLE(ILES) = 'RES_TR' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WRt(:,:,NLES_TR) ! @@ -506,7 +506,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WRt(:,:,NLES_TR) ! ------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES PRES' +YSUBTITLE(ILES) = 'RES_PRES' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WRt(:,:,NLES_PRES) ! @@ -515,7 +515,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WRt(:,:,NLES_PRES) ! ------------------ ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES TP ' +YSUBTITLE(ILES) = 'RES_TP' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WRt(:,:,NLES_GRAV) ! @@ -524,7 +524,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WRt(:,:,NLES_GRAV) ! ---------------------------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES SBGT' +YSUBTITLE(ILES) = 'RES_SBGT' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WRt(:,:,NLES_VTURB) + XLES_BU_RES_WRt(:,:,NLES_HTURB) ! @@ -533,7 +533,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WRt(:,:,NLES_VTURB) + XLES_BU_RES_WRt(:,:,NL ! IF ( ANY(XLES_BU_RES_WRt(:,:,NLES_COR)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES CORI' +YSUBTITLE(ILES) = 'RES_CORI' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WRt(:,:,NLES_COR) END IF @@ -543,7 +543,7 @@ END IF ! IF ( ANY(XLES_BU_RES_WRt(:,:,NLES_DIFF)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES NUMD' +YSUBTITLE(ILES) = 'RES_NUMD' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WRt(:,:,NLES_DIFF) END IF @@ -553,7 +553,7 @@ END IF ! IF ( ANY(XLES_BU_RES_WRt(:,:,NLES_RELA)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES RELA' +YSUBTITLE(ILES) = 'RES_RELA' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WRt(:,:,NLES_RELA) END IF @@ -563,7 +563,7 @@ END IF ! IF ( ANY(XLES_BU_RES_WRt(:,:,NLES_NEST)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES NEST' +YSUBTITLE(ILES) = 'RES_NEST' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WRt(:,:,NLES_NEST) END IF @@ -574,7 +574,7 @@ END IF IF ( ANY( XLES_BU_RES_WRt(:,:,NLES_MISC) & +XLES_BU_RES_WRt(:,:,NLES_MICR) /= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES MISC' +YSUBTITLE(ILES) = 'RES_MISC' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_WRt(:,:,NLES_MISC) & + XLES_BU_RES_WRt(:,:,NLES_MICR) @@ -584,7 +584,7 @@ END IF ! -------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES RESI' +YSUBTITLE(ILES) = 'RES_RESI' ! ZLES_BUDGET(:,:,ILES) = 0. DO JLES=ILES_STA+1,ILES-1 @@ -595,7 +595,7 @@ END DO ! ------------------------ ! ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG TEND' +YSUBTITLE(ILES) = 'SBG_TEND' ! ZLES_BUDGET(:,:,ILES) = 0. IF (NLES_TIMES>2) THEN @@ -616,7 +616,7 @@ END IF ! ------------------------------------------------ ! ILES=ILES+1 -YSUBTITLE(ILES) = ' NSG ADVM' +YSUBTITLE(ILES) = 'NSG_ADVM' ! DO JK=2,NLES_K-1 ZLES_BUDGET(JK,:,ILES)= - XLES_MEAN_W(JK,:,1) & @@ -633,7 +633,7 @@ ZLES_BUDGET(NLES_K,:,ILES) = ZLES_BUDGET(NLES_K-1,:,ILES) ! ------------------------------------------------ ! ILES=ILES+1 -YSUBTITLE(ILES) = ' NSG ADVR' +YSUBTITLE(ILES) = 'NSG_ADVR' ! DO JK=2,NLES_K-1 ZLES_BUDGET(JK,:,ILES)= - ( XLES_RES_W_SBG_WRt(JK+1,:,1) & @@ -649,7 +649,7 @@ ZLES_BUDGET(NLES_K,:,ILES) = ZLES_BUDGET(NLES_K-1,:,ILES) ! ---------------------------------------------------------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' NSG DPGW' +YSUBTITLE(ILES) = 'NSG_DPGW' ! ZLES_BUDGET(:,:,ILES)=- XLES_RES_ddxa_W_SBG_UaRt(:,:,1) ! @@ -658,7 +658,7 @@ ZLES_BUDGET(:,:,ILES)=- XLES_RES_ddxa_W_SBG_UaRt(:,:,1) ! ------------------------------------------------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' NSG DPGT' +YSUBTITLE(ILES) = 'NSG_DPGT' ! ZLES_BUDGET(:,:,ILES)=-XLES_RES_ddxa_Rt_SBG_UaW(:,:,1) & -ZLES_BUDGET(:,:,ILES_P1) -ZLES_BUDGET(:,:,ILES_P2) @@ -681,7 +681,7 @@ call Les_diachro( tpdiafile, tzfield, gdoavg, gdonorm, zles_budget(:, :, :iles), ! ------------------------------------------------------------ ! ! -YGROUP= 'BU_THLR ' +YGROUP= 'BU_THLR' ILES=0 ILES_STA=ILES ! @@ -690,7 +690,7 @@ ILES_STA=ILES ! ---------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG DP M' +YSUBTITLE(ILES) = 'SBG_DP_M' ILES_P1=ILES ! ZLES_BUDGET(:,:,ILES)=-XLES_SUBGRID_WRt (:,:,1) * XLES_MEAN_dThldz(:,:,1) & @@ -701,7 +701,7 @@ ZLES_BUDGET(:,:,ILES)=-XLES_SUBGRID_WRt (:,:,1) * XLES_MEAN_dThldz(:,:,1) & ! -------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG DP R' +YSUBTITLE(ILES) = 'SBG_DP_R' ! ZLES_BUDGET(:,:,ILES)= - XLES_RES_ddxa_Rt_SBG_UaThl(:,:,1) & - XLES_RES_ddxa_Thl_SBG_UaRt(:,:,1) & @@ -713,7 +713,7 @@ ZLES_BUDGET(:,:,ILES)= - XLES_RES_ddxa_Rt_SBG_UaThl(:,:,1) & ! IF ( ANY(XLES_SUBGRID_WThlRt(:,:,1)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG TR ' +YSUBTITLE(ILES) = 'SBG_TR' ! DO JK=2,NLES_K-1 ZLES_BUDGET(JK,:,ILES) = - ( XLES_SUBGRID_WThlRt (JK+1,:,1) & @@ -730,7 +730,7 @@ END IF ! ----------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' DISS ' +YSUBTITLE(ILES) = 'DISS' ! ZLES_BUDGET(:,:,ILES) = XLES_SUBGRID_DISS_ThlRt(:,:,1) ! @@ -739,7 +739,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_SUBGRID_DISS_ThlRt(:,:,1) ! -------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG RESI' +YSUBTITLE(ILES) = 'SBG_RESI' ! ZLES_BUDGET(:,:,ILES) = 0. DO JLES=ILES_STA+1,ILES-1 @@ -752,7 +752,7 @@ ILES_STA=ILES ! -------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES TEND' +YSUBTITLE(ILES) = 'RES_TEND' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_ThlRt(:,:,NLES_TEND) ! @@ -762,7 +762,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_ThlRt(:,:,NLES_TEND) ! IF ( ANY(XLES_BU_RES_ThlRt(:,:,NLES_ADVM)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(7) = ' RES ADV ' +YSUBTITLE(7) = 'RES_ADV' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_ThlRt(:,:,NLES_ADVM) END IF @@ -772,7 +772,7 @@ END IF ! IF ( ANY(XLES_BU_RES_ThlRt(:,:,NLES_FORC)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES FORC' +YSUBTITLE(ILES) = 'RES_FORC' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_ThlRt(:,:,NLES_FORC) END IF @@ -781,7 +781,7 @@ END IF ! ---------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES DP ' +YSUBTITLE(ILES) = 'RES_DP' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_ThlRt(:,:,NLES_DP) ! @@ -789,7 +789,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_ThlRt(:,:,NLES_DP) ! ------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES TR ' +YSUBTITLE(ILES) = 'RES_TR' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_ThlRt(:,:,NLES_TR) ! @@ -798,7 +798,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_ThlRt(:,:,NLES_TR) ! ---------------------------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES SBGT' +YSUBTITLE(ILES) = 'RES_SBGT' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_ThlRt(:,:,NLES_VTURB) + XLES_BU_RES_ThlRt(:,:,NLES_HTURB) ! @@ -808,7 +808,7 @@ ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_ThlRt(:,:,NLES_VTURB) + XLES_BU_RES_ThlRt(:, ! IF ( ANY(XLES_BU_RES_ThlRt(:,:,NLES_DIFF)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES NUMD' +YSUBTITLE(ILES) = 'RES_NUMD' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_ThlRt(:,:,NLES_DIFF) END IF @@ -818,7 +818,7 @@ END IF ! IF ( ANY(XLES_BU_RES_ThlRt(:,:,NLES_RELA)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES RELA' +YSUBTITLE(ILES) = 'RES_RELA' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_ThlRt(:,:,NLES_RELA) END IF @@ -828,7 +828,7 @@ END IF ! IF ( ANY(XLES_BU_RES_ThlRt(:,:,NLES_NEST)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES NEST' +YSUBTITLE(ILES) = 'RES_NEST' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_ThlRt(:,:,NLES_NEST) END IF @@ -841,7 +841,7 @@ IF ( ANY( XLES_BU_RES_ThlRt(:,:,NLES_MISC) & +XLES_BU_RES_ThlRt(:,:,NLES_RAD ) & +XLES_BU_RES_ThlRt(:,:,NLES_MICR) /= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' RES MISC' +YSUBTITLE(ILES) = 'RES_MISC' ! ZLES_BUDGET(:,:,ILES) = XLES_BU_RES_ThlRt(:,:,NLES_MISC) & + XLES_BU_RES_ThlRt(:,:,NLES_PREF) & @@ -854,7 +854,7 @@ END IF ! --------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES RESI' +YSUBTITLE(ILES) = 'RES_RESI' ! ZLES_BUDGET(:,:,ILES) = 0. DO JLES=ILES_STA+1,ILES-1 @@ -865,7 +865,7 @@ END DO ! ------------------------ ! ILES=ILES+1 -YSUBTITLE(ILES) = ' NSG TEND' +YSUBTITLE(ILES) = 'NSG_TEND' ! ZLES_BUDGET(:,:,ILES) = 0. IF (NLES_TIMES>2) THEN @@ -884,7 +884,7 @@ END IF ! ---------------------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' NSG ADVM' +YSUBTITLE(ILES) = 'NSG_ADVM' ! DO JK=2,NLES_K-1 ZLES_BUDGET(JK,:,ILES)= -XLES_MEAN_W(JK,:,1) & @@ -901,7 +901,7 @@ ZLES_BUDGET(NLES_K,:,ILES) = ZLES_BUDGET(NLES_K-1,:,ILES) ! ---------------------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' NSG ADVR' +YSUBTITLE(ILES) = 'NSG_ADVR' ! DO JK=2,NLES_K-1 ZLES_BUDGET(JK,:,ILES)= - ( XLES_RES_W_SBG_ThlRt (JK+1,:,1) & diff --git a/src/MNH/write_les_sv_budgetn.f90 b/src/MNH/write_les_sv_budgetn.f90 index 377a5ea840aee2b2065af9db0cf69bd1c28c0cb2..fe79aef54ffe01d4f5038565e97d7c047f381284 100644 --- a/src/MNH/write_les_sv_budgetn.f90 +++ b/src/MNH/write_les_sv_budgetn.f90 @@ -115,7 +115,7 @@ ZLES_BUDGET(:,:,:,:) = XUNDEF ! ---------------------------- ! ! -YGROUP='BU_SV2 ' +YGROUP='BU_SV2' ! ILES=0 ILES_STA=ILES @@ -124,7 +124,7 @@ ILES_STA=ILES ! ---------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG DP M' +YSUBTITLE(ILES) = 'SBG_DP_M' ILES_P1=ILES ! DO JSV=1,NSV @@ -136,7 +136,7 @@ END DO ! -------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG DP R' +YSUBTITLE(ILES) = 'SBG_DP_R' ! DO JSV=1,NSV ZLES_BUDGET(:,:,ILES,JSV)= - 2. * XLES_RES_ddxa_Sv_SBG_UaSv(:,:,1,JSV) & @@ -149,7 +149,7 @@ END DO ! IF ( ANY(XLES_SUBGRID_WSv2(:,:,1,:)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG TR ' +YSUBTITLE(ILES) = 'SBG_TR' ! DO JSV=1,NSV DO JK=2,NLES_K-1 @@ -168,7 +168,7 @@ END IF ! ----------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' DISS ' +YSUBTITLE(ILES) = 'DISS' ! DO JSV=1,NSV ZLES_BUDGET(:,:,ILES,JSV) = XLES_SUBGRID_DISS_Sv2(:,:,1,JSV) @@ -179,7 +179,7 @@ END DO ! -------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG RESI' +YSUBTITLE(ILES) = 'SBG_RESI' ! DO JSV=1,NSV ZLES_BUDGET(:,:,ILES,JSV) = 0. @@ -194,7 +194,7 @@ ILES_STA=ILES ! -------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES TEND' +YSUBTITLE(ILES) = 'RES_TEND' ! DO JSV=1,NSV ZLES_BUDGET(:,:,ILES,JSV) = XLES_BU_RES_Sv2(:,:,NLES_TEND,JSV) @@ -205,7 +205,7 @@ END DO ! IF ( ANY(XLES_BU_RES_Sv2(:,:,NLES_ADVM,:)/= 0.) ) THEN ILES=ILES+1 - YSUBTITLE(ILES) = ' RES ADV ' + YSUBTITLE(ILES) = 'RES_ADV' ! DO JSV=1,NSV ZLES_BUDGET(:,:,ILES,JSV) = XLES_BU_RES_Sv2(:,:,NLES_ADVM,JSV) @@ -217,7 +217,7 @@ END IF ! IF ( ANY(XLES_BU_RES_Sv2(:,:,NLES_FORC,:)/= 0.) ) THEN ILES=ILES+1 - YSUBTITLE(ILES) = ' RES FORC' + YSUBTITLE(ILES) = 'RES_FORC' ! DO JSV=1,NSV ZLES_BUDGET(:,:,ILES,JSV) = XLES_BU_RES_Sv2(:,:,NLES_FORC,JSV) @@ -229,7 +229,7 @@ END IF ! ---------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES DP ' +YSUBTITLE(ILES) = 'RES_DP' ! DO JSV=1,NSV ZLES_BUDGET(:,:,ILES,JSV) = XLES_BU_RES_Sv2(:,:,NLES_DP,JSV) @@ -239,7 +239,7 @@ END DO ! ------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES TR ' +YSUBTITLE(ILES) = 'RES_TR' ! DO JSV=1,NSV ZLES_BUDGET(:,:,ILES,JSV) = XLES_BU_RES_Sv2(:,:,NLES_TR,JSV) @@ -250,7 +250,7 @@ END DO ! ---------------------------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES SBGT' +YSUBTITLE(ILES) = 'RES_SBGT' ! DO JSV=1,NSV ZLES_BUDGET(:,:,ILES,JSV) = XLES_BU_RES_Sv2(:,:,NLES_VTURB,JSV) & @@ -262,7 +262,7 @@ END DO ! IF ( ANY(XLES_BU_RES_Sv2(:,:,NLES_DIFF,:)/= 0.) ) THEN ILES=ILES+1 - YSUBTITLE(ILES) = ' RES NUMD' + YSUBTITLE(ILES) = 'RES_NUMD' ! DO JSV=1,NSV ZLES_BUDGET(:,:,ILES,JSV) = XLES_BU_RES_Sv2(:,:,NLES_DIFF,JSV) @@ -274,7 +274,7 @@ END IF ! IF ( ANY(XLES_BU_RES_Sv2(:,:,NLES_RELA,:)/= 0.) ) THEN ILES=ILES+1 - YSUBTITLE(ILES) = ' RES RELA' + YSUBTITLE(ILES) = 'RES_RELA' ! DO JSV=1,NSV ZLES_BUDGET(:,:,ILES,JSV) = XLES_BU_RES_Sv2(:,:,NLES_RELA,JSV) @@ -286,7 +286,7 @@ END IF ! IF ( ANY(XLES_BU_RES_Sv2(:,:,NLES_NEST,:)/= 0.) ) THEN ILES=ILES+1 - YSUBTITLE(ILES) = ' RES NEST' + YSUBTITLE(ILES) = 'RES_NEST' ! DO JSV=1,NSV ZLES_BUDGET(:,:,ILES,JSV) = XLES_BU_RES_Sv2(:,:,NLES_NEST,JSV) @@ -298,7 +298,7 @@ END IF ! IF ( ANY(XLES_BU_RES_Sv2(:,:,NLES_MISC,:)/= 0.) ) THEN ILES=ILES+1 - YSUBTITLE(ILES) = ' RES MISC' + YSUBTITLE(ILES) = 'RES_MISC' ! DO JSV=1,NSV ZLES_BUDGET(:,:,ILES,JSV) = XLES_BU_RES_Sv2(:,:,NLES_MISC,JSV) @@ -309,7 +309,7 @@ END IF ! --------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES RESI' +YSUBTITLE(ILES) = 'RES_RESI' ! DO JSV=1,NSV ZLES_BUDGET(:,:,ILES,JSV) = 0. @@ -322,7 +322,7 @@ END DO ! ------------------------ ! ILES=ILES+1 -YSUBTITLE(ILES) = ' NSG TEND' +YSUBTITLE(ILES) = 'NSG_TEND' ! IF (NLES_TIMES>2) THEN DO JSV=1,NSV @@ -343,7 +343,7 @@ END IF ! ---------------------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' NSG ADVM' +YSUBTITLE(ILES) = 'NSG_ADVM' ! DO JSV=1,NSV DO JK=2,NLES_K-1 @@ -361,7 +361,7 @@ END DO ! ---------------------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' NSG ADVR' +YSUBTITLE(ILES) = 'NSG_ADVR' ! DO JSV=1,NSV DO JK=2,NLES_K-1 @@ -407,7 +407,7 @@ call Les_diachro( tpdiafile, tzfield, gdoavg, gdonorm, zles_budget(:, :, :iles, ! ----------------------- ! ! -YGROUP = 'BU_WSV ' +YGROUP = 'BU_WSV' ! ! ILES=0 @@ -417,7 +417,7 @@ ILES_STA=ILES ! ----------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG DP M' +YSUBTITLE(ILES) = 'SBG_DP_M' ILES_P1=ILES ! DO JSV=1,NSV @@ -430,7 +430,7 @@ END DO ! ------------------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG DP R' +YSUBTITLE(ILES) = 'SBG_DP_R' ILES_P2=ILES ! DO JSV=1,NSV @@ -445,7 +445,7 @@ END DO ! IF ( ANY(XLES_SUBGRID_W2Sv(:,:,1,:)/= 0.) ) THEN ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG TR ' +YSUBTITLE(ILES) = 'SBG_TR' ! DO JSV=1,NSV DO JK=2,NLES_K-1 @@ -464,7 +464,7 @@ END IF ! ------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG PRES' +YSUBTITLE(ILES) = 'SBG_PRES' ! DO JSV=1,NSV ZLES_BUDGET(:,:,ILES,JSV) = XLES_SUBGRID_SvPz(:,:,1,JSV) @@ -475,7 +475,7 @@ END DO ! ------------------ ! ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG TP ' +YSUBTITLE(ILES) = 'SBG_TP' ! IF (LUSERV) THEN DO JSV=1,NSV @@ -494,7 +494,7 @@ END IF ! ----------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' DISS ' +YSUBTITLE(ILES) = 'DISS' ! DO JSV=1,NSV ZLES_BUDGET(:,:,ILES,JSV) = 0. @@ -505,7 +505,7 @@ END DO ! -------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' SBG RESI' +YSUBTITLE(ILES) = 'SBG_RESI' ! DO JSV=1,NSV ZLES_BUDGET(:,:,ILES,JSV) = 0. @@ -520,7 +520,7 @@ ILES_STA=ILES ! -------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES TEND' +YSUBTITLE(ILES) = 'RES_TEND' ! DO JSV=1,NSV ZLES_BUDGET(:,:,ILES,JSV) = XLES_BU_RES_WSv(:,:,NLES_TEND,JSV) @@ -531,7 +531,7 @@ END DO ! IF ( ANY(XLES_BU_RES_WSv(:,:,NLES_ADVM,:)/= 0.) ) THEN ILES=ILES+1 - YSUBTITLE(ILES) = ' RES ADV ' + YSUBTITLE(ILES) = 'RES_ADV' ! DO JSV=1,NSV ZLES_BUDGET(:,:,ILES,JSV) = XLES_BU_RES_WSv(:,:,NLES_ADVM,JSV) @@ -543,7 +543,7 @@ END IF ! IF ( ANY(XLES_BU_RES_WSv(:,:,NLES_FORC,:)/= 0.) ) THEN ILES=ILES+1 - YSUBTITLE(ILES) = ' RES FORC' + YSUBTITLE(ILES) = 'RES_FORC' ! DO JSV=1,NSV ZLES_BUDGET(:,:,ILES,JSV) = XLES_BU_RES_WSv(:,:,NLES_FORC,JSV) @@ -554,7 +554,7 @@ END IF ! ---------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES DP ' +YSUBTITLE(ILES) = 'RES_DP' ! DO JSV=1,NSV ZLES_BUDGET(:,:,ILES,JSV) = XLES_BU_RES_WSv(:,:,NLES_DP,JSV) @@ -564,7 +564,7 @@ END DO ! ------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES TR ' +YSUBTITLE(ILES) = 'RES_TR' ! DO JSV=1,NSV ZLES_BUDGET(:,:,ILES,JSV) = XLES_BU_RES_WSv(:,:,NLES_TR,JSV) @@ -575,7 +575,7 @@ END DO ! ------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES PRES' +YSUBTITLE(ILES) = 'RES_PRES' ! DO JSV=1,NSV ZLES_BUDGET(:,:,ILES,JSV) = XLES_BU_RES_WSv(:,:,NLES_PRES,JSV) @@ -586,7 +586,7 @@ END DO ! ------------------ ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES TP ' +YSUBTITLE(ILES) = 'RES_TP' ! DO JSV=1,NSV ZLES_BUDGET(:,:,ILES,JSV) = XLES_BU_RES_WSv(:,:,NLES_GRAV,JSV) @@ -597,7 +597,7 @@ END DO ! ---------------------------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES SBGT' +YSUBTITLE(ILES) = 'RES_SBGT' ! DO JSV=1,NSV ZLES_BUDGET(:,:,ILES,JSV) = XLES_BU_RES_WSv(:,:,NLES_VTURB,JSV) + XLES_BU_RES_WSv(:,:,NLES_HTURB,JSV) @@ -608,7 +608,7 @@ END DO ! IF ( ANY(XLES_BU_RES_WSv(:,:,NLES_COR,:)/= 0.) ) THEN ILES=ILES+1 - YSUBTITLE(ILES) = ' RES CORI' + YSUBTITLE(ILES) = 'RES_CORI' ! DO JSV=1,NSV ZLES_BUDGET(:,:,ILES,JSV) = XLES_BU_RES_WSv(:,:,NLES_COR,JSV) @@ -620,7 +620,7 @@ END IF ! IF ( ANY(XLES_BU_RES_WSv(:,:,NLES_DIFF,:)/= 0.) ) THEN ILES=ILES+1 - YSUBTITLE(ILES) = ' RES NUMD' + YSUBTITLE(ILES) = 'RES_NUMD' ! DO JSV=1,NSV ZLES_BUDGET(:,:,ILES,JSV) = XLES_BU_RES_WSv(:,:,NLES_DIFF,JSV) @@ -632,7 +632,7 @@ END IF ! IF ( ANY(XLES_BU_RES_WSv(:,:,NLES_RELA,:)/= 0.) ) THEN ILES=ILES+1 - YSUBTITLE(ILES) = ' RES RELA' + YSUBTITLE(ILES) = 'RES_RELA' ! DO JSV=1,NSV ZLES_BUDGET(:,:,ILES,JSV) = XLES_BU_RES_WSv(:,:,NLES_RELA,JSV) @@ -644,7 +644,7 @@ END IF ! IF ( ANY(XLES_BU_RES_WSv(:,:,NLES_NEST,:)/= 0.) ) THEN ILES=ILES+1 - YSUBTITLE(ILES) = ' RES NEST' + YSUBTITLE(ILES) = 'RES_NEST' ! DO JSV=1,NSV ZLES_BUDGET(:,:,ILES,JSV) = XLES_BU_RES_WSv(:,:,NLES_NEST,JSV) @@ -656,7 +656,7 @@ END IF ! IF ( ANY(XLES_BU_RES_WSv(:,:,NLES_MISC,:)/= 0.) ) THEN ILES=ILES+1 - YSUBTITLE(ILES) = ' RES MISC' + YSUBTITLE(ILES) = 'RES_MISC' ! DO JSV=1,NSV ZLES_BUDGET(:,:,ILES,JSV) = XLES_BU_RES_WSv(:,:,NLES_MISC,JSV) @@ -667,7 +667,7 @@ END IF ! ------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' RES RESI' +YSUBTITLE(ILES) = 'RES_RESI' ! DO JSV=1,NSV ZLES_BUDGET(:,:,ILES,JSV) = 0. @@ -680,7 +680,7 @@ END DO ! ------------------------ ! ILES=ILES+1 -YSUBTITLE(ILES) = ' NSG TEND' +YSUBTITLE(ILES) = 'NSG_TEND' ! DO JSV=1,NSV ZLES_BUDGET(:,:,ILES,JSV) = 0. @@ -703,7 +703,7 @@ END DO ! ------------------------------------------------ ! ILES=ILES+1 -YSUBTITLE(ILES) = ' NSG ADVM' +YSUBTITLE(ILES) = 'NSG_ADVM' ! DO JSV=1,NSV DO JK=2,NLES_K-1 @@ -721,7 +721,7 @@ END DO ! ------------------------------------------------ ! ILES=ILES+1 -YSUBTITLE(ILES) = ' NSG ADVR' +YSUBTITLE(ILES) = 'NSG_ADVR' ! DO JSV=1,NSV DO JK=2,NLES_K-1 @@ -738,7 +738,7 @@ END DO ! ---------------------------------------------------------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' NSG DPGW' +YSUBTITLE(ILES) = 'NSG_DPGW' ! DO JSV=1,NSV ZLES_BUDGET(:,:,ILES,JSV)=- XLES_RES_ddxa_W_SBG_UaSv(:,:,1,JSV) @@ -749,7 +749,7 @@ END DO ! ------------------------------------------------------------------------- ! ILES=ILES+1 -YSUBTITLE(ILES) = ' NSG DPGT' +YSUBTITLE(ILES) = 'NSG_DPGT' ! DO JSV=1,NSV ZLES_BUDGET(:,:,ILES,JSV)=-XLES_RES_ddxa_Sv_SBG_UaW(:,:,1,JSV) & diff --git a/src/MNH/write_lesn.f90 b/src/MNH/write_lesn.f90 index b2a3891f6ba601f6b0639009b32230d1c20296fb..dbd2eec903d9289bf040689ff547ed0f7fe146bb 100644 --- a/src/MNH/write_lesn.f90 +++ b/src/MNH/write_lesn.f90 @@ -988,8 +988,8 @@ if ( nsv > 0 ) then !tfield%ndimlist(3:) = NMNHDIM_UNUSED end if -call Les_diachro_write( tpdiafile, XLES_USTAR, 'U*', 'Friction velocity', 'm s-1' ) -call Les_diachro_write( tpdiafile, XLES_WSTAR, 'W*', 'Convective velocity', 'm s-1' ) +call Les_diachro_write( tpdiafile, XLES_USTAR, 'Ustar', 'Friction velocity', 'm s-1' ) +call Les_diachro_write( tpdiafile, XLES_WSTAR, 'Wstar', 'Convective velocity', 'm s-1' ) call Les_diachro_write( tpdiafile, XLES_BL_HEIGHT, 'BL_H', 'Boundary Layer Height', 'm' ) call Les_diachro_write( tpdiafile, XLES_MO_LENGTH, 'L_MO', 'Monin-Obukhov length', 'm' ) call Les_diachro_write( tpdiafile, XLES_INT_TKE, 'INT_TKE', 'Vertical integrated tke', 'm2 s-2' )