Skip to content

Commit 4a3afd0

Browse files
sbryngelsonsbryngelson
committed
merge from QBMM branch
2 parents 76d73cc + 1f764b5 commit 4a3afd0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+4876
-128
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,14 @@ tests/*/silo*
2121
tests/*/restart*
2222
tests/*/*.out
2323
tests/*/binary
24+
example_cases/*batch/*/
2425
example_cases/*/D/*
2526
example_cases/*/p*
2627
example_cases/*/D_*
2728
example_cases/*/*.inf
2829
example_cases/*/*.inp
2930
example_cases/*/*.dat
31+
example_cases/*/*.o*
3032
example_cases/*/silo*
3133
example_cases/*/restart*
3234
example_cases/*/*.out

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ endif
2323

2424
post_process:
2525

26-
ifneq ("$(wildcard $(silo_include_dir)/silo_*.inc)","")
26+
ifneq ("$(wildcard $(silo_include_dir)/silo*.inc)","")
2727
ifneq ("$(wildcard $(silo_lib_dir)/libsilo*.*a)","")
2828
@$(MAKE) -C src/post_process_code -f makefile
2929
else

‎Makefile.user‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,10 @@ FC = mpif90
99
### Compiler flags [set according to your compiler] ###
1010
#Note: Requires -cpp to enable preprocessor
1111

12-
FFLAGS = -cpp -c -w -freal-4-real-8
13-
# FFLAGS = -cpp -c -w -freal-4-real-8 -O2 -fimplicit-none -Wall -Wline-truncation -Wcharacter-truncation -Wsurprising -Waliasing -Wimplicit-interface -Wunused-parameter -fwhole-file -fcheck=all -pedantic -fbacktrace
12+
FFLAGS = -cpp -c -w -freal-4-real-8 -O3
13+
# FFLAGS = -cpp -c -w -fimplicit-none -Wall -Wline-truncation -Wcharacter-truncation -Wsurprising -Waliasing -Wimplicit-interface -Wunused-parameter -fwhole-file -fcheck=all -std=f2008 -pedantic -fbacktrace
1414
#NOTE: Cray compilers require: -eZ
1515

16-
1716
######### LAPACK library location #########
1817
lapack_lib_dir = $(MFC_DIR)/lib/lapack-3.4.2/
1918

‎doc/richardson_MFC.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,15 @@
1111
* Add your private key to your Richardson keychain
1212
* $ cat ~/.ssh/id_rsa.pub | ssh <your_userid>@richardson.caltech.edu 'cat >> ~/.ssh/authorized_keys'
1313

