Skip to content

Commit 6bdf257

Browse files
Merge branch 'master' into local-aware-ibm
2 parents 8fc61d9 + 76cb3b6 commit 6bdf257

2 files changed

Lines changed: 7 additions & 10 deletions

File tree

.github/workflows/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ jobs:
139139
needs: Container
140140
environment:
141141
name: containers
142-
url: https://hub.docker.com/r/${{ secrets.DOCKERHUB_USERNAME }}/mfc
142+
url: https://hub.docker.com/r/sbryngelson/mfc
143143
steps:
144144
- name: Login to Docker Hub
145145
uses: docker/login-action@v3

toolchain/mfc/params/definitions.py

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,16 @@ def _fc(name: str, default: int) -> int:
2222
"""Get a Fortran constant, using the inline default when m_constants.fpp is unavailable."""
2323
if _FC:
2424
if name not in _FC:
25-
raise RuntimeError(
26-
f"Fortran constant '{name}' not found in m_constants.fpp. "
27-
f"Toolchain is out of sync with Fortran source."
28-
)
25+
raise RuntimeError(f"Fortran constant '{name}' not found in m_constants.fpp. Toolchain is out of sync with Fortran source.")
2926
return _FC[name]
3027
return default
3128

3229

33-
NF = _fc("num_fluids_max", 10) # fluid_pp
34-
NPR = _fc("num_probes_max", 10) # probe, acoustic, integral
35-
NB = _fc("num_bc_patches_max", 10) # patch_bc
36-
NUM_PATCHES_MAX = _fc("num_patches_max", 10) # patch_icpp (Fortran array bound)
37-
NIB = _fc("num_ib_patches_max", 50000) # patch_ib (Fortran array bound)
30+
NF = _fc("num_fluids_max", 10) # fluid_pp
31+
NPR = _fc("num_probes_max", 10) # probe, acoustic, integral
32+
NB = _fc("num_bc_patches_max", 10) # patch_bc
33+
NUM_PATCHES_MAX = _fc("num_patches_max", 10) # patch_icpp (Fortran array bound)
34+
NIB = _fc("num_ib_patches_max", 50000) # patch_ib (Fortran array bound)
3835
# Enumeration limits for families not yet converted to IndexedFamily.
3936
# These are smaller than the Fortran array bounds to keep the registry compact.
4037
# The CONSTRAINTS dict below uses the Fortran constants for validation.

0 commit comments

Comments
 (0)