Skip to content

New data file parser #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: next
Choose a base branch
from
Open

New data file parser #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac5d9b1
Replace LecFicDiffuse_JDD with DataFile.
Apr 16, 2025
81b7750
Update the reference case to be compatible with the new syntax (expre…
Apr 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 0 additions & 1 deletion Validation/Outils/Genere_courbe/src/filelist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,6 @@ def AppendTestCase(cls, case, dir):
if not cls.active: return
cls.Append(dir + "/" + case + ".data")
cls.Append(dir + "/" + case + ".err")
cls.Append(dir + "/" + case + ".TU")
# Commenting those 2 - they might be huge if many timesteps:
# cls.Append(dir + "/" + case + ".out")
# cls.Append(dir + "/" + case + ".dt_ev")
Expand Down
6 changes: 3 additions & 3 deletions ...n/Rapports_automatiques/Verification/EF/EF_Eclt_coude_Genepi2/src/eclt_coude_Genepi2.data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Mailler dom
}
}

transformer dom (1.+x)*cos(0.3141592653589793E1*y/2.) (1.+x)*sin(0.3141592653589793E1*y/2.)
transformer dom ((1.+x)*cos(0.3141592653589793E1*y/2.)) ((1.+x)*sin(0.3141592653589793E1*y/2.))

EF dis

Expand Down Expand Up @@ -61,11 +61,11 @@ Read pb
convection { negligeable }
diffusion { }
initial_conditions {
vitesse Champ_Fonc_XYZ dom 2 (-(8.0*ln(2.0)*x*x+8.0*ln(2.0)*y*y-8.0*ln(2.0)-3.0*ln(x*x+y*y)*x*x-3.0*ln(x*x+y*y)*y*y)*sqrt(y*y/(x*x+y*y))/sqrt(x*x+y*y)/ln(2.0)/8.0) ((8.0*ln(2.0)*x*x+8.0*ln(2.0)*y*y-8.0*ln(2.0)-3.0*ln(x*x+y*y)*x*x-3.0*ln(x*x+y*y)*y*y)*x/(x*x+y*y)/ln(2.0)/8.0)
vitesse Champ_Fonc_XYZ dom 2 ((-(8.0*ln(2.0)*x*x+8.0*ln(2.0)*y*y-8.0*ln(2.0)-3.0*ln(x*x+y*y)*x*x-3.0*ln(x*x+y*y)*y*y)*sqrt(y*y/(x*x+y*y))/sqrt(x*x+y*y)/ln(2.0)/8.0)) (((8.0*ln(2.0)*x*x+8.0*ln(2.0)*y*y-8.0*ln(2.0)-3.0*ln(x*x+y*y)*x*x-3.0*ln(x*x+y*y)*y*y)*x/(x*x+y*y)/ln(2.0)/8.0))
}
boundary_conditions {
Bas frontiere_ouverte_vitesse_imposee
Champ_Front_Fonc_tXYZ 2 (0.) (0.1183687798)*(x>1.01)*(x<1.99)
Champ_Front_Fonc_tXYZ 2 (0.) ((0.1183687798)*(x>1.01)*(x<1.99))
Gauche frontiere_ouverte_vitesse_imposee
Champ_Front_Uniforme 2 0. 0.
Droit frontiere_ouverte_vitesse_imposee
Expand Down
10 changes: 5 additions & 5 deletions ...rts_automatiques/Verification/EF/EF_Eclt_coude_frottement/src/eclt_coude_frottement2.data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,17 @@ Read pb
}
convection { negligeable }
diffusion { negligeable }
sources { source_qdm Champ_Fonc_XYZ dom 2 1000.*(y/sqrt(x*x+y*y)/sqrt(x*x+y*y)/2.) 1000.*(-x/sqrt(x*x+y*y)/sqrt(x*x+y*y)/2.) }
sources { source_qdm Champ_Fonc_XYZ dom 2 (1000.*(y/sqrt(x*x+y*y)/sqrt(x*x+y*y)/2.)) (1000.*(-x/sqrt(x*x+y*y)/sqrt(x*x+y*y)/2.)) }
initial_conditions {
vitesse Champ_Fonc_XYZ dom 2 10.*(-y/sqrt(x*x+y*y)) 10.*(x/sqrt(x*x+y*y))
vitesse Champ_Fonc_XYZ dom 2 (10.*(-y/sqrt(x*x+y*y))) (10.*(x/sqrt(x*x+y*y)))
}
boundary_conditions {
Gauche frontiere_ouverte_vitesse_imposee
Champ_Front_Fonc_tXYZ 2 10.*(-y/sqrt(x*x+y*y)) 10.*(x/sqrt(x*x+y*y))
Champ_Front_Fonc_tXYZ 2 (10.*(-y/sqrt(x*x+y*y))) (10.*(x/sqrt(x*x+y*y)))
Droit frontiere_ouverte_vitesse_imposee
Champ_Front_Fonc_tXYZ 2 10.*(-y/sqrt(x*x+y*y)) 10.*(x/sqrt(x*x+y*y))
Champ_Front_Fonc_tXYZ 2 (10.*(-y/sqrt(x*x+y*y))) (10.*(x/sqrt(x*x+y*y)))
Bas frontiere_ouverte_vitesse_imposee
Champ_Front_Fonc_tXYZ 2 (0.) 10.*(1.)
Champ_Front_Fonc_tXYZ 2 (0.) (10.*(1.))
Haut frontiere_ouverte_pression_imposee
Champ_Front_Uniforme 1 0.
}
Expand Down
12 changes: 6 additions & 6 deletions ...rts_automatiques/Verification/EF/EF_Eclt_coude_frottement/src/eclt_coude_frottement3.data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Mailler dom
}
}