14+
=======
15+
* [Generate](https://docs.joyent.com/public-cloud/getting-started/ssh-keys/generating-an-ssh-key-manually/manually-generating-your-ssh-key-in-mac-os-x) your private key if you don't have one
16+
* $ cat ~/.ssh/id_rsa.pub | ssh <your_userid>@richardson.caltech.edu 'cat >> ~/.ssh/authorized_keys'
17+
18+
* Silo/HDF5, Visit, Paraview on Richardson
19+
* Follow the `visit_paraview_richardson.pdf` document
20+
* Step 15. under 'visit on richardson' should use the following URL: http://visit.ilight.com/svn/visit/branches/2.9RC/src/svn_bin/bv_support/
21+
22+
>>>>>>> qbmm
1423
* Clone MFC, e.g.
1524
* $ git clone https://github.com/ComputationalFlowPhysics/MFC_private.git
1625
* $ git status
@@ -56,6 +65,16 @@
5665
* Make sure you logged into Richardson using ssh -Y [or ssh -X]
5766
* Check if your X server is working by logging into Richardson and issuing
5867
$ xclock
68+
* I am aware this version is deprecated, but it appears that 2.7.11 does not work in some cases
69+
* Make sure you logged into Richardson using ssh -Y [or ssh -X]
70+
* Check if your X server is working by logging into Richardson and issuing
71+
$ xclock
72+
* IF YOU USE MacOS CATALINA!
73+
* Permissions can be an issue
74+
* Go to System preferences -> Security and Privacy -> Privacy -> Full Disk Access
75+
* Add your terminal (e.g. Terminal, iTerm2, etc.) via the + button
76+
* Add XQuartz (launchd_startx) and the app (XQuartz)
77+
5978
* Copy contents of https://raw.githubusercontent.com/sbryngelson/dotfiles/master/.gnuplotrc_x11
6079
into your ~/.bashrc
6180
* now you can use

‎doc/visit_paraview_richardson.pdf‎

878 KB
Binary file not shown.

‎example_cases/0D_qbmm/input.py‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python3
1+
#!/usr/bin/env python2
22

33
import math
44

@@ -11,7 +11,7 @@
1111
#water props
1212
n_tait = 7.1
1313
B_tait = 306.E+06 / p0
14-
mul0 = 1.002E-03 #viscosity
14+
mul0 = -10.002E-03 #viscosity
1515
ss = 0.07275 #surface tension
1616
pv = 2.3388E+03 #vapor pressure
1717

@@ -38,7 +38,8 @@
3838
#Characteristic velocity
3939
uu = math.sqrt( p0/rho0 )
4040
#Cavitation number
41-
Ca = (p0 - pv)/(rho0*(uu**2.))
41+
Ca = 1.
42+
# Ca = (p0 - pv)/(rho0*(uu**2.))
4243
#Weber number
4344
We = rho0*(uu**2.)*R0ref/ss
4445
#Inv. bubble Reynolds number
@@ -124,7 +125,7 @@
124125
'p' : 0, \
125126
'dt' : 0.001, \
126127
't_step_start' : 0, \
127-
't_step_stop' : 15000, \
128+
't_step_stop' : 30000, \
128129
# 't_step_stop' : 4, \
129130
't_step_save' : 1000, \
130131
# 't_step_save' : 1, \
@@ -187,35 +188,35 @@
187188
# 'patch_icpp(2)%alter_patch(1)' : 'T', \
188189
'patch_icpp(1)%vel(1)' : 0.0, \
189190
# 'patch_icpp(1)%pres' : 1/0.5, \
190-
'patch_icpp(1)%pres' : 1, \
191+
'patch_icpp(1)%pres' : 1.0, \
191192
# 'patch_icpp(1)%pres' : patm, \
192193
'patch_icpp(1)%alpha_rho(1)' : (1.-vf0)*1.E+03/rho0, \
193194
'patch_icpp(1)%alpha(1)' : vf0, \
194195
'patch_icpp(1)%r0' : 1., \
195-
# 'patch_icpp(1)%v0' : 0., \
196-
'patch_icpp(1)%v0' : -0.5, \
196+
'patch_icpp(1)%v0' : 0., \
197+
# 'patch_icpp(1)%v0' : -0.5, \
197198
# ==========================================================
198199

199200
# Fluids Physical Parameters ===============================
200201
# Surrounding liquid
201202
'fluid_pp(1)%gamma' : 1.E+00/(n_tait-1.E+00), \
202203
'fluid_pp(1)%pi_inf' : n_tait*B_tait/(n_tait-1.), \
203-
'fluid_pp(1)%mul0' : mul0, \
204-
'fluid_pp(1)%ss' : ss, \
205-
'fluid_pp(1)%pv' : pv, \
206-
'fluid_pp(1)%gamma_v' : gamma_v, \
207-
'fluid_pp(1)%M_v' : M_v, \
208-
'fluid_pp(1)%mu_v' : mu_v, \
209-
'fluid_pp(1)%k_v' : k_v, \
204+
# 'fluid_pp(1)%mul0' : mul0, \
205+
# 'fluid_pp(1)%ss' : ss, \
206+
# 'fluid_pp(1)%pv' : pv, \
207+
# 'fluid_pp(1)%gamma_v' : gamma_v, \
208+
# 'fluid_pp(1)%M_v' : M_v, \
209+
# 'fluid_pp(1)%mu_v' : mu_v, \
210+
# 'fluid_pp(1)%k_v' : k_v, \
210211

211212
# Last fluid_pp is always reserved for bubble gas state ===
212213
# if applicable ==========================================
213214
'fluid_pp(2)%gamma' : 1./(gamma_gas-1.), \
214215
'fluid_pp(2)%pi_inf' : 0.0E+00, \
215-
'fluid_pp(2)%gamma_v' : gamma_n, \
216-
'fluid_pp(2)%M_v' : M_n, \
217-
'fluid_pp(2)%mu_v' : mu_n, \
218-
'fluid_pp(2)%k_v' : k_n, \
216+
# 'fluid_pp(2)%gamma_v' : gamma_n, \
217+
# 'fluid_pp(2)%M_v' : M_n, \
218+
# 'fluid_pp(2)%mu_v' : mu_n, \
219+
# 'fluid_pp(2)%k_v' : k_n, \
219220
# ==========================================================
220221

221222
# Non-polytropic gas compression model AND/OR Tait EOS =====
@@ -234,14 +235,14 @@
234235
# 'nb' : 3, \
235236
'nb' : 1, \
236237
'Ca' : Ca, \
237-
'Web' : We, \
238+
# 'Web' : We, \
238239
'Re_inv' : Re_inv, \
239240
'qbmm' : 'T', \
240241
'nnode' : 4, \
241242
'dist_type' : 1, \
242243
'sigR' : 0.1, \
243244
'sigV' : 0.1, \
244-
'rhoRV' : 0.3, \
245+
'rhoRV' : 0.0, \
245246
# ==========================================================
246247

247248
# Acoustic source ==========================================

0 commit comments

Comments
 (0)