Skip to content
Snippets Groups Projects
Commit c40251cc authored by RIETTE Sébastien's avatar RIETTE Sébastien
Browse files

S. Riette 18 Nov 2022: rain_ice_old replugged 

+ bugfix in check_commit_mesonh broken during last update
parent b4de698f
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
docs/TODO
+ 2
− 2
View file @ c40251cc
......@@ -29,9 +29,9 @@ Intégration de PHYEX dans des cycles/versions officielles:
- déplacer dans un nouveau mpa/aux: aro_startbu, aroini_budget, aro_suintbudget, aro_suintbudget_omp, aroini_cstmnh, aroini_frommpa, modd_spp_type
Merge pb:
- rain_ice_old a rebrancher dans Meso-NH
- appels à condensation temporairement supprimés de src/mesonh/micro/radtr_satel.f90,
- appels à condensation remis dans src/mesonh/micro/radtr_satel.f90,
src/mesonh/micro/ice_adjust_elec.f90 et src/mesonh/micro/lima_adjust_split.f90
mais non testés
- arp_shallow_mf non phasé
- LIMA à faire
- KFB ?
......
src/mesonh/ext/resolved_cloud.f90
+ 24
− 2
View file @ c40251cc
......@@ -324,6 +324,7 @@ USE MODI_LIMA_NOTADJUST
USE MODI_LIMA_WARM
USE MODI_RAIN_C2R2_KHKO
USE MODI_RAIN_ICE
USE MODI_RAIN_ICE_OLD
USE MODI_SHUMAN
USE MODI_SLOW_TERMS
!
......@@ -803,7 +804,17 @@ SELECT CASE ( HCLOUD )
TBUDGETS,SIZE(TBUDGETS), &
PSEA,PTOWN, PFPR=ZFPR )
ELSE
! CALL RAIN_ICE_OLD
CALL RAIN_ICE_OLD (YLDIMPHYEX, OSEDIC, CSEDIM, HSUBG_AUCV, OWARM, 1, IKU, 1, &
KSPLITR, PTSTEP, KRR, &
ZDZZ, PRHODJ, PRHODREF, PEXNREF, PPABST, PCIT, PCLDFR,&
PTHT, PRT(:,:,:,1), PRT(:,:,:,2), &
PRT(:,:,:,3), PRT(:,:,:,4), &
PRT(:,:,:,5), PRT(:,:,:,6), &
PTHS, PRS(:,:,:,1), PRS(:,:,:,2), PRS(:,:,:,3), &
PRS(:,:,:,4), PRS(:,:,:,5), PRS(:,:,:,6), &
PINPRC,PINPRR, PINPRR3D, PEVAP3D, &
PINPRS, PINPRG, PSIGS,PINDEP, PRAINFR, &
PSEA, PTOWN, PFPR=ZFPR)
END IF
!
......@@ -902,7 +913,18 @@ SELECT CASE ( HCLOUD )
PSEA, PTOWN, &
PRT(:,:,:,7), PRS(:,:,:,7), PINPRH, PFPR=ZFPR )
ELSE
!CALL RAIN_ICE_OLD
CALL RAIN_ICE_OLD (YLDIMPHYEX, OSEDIC, CSEDIM, HSUBG_AUCV, OWARM, 1, IKU, 1, &
KSPLITR, PTSTEP, KRR, &
ZDZZ, PRHODJ, PRHODREF, PEXNREF, PPABST, PCIT, PCLDFR,&
PTHT, PRT(:,:,:,1), PRT(:,:,:,2), &
PRT(:,:,:,3), PRT(:,:,:,4), &
PRT(:,:,:,5), PRT(:,:,:,6), &
PTHS, PRS(:,:,:,1), PRS(:,:,:,2), PRS(:,:,:,3), &
PRS(:,:,:,4), PRS(:,:,:,5), PRS(:,:,:,6), &
PINPRC,PINPRR, PINPRR3D, PEVAP3D, &
PINPRS, PINPRG, PSIGS,PINDEP, PRAINFR, &
PSEA, PTOWN, &
PRT(:,:,:,7), PRS(:,:,:,7), PINPRH, PFPR=ZFPR)
END IF
......
src/mesonh/micro/rain_ice_old.f90
+ 949
− 944
View file @ c40251cc
This diff is collapsed.
tools/check_commit_mesonh.sh
+ 26
− 11
View file @ c40251cc
......@@ -8,7 +8,7 @@ set -e
# Repertoire où MNH-V5-5-0_PHYEX.tar.gz modifie pour accueillir PHYEX se trouve
#TARGZDIR=$HOME
availTests="007_16janvier/008_run2, 007_16janvier/008_run2_turb3D, COLD_BUBBLE/002_mesonh,
availTests="007_16janvier/008_run2, 007_16janvier/008_run2_turb3D, 007_16janvier/008_run2_lredf, COLD_BUBBLE/002_mesonh,
ARMLES/RUN, COLD_BUBBLE_3D/002_mesonh,OCEAN_LES/004_run2"
defaultTest="007_16janvier/008_run2"
separator='_' #- be carrefull, gmkpack (at least on belenos) has multiple allergies (':', '.', '@')
......@@ -259,22 +259,34 @@ if [ $run -ge 1 ]; then
[ ! -d ${exedir}_$commit ] && cp -R ${exedir} ${exedir}_$commit
cd $REFDIR/MNH-V5-5-0/MY_RUN/KTEST/$case/${exedir}_$commit
else
#If the test case didn't exist in the tar.gz, we copy it from from the reference version
rep=$MNHPACK/$name/MY_RUN/KTEST/$case
[ -d $rep ] && rm -rf $rep
mkdir $rep
[ ! -d $rep ] && cp -r $REFDIR/MNH-V5-5-0/MY_RUN/KTEST/$case $rep
cd $rep
for repref in $REFDIR/MNH-V5-5-0/MY_RUN/KTEST/$case/$rep/*; do
rep=$(basename $repref)
if [ $rep != ${exedir} ]; then
rm -rf $rep
ln -s $REFDIR/MNH-V5-5-0/MY_RUN/KTEST/$case/$rep .
else
cp -R $REFDIR/MNH-V5-5-0/MY_RUN/KTEST/$case/$rep .
#Loop on the directories
for rep in *; do
if [ -d "$rep" ]; then
if echo $availTests | grep ${case}/$rep > /dev/null; then
#This directory is a test case
if [ $rep == ${exedir} ]; then
#this is the case we want to run
rm -rf $rep
cp -r $REFDIR/MNH-V5-5-0/MY_RUN/KTEST/$case/$rep .
fi
else
#This directory might be neede to run the test case, we take the reference version
rm -rf $rep
ln -s $REFDIR/MNH-V5-5-0/MY_RUN/KTEST/$case/$rep
fi
fi
done
#In case subcase does not exist we create it
[ ! -d ${exedir} ] && cp -r $REFDIR/MNH-V5-5-0/MY_RUN/KTEST/$case/${exedir} .
cd ${exedir}
fi
set +e #file ends with a test that can return false
[ $compilation -eq 0 ] && . $MNHPACK/$name/conf/profile_mesonh-*
set -e
......@@ -296,6 +308,9 @@ if [ $check -eq 1 ]; then
elif [ $t == 007_16janvier/008_run2_turb3D ]; then
path_user=$path_user_beg/MY_RUN/KTEST/007_16janvier/008_run2_turb3D$path_user_end
path_ref=$path_ref_beg/MY_RUN/KTEST/007_16janvier/008_run2_turb3D$path_ref_end
elif [ $t == 007_16janvier/008_run2_lredf ]; then
path_user=$path_user_beg/MY_RUN/KTEST/007_16janvier/008_run2_lredf$path_user_end
path_ref=$path_ref_beg/MY_RUN/KTEST/007_16janvier/008_run2_lredf$path_ref_end
elif [ $t == COLD_BUBBLE/002_mesonh ]; then
path_user=$path_user_beg/MY_RUN/KTEST/COLD_BUBBLE/002_mesonh$path_user_end
path_ref=$path_ref_beg/MY_RUN/KTEST/COLD_BUBBLE/002_mesonh$path_ref_end
......
tools/compare.py
+ 2
− 1
View file @ c40251cc
......@@ -38,7 +38,7 @@ def compareBACKUPFiles(file_user, file_ref):
nj=len(da['nj'])
nk=len(da['level'])
variables = list(da.keys())
for var in variables:
for var in [var for var in variables if da[var].dtype.char != 'S']:
try:
if da[var].ndim == 4: #Variables time, level, nj, ni
ecart_min=float(da2[var][0,JPVEXT:nk-1-JPVEXT,JPHEXT:nj-1-JPHEXT,JPHEXT:ni-1-JPHEXT].min())-float(da[var][0,JPVEXT:nk-1-JPVEXT,JPHEXT:nj-1-JPHEXT,JPHEXT:ni-1-JPHEXT].min())
......@@ -64,6 +64,7 @@ def compareBACKUPFiles(file_user, file_ref):
status += 1
print(var, ecart_min, ecart_moy, ecart_max)
except:
#raise
pass
return status
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Documentation | Mentions légales | CGU | Accessibilité : non conforme