Skip to content

Commit 6f880a9

Browse files
sbryngelsonclaude
andcommitted
Fix file headers, add non-Newtonian tests, re-merge upstream
Fix .f90 -> .fpp in Doxygen headers for m_hb_function and m_re_visc. Add shear-thinning and Bingham regression tests to CI test suite. Re-merge with upstream/master after ruff PR (#1300) landed. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2 parents 4d042f5 + 93e3d09 commit 6f880a9

3 files changed

Lines changed: 24 additions & 2 deletions

File tree

src/simulation/m_hb_function.fpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
!>
2-
!! @file m_hb_function.f90
2+
!! @file m_hb_function.fpp
33
!! @brief Contains module m_hb_function
44

55
#:include 'macros.fpp'

src/simulation/m_re_visc.fpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
!>
2-
!! @file m_re_visc.f90
2+
!! @file m_re_visc.fpp
33
!! @brief Contains module m_re_visc
44

55
#:include 'macros.fpp'

toolchain/mfc/test/cases.py

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,28 @@ def alter_num_fluids(dimInfo):
401401

402402
stack.pop()
403403

404+
if num_fluids == 1:
405+
# Non-Newtonian viscosity (Herschel-Bulkley)
406+
stack.push(
407+
"Non-Newtonian",
408+
{
409+
"viscous": "T",
410+
"dt": 1e-11,
411+
"patch_icpp(1)%vel(1)": 1.0,
412+
"fluid_pp(1)%Re(1)": 10.0,
413+
"fluid_pp(1)%non_newtonian": "T",
414+
"fluid_pp(1)%tau0": 0.0,
415+
"fluid_pp(1)%K": 0.1,
416+
"fluid_pp(1)%nn": 0.5,
417+
"fluid_pp(1)%hb_m": 1000.0,
418+
"fluid_pp(1)%mu_min": 1e-4,
419+
"fluid_pp(1)%mu_max": 10.0,
420+
},
421+
)
422+
cases.append(define_case_d(stack, "shear-thinning", {}))
423+
cases.append(define_case_d(stack, "Bingham", {"fluid_pp(1)%tau0": 0.1, "fluid_pp(1)%nn": 1.0, "fluid_pp(1)%K": 0.01}))
424+
stack.pop()
425+
404426
if num_fluids == 2:
405427
stack.push(
406428
"Viscous",

0 commit comments

Comments
 (0)