From e65798d2c127d2bcb47771bd02c510f20c219661 Mon Sep 17 00:00:00 2001 From: Philippe WAUTELET <philippe.wautelet@aero.obs-mip.fr> Date: Thu, 21 Nov 2019 10:15:31 +0100 Subject: [PATCH] Philippe 21/11/2019: add several mppdb_check calls --- src/MNH/bl89.f90 | 18 +++++++++++++++++ src/MNH/rmc01.f90 | 29 +++++++++++++++++++++++++++ src/MNH/rotate_wind.f90 | 25 ++++++++++++++++++++++- src/MNH/turb_ver_dyn_flux.f90 | 34 +++++++++++++++++++++++++------- src/MNH/turb_ver_thermo_corr.f90 | 2 +- 5 files changed, 99 insertions(+), 9 deletions(-) diff --git a/src/MNH/bl89.f90 b/src/MNH/bl89.f90 index 30c847269..2cb05385b 100644 --- a/src/MNH/bl89.f90 +++ b/src/MNH/bl89.f90 @@ -79,6 +79,8 @@ USE MODD_CTURB USE MODD_PARAMETERS use modd_precision, only: MNHREAL +use mode_mppdb + #ifdef MNH_BITREP USE MODI_BITREP #endif @@ -140,6 +142,17 @@ REAL :: Z2SQRT2 !------------------------------------------------------------------------------- ! +if ( mppdb_initialized ) then + !Check all in arrays + call Mppdb_check( pzz, "Bl89 beg:pzz" ) + call Mppdb_check( pdzz, "Bl89 beg:pdzz" ) + call Mppdb_check( pthvref, "Bl89 beg:pthvref" ) + call Mppdb_check( pthlm, "Bl89 beg:pthlm" ) + call Mppdb_check( prm, "Bl89 beg:prm" ) + call Mppdb_check( ptkem, "Bl89 beg:ptkem" ) + call Mppdb_check( pshear, "Bl89 beg:pshear" ) +end if + allocate( zvpt (size( ptkem, 1 ) * size( ptkem, 2 ), size( ptkem, 3 ) ) ) allocate( zdeltvpt (size( ptkem, 1 ) * size( ptkem, 2 ), size( ptkem, 3 ) ) ) allocate( zhlvpt (size( ptkem, 1 ) * size( ptkem, 2 ), size( ptkem, 3 ) ) ) @@ -412,5 +425,10 @@ ELSE END DO END IF +if ( mppdb_initialized ) then + !Check all out arrays + call Mppdb_check( plm, "Bl89 end:plm" ) +end if + ! END SUBROUTINE BL89 diff --git a/src/MNH/rmc01.f90 b/src/MNH/rmc01.f90 index 0a9ed042e..3098d2512 100644 --- a/src/MNH/rmc01.f90 +++ b/src/MNH/rmc01.f90 @@ -72,6 +72,10 @@ USE MODD_PARAMETERS USE MODD_CST USE MODD_CTURB ! +use mode_mppdb +#ifdef MNH_OPENACC +use mode_msg +#endif USE MODE_SBL ! USE MODI_SHUMAN @@ -118,6 +122,24 @@ REAL, DIMENSION(:,:,:), allocatable :: ZL ! SBL length REAL, DIMENSION(:,:,:), allocatable :: ZZC ! alt. where turb. is isotr. !------------------------------------------------------------------------------- +#ifdef MNH_OPENACC +call Print_msg( NVERB_FATAL, 'GEN', 'TURB', 'OpenACC: Rmc01 not yet implemented' ) +#endif + +if ( mppdb_initialized ) then + !check all in arrays + call Mppdb_check( pzz, "Rmc01 beg:pzz" ) + call Mppdb_check( pdxx, "Rmc01 beg:pdxx" ) + call Mppdb_check( pdyy, "Rmc01 beg:pdyy" ) + call Mppdb_check( pdzz, "Rmc01 beg:pdzz" ) + call Mppdb_check( pdircoszw, "Rmc01 beg:pdircoszw" ) + call Mppdb_check( psbl_depth, "Rmc01 beg:psbl_depth" ) + call Mppdb_check( plmo, "Rmc01 beg:plmo" ) + !check all inout arrays + call Mppdb_check( plk, "Rmc01 beg:plk" ) + call Mppdb_check( pleps, "Rmc01 beg:pleps" ) +end if + allocate( zzz (size( pzz, 1 ), size( pzz, 2 ), size( pzz, 3 ) ) ) allocate( zz_o_lmo(size( pzz, 1 ), size( pzz, 2 ), size( pzz, 3 ) ) ) allocate( zgam (size( pzz, 1 ), size( pzz, 2 ), size( pzz, 3 ) ) ) @@ -263,6 +285,13 @@ PLEPS(:,:,:)=(1.-ZGAM)*ZL+ZGAM*PLEPS ! PLEPS(:,:,KKA) = PLEPS(:,:,IKB) PLEPS(:,:,KKU ) = PLEPS(:,:,IKE) + +if ( mppdb_initialized ) then + !check all inout arrays + call Mppdb_check( plk, "Rmc01 end:plk" ) + call Mppdb_check( pleps, "Rmc01 end:pleps" ) +end if + !------------------------------------------------------------------------------- ! END SUBROUTINE RMC01 diff --git a/src/MNH/rotate_wind.f90 b/src/MNH/rotate_wind.f90 index 779d310f0..261b761ce 100644 --- a/src/MNH/rotate_wind.f90 +++ b/src/MNH/rotate_wind.f90 @@ -107,6 +107,9 @@ END MODULE MODI_ROTATE_WIND !* 0. DECLARATIONS ! ------------ USE MODD_PARAMETERS + +use mode_mppdb + #ifdef MNH_BITREP USE MODI_BITREP #endif @@ -150,6 +153,20 @@ INTEGER :: JI,JJ !$acc data present( PU, PV, PW, PDIRCOSXW, PDIRCOSYW, PDIRCOSZW, & !$acc & PCOSSLOPE, PSINSLOPE, PDXX, PDYY, PDZZ, PUSLOPE, PVSLOPE ) +if ( mppdb_initialized ) then + !check all in arrays + call Mppdb_check( pu, "Rotate_wind beg:pu" ) + call Mppdb_check( pv, "Rotate_wind beg:pv" ) + call Mppdb_check( pw, "Rotate_wind beg:pw" ) + call Mppdb_check( pdircosxw, "Rotate_wind beg:pdircosxw" ) + call Mppdb_check( pdircosyw, "Rotate_wind beg:pdircosyw" ) + call Mppdb_check( pdircoszw, "Rotate_wind beg:pdircoszw" ) + call Mppdb_check( pcosslope, "Rotate_wind beg:pcosslope" ) + call Mppdb_check( psinslope, "Rotate_wind beg:psinslope" ) + call Mppdb_check( pdxx, "Rotate_wind beg:pdxx" ) + call Mppdb_check( pdyy, "Rotate_wind beg:pdyy" ) + call Mppdb_check( pdzz, "Rotate_wind beg:pdzz" ) +end if allocate( iloc (size( pdircosxw, 1 ), size( pdircosxw, 2 ) ) ) allocate( jloc (size( pdircosxw, 1 ), size( pdircosxw, 2 ) ) ) @@ -246,7 +263,13 @@ DO JJ = IJB,IJE END DO END DO !$acc end kernels -! + +if ( mppdb_initialized ) then + !check all out arrays + call Mppdb_check( puslope, "Rotate_wind end:puslope" ) + call Mppdb_check( pvslope, "Rotate_wind end:pvslope" ) +end if + !$acc end data ! !---------------------------------------------------------------------------- diff --git a/src/MNH/turb_ver_dyn_flux.f90 b/src/MNH/turb_ver_dyn_flux.f90 index ccf34fec9..36919afe8 100644 --- a/src/MNH/turb_ver_dyn_flux.f90 +++ b/src/MNH/turb_ver_dyn_flux.f90 @@ -419,14 +419,34 @@ TYPE(TFIELDDATA) :: TZFIELD !$acc & PDP ) if ( mppdb_initialized ) then + !Check all in arrays + call Mppdb_check( PDXX, "Turb_ver_dyn_flux beg:PDXX" ) + call Mppdb_check( PDYY, "Turb_ver_dyn_flux beg:PDYY" ) + call Mppdb_check( PDZZ, "Turb_ver_dyn_flux beg:PDZZ" ) + call Mppdb_check( PDZX, "Turb_ver_dyn_flux beg:PDZX" ) + call Mppdb_check( PDZY, "Turb_ver_dyn_flux beg:PDZY" ) + call Mppdb_check( PDIRCOSZW, "Turb_ver_dyn_flux beg:PDIRCOSZW" ) + call Mppdb_check( PCOSSLOPE, "Turb_ver_dyn_flux beg:PCOSSLOPE" ) + call Mppdb_check( PSINSLOPE, "Turb_ver_dyn_flux beg:PSINSLOPE" ) + call Mppdb_check( PRHODJ, "Turb_ver_dyn_flux beg:PRHODJ" ) + call Mppdb_check( PCDUEFF, "Turb_ver_dyn_flux beg:PCDUEFF" ) + call Mppdb_check( PTAU11M, "Turb_ver_dyn_flux beg:PTAU11M" ) + call Mppdb_check( PTAU12M, "Turb_ver_dyn_flux beg:PTAU12M" ) + call Mppdb_check( PTAU33M, "Turb_ver_dyn_flux beg:PTAU33M" ) + call Mppdb_check( PUM, "Turb_ver_dyn_flux beg:PUM" ) + call Mppdb_check( PVM, "Turb_ver_dyn_flux beg:PVM" ) + call Mppdb_check( PWM, "Turb_ver_dyn_flux beg:PWM" ) + call Mppdb_check( PTHLM, "Turb_ver_dyn_flux beg:PTHLM" ) + call Mppdb_check( PRM, "Turb_ver_dyn_flux beg:PRM" ) + call Mppdb_check( PSVM, "Turb_ver_dyn_flux beg:PSVM" ) + call Mppdb_check( PUSLOPEM, "Turb_ver_dyn_flux beg:PUSLOPEM" ) + call Mppdb_check( PVSLOPEM, "Turb_ver_dyn_flux beg:PVSLOPEM" ) + call Mppdb_check( PTKEM, "Turb_ver_dyn_flux beg:PTKEM" ) + call Mppdb_check( PLM, "Turb_ver_dyn_flux beg:PLM" ) !Check all inout arrays - call Mppdb_check( prus, "Turb_ver_dyn_flux end:prus" ) - call Mppdb_check( prvs, "Turb_ver_dyn_flux end:prvs" ) - call Mppdb_check( prws, "Turb_ver_dyn_flux end:prws" ) - !Check all out arrays - call Mppdb_check( pwu, "Turb_ver_dyn_flux end:pwu" ) - call Mppdb_check( pwv, "Turb_ver_dyn_flux end:pwv" ) - call Mppdb_check( pdp, "Turb_ver_dyn_flux end:pdp" ) + call Mppdb_check( prus, "Turb_ver_dyn_flux beg:prus" ) + call Mppdb_check( prvs, "Turb_ver_dyn_flux beg:prvs" ) + call Mppdb_check( prws, "Turb_ver_dyn_flux beg:prws" ) end if allocate( zdirsinzw(size( pum, 1 ), size( pum, 2 ) ) ) diff --git a/src/MNH/turb_ver_thermo_corr.f90 b/src/MNH/turb_ver_thermo_corr.f90 index 5b995b825..8c5ac0d9c 100644 --- a/src/MNH/turb_ver_thermo_corr.f90 +++ b/src/MNH/turb_ver_thermo_corr.f90 @@ -1405,7 +1405,7 @@ END IF if ( mppdb_initialized ) then !Check all out arrays - call Mppdb_check( psigs, "Turb_ver_thermo_corr beg:psigs" ) + call Mppdb_check( psigs, "Turb_ver_thermo_corr end:psigs" ) end if !$acc end data -- GitLab