transformer dom (1.+x)*cos(0.3141592653589793E1*y/2.) (1.+x)*sin(0.3141592653589793E1*y/2.)
transformer dom ((1.+x)*cos(0.3141592653589793E1*y/2.)) ((1.+x)*sin(0.3141592653589793E1*y/2.))

EF dis

Expand Down Expand Up @@ -60,17 +60,17 @@ Read pb
}
convection { negligeable }
diffusion { negligeable }
sources { source_qdm Champ_Fonc_XYZ dom 2 1000.*(y/sqrt(x*x+y*y)/sqrt(x*x+y*y)/2.) 1000.*(-x/sqrt(x*x+y*y)/sqrt(x*x+y*y)/2.) }
sources { source_qdm Champ_Fonc_XYZ dom 2 (1000.*(y/sqrt(x*x+y*y)/sqrt(x*x+y*y)/2.)) (1000.*(-x/sqrt(x*x+y*y)/sqrt(x*x+y*y)/2.)) }
initial_conditions {
vitesse Champ_Fonc_XYZ dom 2 10.*(-y) 10.*(x)
vitesse Champ_Fonc_XYZ dom 2 (-10.*(y)) (10.*(x))
}
boundary_conditions {
Gauche frontiere_ouverte_vitesse_imposee
Champ_Front_Fonc_tXYZ 2 10.*(-y) 10.*(x)
Champ_Front_Fonc_tXYZ 2 (-10.*(y)) (10.*(x))
Droit frontiere_ouverte_vitesse_imposee
Champ_Front_Fonc_tXYZ 2 10.*(-y) 10.*(x)
Champ_Front_Fonc_tXYZ 2 (-10.*(y)) (10.*(x))
Bas frontiere_ouverte_vitesse_imposee
Champ_Front_Fonc_tXYZ 2 10.*(-y) 10.*(x)
Champ_Front_Fonc_tXYZ 2 (-10.*(y)) (10.*(x))
Haut frontiere_ouverte_pression_imposee
Champ_Front_Uniforme 1 0.
}
Expand Down
2 changes: 1 addition & 1 deletion ...ts_automatiques/Verification/EF/EF_Eclt_coude_pression_3D/src/eclt_coude_pression_3D.data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Mailler dom
}
}

transformer dom (1.+x)*cos(0.3141592653589793E1*y/2.) (1.+x)*sin(0.3141592653589793E1*y/2.) z
transformer dom ((1.+x)*cos(0.3141592653589793E1*y/2.)) ((1.+x)*sin(0.3141592653589793E1*y/2.)) z

EF dis

