Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@
"problems.showOn": "toggle",
"problems.defaultViewMode": "list",

// MFC-SCHEMA-CONFIG-BEGIN (auto-generated, do not edit)
// Case-file schema association. Run ./mfc.sh generate to (re)build
// toolchain/mfc-case-schema.json, which these entries point at.
"json.schemas": [
{
"fileMatch": ["**/case.json", "**/input.json", "**/mfc-case.json", "**/mfc.json"],
Expand All @@ -84,5 +85,4 @@
"yaml.schemas": {
"./toolchain/mfc-case-schema.json": ["**/case.yaml", "**/case.yml", "**/input.yaml", "**/input.yml", "**/mfc-case.yaml", "**/mfc.yaml"]
}
// MFC-SCHEMA-CONFIG-END
}
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ And a high-amplitude acoustic wave reflecting and emerging through a circular or
| `./mfc.sh validate case.py` | Check a case file for errors before running |
| `./mfc.sh new my_case` | Create a new case from a template |
| `./mfc.sh clean` | Remove build artifacts |
| `./mfc.sh interactive` | Launch interactive menu-driven interface |

Run `./mfc.sh <command> --help` for detailed options, or see the [full documentation](https://mflowcode.github.io/documentation/index.html). Tab completion for bash and zsh is auto-installed after you have run `./mfc.sh generate` (or any non-`new` command) at least once. Play with the examples in `examples/` ([showcased here](https://mflowcode.github.io/documentation/examples.html)).

Expand Down
6 changes: 3 additions & 3 deletions docs/documentation/running.md
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ or contribute a new template.
**SLURM systems:**
Most clusters use SLURM. MFC automatically generates appropriate `sbatch` scripts.

**LSF systems (e.g., Summit):**
**LSF systems:**
IBM's JSRUN does not use the traditional node-based approach. MFC constructs equivalent resource sets for task and GPU counts.

---
Expand Down Expand Up @@ -376,11 +376,11 @@ We have provided an example, `case.py` and `restart_case.py` in `/examples/1D_va

## Example Runs

- Oak Ridge National Laboratory's [Summit](https://www.olcf.ornl.gov/summit/):
- Oak Ridge National Laboratory's [Frontier](https://www.olcf.ornl.gov/frontier/):

```shell
./mfc.sh run examples/2D_shockbubble/case.py -e batch \
-N 2 -n 4 -t simulation -a <redacted> -c summit
-N 2 -n 4 -t simulation -a <redacted> -c frontier
```


Expand Down
3 changes: 1 addition & 2 deletions docs/documentation/troubleshooting.md
Original file line number Diff line number Diff line change
Expand Up @@ -539,8 +539,7 @@ If you can't resolve an issue:

4. **Use the CLI help:**
```bash
./mfc.sh help debugging
./mfc.sh help gpu
./mfc.sh --help
./mfc.sh <command> -h
```

Expand Down
201 changes: 7 additions & 194 deletions src/simulation/m_checker.fpp

Large diffs are not rendered by default.

19 changes: 10 additions & 9 deletions toolchain/bootstrap/modules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,7 @@ show_help() {
echo "Options:"
echo " -h, --help Display this help message and exit."
echo " -c, --computer COMPUTER Configures for COMPUTER environment."
echo " Options: Ascent (a) | Frontier (f) | Frontier_amd (famd) | Summit (s) | Wombat (w)"
echo " AMD HPCFund (amdfund)"
echo " Bridges2 (b) | Expanse (e) | Delta (d) | DeltaAI (dai)"
echo " Phoenix (p) | Richardson (r) | Oscar (o)"
echo " Carpenter Cray (cc) | Carpenter GNU (c) | Nautilus (n)"
echo " Isaac (i)"
echo " Omit to be shown the list of supported systems."
echo " -m, --mode MODE Configures into MODE."
echo " Options: gpu (g) | cpu (c)"
echo ""
Expand All @@ -38,12 +33,17 @@ while [[ $# -gt 0 ]]; do
done

# Get computer (if not supplied in command line)
# The slugs advertised below must match the cluster definitions in
# toolchain/modules; check_cluster_menu_slugs in toolchain/mfc/lint_source.py
# enforces that and keys on these two markers.
# lint: cluster-menu-begin
if [ -v $u_c ]; then
log "Select a system:"
log "$G""ORNL$W: Ascent (a) | Frontier (f) | Frontier_amd (famd) | Summit (s) | Wombat (w)"
log "$G""ORNL$W: Ascent (a) | Frontier (f) | Frontier_amd (famd) | Wombat (w)"
log "$B""LLNL $W: Tuolumne (tuo)"
log "$C""ACCESS$W: Bridges2 (b) | Expanse (e) | Delta (d) | DeltaAI (dai)"
log "$Y""Gatech$W: Phoenix (p)"
log "$Y""Gatech$W: Phoenix (p) | Phoenix IFX (pifx)"
log "$C""CSCS$W: Santis (san)"
log "$R""Caltech$W: Richardson (r)"
log "$BR""Brown$W: Oscar (o)"
log "$BR""Purdue$W: Anvil (pa)"
Expand All @@ -52,10 +52,11 @@ if [ -v $u_c ]; then
log "$OR""Florida$W: HiPerGator (h)"
log "$C""WPI $W: Turing (t)"
log "$R""AMD$W: HPCFund (amdfund)"
log_n "(${G}a${W}/${G}f${W}/${G}s${W}/${G}w${W}/${B}tuo${W}/${C}b${W}/${C}e${CR}/${C}d/${C}dai${CR}/${Y}p${CR}/${R}r${CR}/${B}cc${CR}/${B}c${CR}/${B}n${CR}/${BR}o${CR}/${BR}pa${CR}/${OR}i${CR}/${OR}h${CR}/${C}t${CR}/${R}amdfund${CR}): "
log_n "(${G}a${W}/${G}f${W}/${G}famd${W}/${G}w${W}/${B}tuo${W}/${C}b${W}/${C}e${CR}/${C}d/${C}dai${CR}/${Y}p${CR}/${Y}pifx${CR}/${C}san${CR}/${R}r${CR}/${B}cc${CR}/${B}c${CR}/${B}n${CR}/${BR}o${CR}/${BR}pa${CR}/${OR}i${CR}/${OR}h${CR}/${C}t${CR}/${R}amdfund${CR}): "
read u_c
log
fi
# lint: cluster-menu-end

# Get CPU/GPU (if not supplied in command-line)
if [ -v $u_cg ]; then
Expand Down
9 changes: 0 additions & 9 deletions toolchain/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,6 @@ def __run():
from mfc import init

init.init()
elif cmd == "interactive":
from mfc.user_guide import interactive_mode

interactive_mode()
elif cmd == "completion":
from mfc import completion

Expand Down Expand Up @@ -227,11 +223,6 @@ def __run():

lock.switch(state.MFCConfig.from_dict(state.gARG))

# Ensure IDE configuration is up to date (lightweight check)
from mfc.ide import ensure_vscode_settings

ensure_vscode_settings()

# Auto-regenerate completion scripts if source files changed
__ensure_generated_files()

Expand Down
11 changes: 0 additions & 11 deletions toolchain/mfc/args.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
is_first_time_user,
print_command_help,
print_help,
print_help_topics,
print_topic_help,
print_welcome,
)

Expand Down Expand Up @@ -96,15 +94,6 @@ def custom_error(message):
print_help()
sys.exit(0)

# Handle 'help' command
if args["command"] == "help":
topic = args.get("topic")
if topic:
print_topic_help(topic)
else:
print_help_topics()
sys.exit(0)

# Resolve command aliases
if args["command"] in COMMAND_ALIASES:
args["command"] = COMMAND_ALIASES[args["command"]]
Expand Down
3 changes: 0 additions & 3 deletions toolchain/mfc/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
from .printer import cons
from .run import input
from .state import ARG, CFG, gpuConfigOptions
from .user_guide import Tips

# Regex to parse build progress
# Ninja format: [42/156] Building Fortran object ...
Expand Down Expand Up @@ -506,7 +505,6 @@ def configure(self, case: Case):
cons.print(f" [bold red]✗[/bold red] Configuration failed for [magenta]{self.name}[/magenta]")
if verbosity < 2:
_show_build_error(result, "Configuration")
Tips.after_build_failure()
raise MFCException(f"Failed to configure the [bold magenta]{self.name}[/bold magenta] target.")

cons.print(f" [bold green]✓[/bold green] Configured [magenta]{self.name}[/magenta]")
Expand Down Expand Up @@ -553,7 +551,6 @@ def build(self, case: input.MFCInputFile):
cons.print(f" [bold red]✗[/bold red] Build failed for [magenta]{self.name}[/magenta]")
if verbosity < 2:
_show_build_error(result, "Build")
Tips.after_build_failure()
raise MFCException(f"Failed to build the [bold magenta]{self.name}[/bold magenta] target.")

cons.print(f" [bold green]✓[/bold green] Built [magenta]{self.name}[/magenta]")
Expand Down
Loading
Loading