Expand Down
2 changes: 1 addition & 1 deletion Validation/Rapports_automatiques/Verification/IBM_PDF/src/template_taylor_couette.data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ Lire pb
{
eta 1.E-12
local
vitesse_imposee_fonction 3 0. -(((x*x)+(y*y))_LE_(0.75*0.75))*0.5+(((x*x)+(y*y))_GE_(0.75*0.75))*1.0 0.
vitesse_imposee_fonction 0. (-(((x*x)+(y*y))<=(0.75*0.75))*0.5+(((x*x)+(y*y))>=(0.75*0.75))*1.0) 0.
}
interpolation @INTERP_TYPE@
{
Expand Down
4 changes: 2 additions & 2 deletions ...dation/Rapports_automatiques/Verification/Multiphase/Pb_multi_vs_WC_QC/src/jdd_multi.data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Read sch
{
pression_degeneree 0
criteres_convergence { alpha 1e-5 pression 1 vitesse 1 }
solveur petsc cholesky { quiet }
solveur petsc cli { }
seuil_convergence_implicite 1e30
}
}
Expand All @@ -76,7 +76,7 @@ Read pb
QDM_Multiphase
{
evanescence { homogene { alpha_res 1 alpha_res_min 0.5 } }
solveur_pression petsc cholesky { quiet } /* cli_quiet { -pc_type hypre -pc_hypre_type boomeramg } */
solveur_pression petsc cli_quiet { -pc_type hypre -pc_hypre_type boomeramg }
convection { amont }
diffusion { }
initial_conditions
Expand Down
6 changes: 3 additions & 3 deletions Validation/Rapports_automatiques/Verification/Multiphase/tubes_a_choc/src/jdd.data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ Read pb
diffusion { negligeable }
initial_conditions
{
vitesse Champ_fonc_xyz dom 2 __vl__*(x[__x__)+(__vr__)*(x>__x__) 0
pression Champ_fonc_xyz dom 1 __pl__*(x[__x__)+__pr__*(x>__x__)
vitesse Champ_fonc_xyz dom 2 (__vl__*(x[__x__)+(__vr__)*(x>__x__)) 0
pression Champ_fonc_xyz dom 1 (__pl__*(x[__x__)+__pr__*(x>__x__))
}
boundary_conditions
{
Expand All @@ -98,7 +98,7 @@ Read pb
{
diffusion { negligeable }
convection { amont }
initial_conditions { temperature Champ_fonc_xyz dom 1 ((__pl__*(x[__x__)+__pr__*(x>__x__))+__pinf__)/((__rl__*(x[__x__)+__rr__*(x>__x__))*8.31446261815324)-273.15 }
initial_conditions { temperature Champ_fonc_xyz dom 1 (((__pl__*(x[__x__)+__pr__*(x>__x__))+__pinf__)/((__rl__*(x[__x__)+__rr__*(x>__x__))*8.31446261815324)-273.15) }
boundary_conditions
{
haut paroi_adiabatique
Expand Down
10 changes: 5 additions & 5 deletions Validation/Rapports_automatiques/Verification/Multiphase/vap_paroi/src/canal.data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Read pb

correlations
{
/* multiplicateur_diphasique friedel { } */
multiplicateur_diphasique friedel { }
flux_interfacial coef_constant {
liquide_sodium 1e8 /* coeff echange liquide-interface (interface tjrs a Tsat) => petit echange => liquide loin de Tsat */
gaz_sodium 1e10 /* coeff echange gaz-interface (interface tjrs a Tsat) => grande echange => gaz toujours a Tsat */
Expand Down Expand Up @@ -133,13 +133,13 @@ Read pb
}
sources
{
source_qdm champ_uniforme 6 0 0 0 0 -9.81 -9.81 /* ,
source_qdm champ_uniforme 6 0 0 0 0 -9.81 -9.81 ,
Perte_Charge_Isotrope
{
diam_hydr Champ_Uniforme 1 0.00385 sous_zone tot
lambda
((2000_min_((Re-1000)_max_0))*0.194*Re^(-0.2)+(2000_min_((3000-Re)_max_0))*64/Re)/2000
} */
((2000 min ((Re-1000) max 0))*0.194*Re^(-0.2)+(2000 min ((3000-Re) max 0))*64/Re)/2000
}
}
}
Masse_Multiphase
Expand Down Expand Up @@ -203,7 +203,7 @@ Read pb
vitesse_g_trust grav vitesse_gaz_sodium periode 1 segment 500 1e-3 1e-3 0. 1e-3 1e-3 1.508
}
Format cgns
fields dt_post 100
fields dt_post 0
{
vitesse_liquide_sodium elem
vitesse_gaz_sodium elem
Expand Down
2 changes: 1 addition & 1 deletion Validation/Rapports_automatiques/Verification/Multiphase/vap_paroi/vap_paroi.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
],
"metadata": {
"kernelspec": {
"display_name": "Python 3",
"display_name": "base",
"language": "python",
"name": "python3"
},
Expand Down
6 changes: 3 additions & 3 deletions ...ation/Rapports_automatiques/Verification/Schemes/QC_temperature_bounds_MUSCL/src/Cas.data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,14 @@ lire pb
fluide_quasi_compressible
{
gravite champ_uniforme 3 0 -9.81 0
mu champ_fonc_fonction pb temperature 1 ((val*0.00109+(1-val)*0.00245)_MAX_0.00109)_MIN_0.00245
mu champ_fonc_fonction pb temperature 1 (((val*0.00109+(1-val)*0.00245)max 0.00109)min 0.00245)
lambda champ_fonc_fonction pb temperature 1 1.77e-6
pression 1
loi_etat rhoT_gaz_parfait_QC
{
Prandtl 1
Cp 1
rho_T ((T*1064.7+(1-T)*956.54)_MAX_956.54)_MIN_1064.7
rho_T (((T*1064.7+(1-T)*956.54)max 956.54) min 1064.7)
}
traitement_pth constant
traitement_rho_gravite standard
Expand Down Expand Up @@ -97,7 +97,7 @@ lire pb
}
convection { $CONV }
diffusion { }
conditions_initiales { temperature champ_fonc_xyz dom 1 (x<0)*(1)+(x>0)*(0) }
conditions_initiales { temperature champ_fonc_xyz dom 1 ((x<0)*(1)+(x>0)*(0)) }
conditions_limites {
Paroi_tube paroi_adiabatique
Reservoir_froid paroi_adiabatique
Expand Down
6 changes: 3 additions & 3 deletions ...n/Rapports_automatiques/Verification/Verification_codage/Abort_timestep/src/abort_QC.data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@ Read pb1
}
sources {
Perte_Charge_isotrope {
diam_hydr champ_fonc_txyz dom_fluid 1 1.4-1.3908*(y]1)*(y[3)
lambda 4*((16/Re)$(0.079/(Re^0.25))$0.003)
diam_hydr champ_fonc_txyz dom_fluid 1 (1.4-1.3908*(y>=1)*(y<=3))
lambda (4*((16/Re) max (0.079/(Re^0.25)) max 0.003))
}

}
Expand All @@ -186,7 +186,7 @@ Read pb1

sources
{
Puissance_thermique champ_fonc_xyz dom_fluid 1 2400e6*2/3./10./(3*3.1416*0.7*0.7)*0.6/1.8*1.53*(y]1)*(y[3)
Puissance_thermique champ_fonc_xyz dom_fluid 1 (2400e6*2/3./10./(3*3.1416*0.7*0.7)*0.6/1.8*1.53*(y>=1)*(y<=3))
}


Expand Down
6 changes: 3 additions & 3 deletions ...ports_automatiques/Verification/Verification_codage/Abort_timestep/src/abort_QC_Pimp.data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,8 @@ Read pb1
}
sources {
Perte_Charge_isotrope {
diam_hydr champ_fonc_txyz dom_fluid 1 1.4-1.3908*(y]1)*(y[3)
lambda 4*((16/Re)$(0.079/(Re^0.25))$0.003)
diam_hydr champ_fonc_txyz dom_fluid 1 (1.4-1.3908*(y>=1)*(y<=3))
lambda (4*((16/Re) max (0.079/(Re^0.25)) max 0.003))
}

}
Expand All @@ -190,7 +190,7 @@ Read pb1

sources
{
Puissance_thermique champ_fonc_xyz dom_fluid 1 2400e6*2/3./10./(3*3.1416*0.7*0.7)*0.6/1.8*1.53*(y]1)*(y[3)
Puissance_thermique champ_fonc_xyz dom_fluid 1 (2400e6*2/3./10./(3*3.1416*0.7*0.7)*0.6/1.8*1.53*(y>=1)*(y<=3))
}


Expand Down
2 changes: 1 addition & 1 deletion .../Rapports_automatiques/Verification/Verification_codage/Champ_front_xyz_debit/src/prepare
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ sed -i "s/vitesseX periode 100/vitesseX periode 2.1/" Champ_front_xyz_debit_4.da
sed -i "s/vitesseY periode 100/vitesseY periode 2.1/" Champ_front_xyz_debit_4.data

# chap 4 : cas 2 VEF 2D inclined
sed "s/ENTREE/champ\_front\_fonc\_xyz 2 0*(y<0.5)-0.25*(y_GE_0.5)*(y_LT_1)-0.75*(y_GE_1)*(y_LT_1.5)-0.5*(y_GE_1.5)*(y_LT_2) 2/; s/VALUE/champ\_front\_uniforme 1 2.5/; s/VDF/VEFPreP1B/; s/10 5 0.1 5 2/20 5 0.01 6. 2/g" Champ_front_xyz_debit.data > Champ_front_xyz_debit_2.data
sed "s/ENTREE/champ\_front\_fonc\_xyz 2 0*(y<0.5)-0.25*(y>=0.5)*(y<1)-0.75*(y>=1)*(y<1.5)-0.5*(y>=1.5)*(y<2) 2/; s/VALUE/champ\_front\_uniforme 1 2.5/; s/VDF/VEFPreP1B/; s/10 5 0.1 5 2/20 5 0.01 6. 2/g" Champ_front_xyz_debit.data > Champ_front_xyz_debit_2.data
sed -i "23a transformer dom x+0.5*y y" Champ_front_xyz_debit_2.data
sed -i "24a trianguler_h dom" Champ_front_xyz_debit_2.data
sed -i "25a raffiner_isotrope dom" Champ_front_xyz_debit_2.data
Expand Down
Loading