Skip to content

Commit

Permalink
Merge branch 'master' into pre-commit-ci-update-config
Browse files Browse the repository at this point in the history
  • Loading branch information
@lang-m
lang-m authored Feb 3, 2025
2 parents bce0f61 + 4d2d196 commit 98e3465
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 36 deletions.
4 changes: 2 additions & 2 deletions docs/getting-started-first-ubermag-notebook.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Running mumax3 (ExeMumax3Runner)[2022/06/22 11:25]... (0.5 s)\n"
"Running mumax3 (ExeMumax3Runner)[2022-06-22T11:25:00]... (0.5 s)\n"
]
}
],
Expand Down Expand Up @@ -338,7 +338,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Running mumax3 (ExeMumax3Runner)[2022/06/22 11:25]... (0.2 s)\n"
"Running mumax3 (ExeMumax3Runner)[2022-06-22T11:25:00]... (0.2 s)\n"
]
},
{
Expand Down
48 changes: 24 additions & 24 deletions docs/tutorial-standard-problem3.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"L= 8, m_init_vortex Running mumax3 (ExeMumax3Runner)[2022/06/22 11:23]... (3.4 s)\n"
"L= 8, m_init_vortex Running mumax3 (ExeMumax3Runner)[2022-06-22T11:23:00]... (3.4 s)\n"
]
},
{
Expand Down Expand Up @@ -190,7 +190,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"L= 8, m_init_flower Running mumax3 (ExeMumax3Runner)[2022/06/22 11:23]... (1.3 s)\n"
"L= 8, m_init_flower Running mumax3 (ExeMumax3Runner)[2022-06-22T11:23:00]... (1.3 s)\n"
]
},
{
Expand Down Expand Up @@ -238,16 +238,16 @@
"name": "stdout",
"output_type": "stream",
"text": [
"L= 8.0, m_init_vortex Running mumax3 (ExeMumax3Runner)[2022/06/22 11:23]... (3.3 s)\n",
"L= 8.0, m_init_flower Running mumax3 (ExeMumax3Runner)[2022/06/22 11:23]... (1.3 s)\n",
"L= 8.25, m_init_vortex Running mumax3 (ExeMumax3Runner)[2022/06/22 11:23]... (2.8 s)\n",
"L= 8.25, m_init_flower Running mumax3 (ExeMumax3Runner)[2022/06/22 11:23]... (1.3 s)\n",
"L= 8.5, m_init_vortex Running mumax3 (ExeMumax3Runner)[2022/06/22 11:23]... (2.5 s)\n",
"L= 8.5, m_init_flower Running mumax3 (ExeMumax3Runner)[2022/06/22 11:23]... (1.4 s)\n",
"L= 8.75, m_init_vortex Running mumax3 (ExeMumax3Runner)[2022/06/22 11:23]... (2.2 s)\n",
"L= 8.75, m_init_flower Running mumax3 (ExeMumax3Runner)[2022/06/22 11:23]... (1.5 s)\n",
"L= 9.0, m_init_vortex Running mumax3 (ExeMumax3Runner)[2022/06/22 11:24]... (2.1 s)\n",
"L= 9.0, m_init_flower Running mumax3 (ExeMumax3Runner)[2022/06/22 11:24]... (1.6 s)\n"
"L= 8.0, m_init_vortex Running mumax3 (ExeMumax3Runner)[2022-06-22T11:23:00]... (3.3 s)\n",
"L= 8.0, m_init_flower Running mumax3 (ExeMumax3Runner)[2022-06-22T11:23:00]... (1.3 s)\n",
"L= 8.25, m_init_vortex Running mumax3 (ExeMumax3Runner)[2022-06-22T11:23:00]... (2.8 s)\n",
"L= 8.25, m_init_flower Running mumax3 (ExeMumax3Runner)[2022-06-22T11:23:00]... (1.3 s)\n",
"L= 8.5, m_init_vortex Running mumax3 (ExeMumax3Runner)[2022-06-22T11:23:00]... (2.5 s)\n",
"L= 8.5, m_init_flower Running mumax3 (ExeMumax3Runner)[2022-06-22T11:23:00]... (1.4 s)\n",
"L= 8.75, m_init_vortex Running mumax3 (ExeMumax3Runner)[2022-06-22T11:23:00]... (2.2 s)\n",
"L= 8.75, m_init_flower Running mumax3 (ExeMumax3Runner)[2022-06-22T11:23:00]... (1.5 s)\n",
"L= 9.0, m_init_vortex Running mumax3 (ExeMumax3Runner)[2022-06-22T11:24:00]... (2.1 s)\n",
"L= 9.0, m_init_flower Running mumax3 (ExeMumax3Runner)[2022-06-22T11:24:00]... (1.6 s)\n"
]
},
{
Expand Down Expand Up @@ -314,18 +314,18 @@
"name": "stdout",
"output_type": "stream",
"text": [
"L= 8.0, m_init_vortex Running mumax3 (ExeMumax3Runner)[2022/06/22 11:24]... (3.4 s)\n",
"L= 8.0, m_init_flower Running mumax3 (ExeMumax3Runner)[2022/06/22 11:24]... (1.3 s)\n",
"L= 9.0, m_init_vortex Running mumax3 (ExeMumax3Runner)[2022/06/22 11:24]... (2.1 s)\n",
"L= 9.0, m_init_flower Running mumax3 (ExeMumax3Runner)[2022/06/22 11:24]... (1.6 s)\n",
"L= 8.5, m_init_vortex Running mumax3 (ExeMumax3Runner)[2022/06/22 11:24]... (2.5 s)\n",
"L= 8.5, m_init_flower Running mumax3 (ExeMumax3Runner)[2022/06/22 11:24]... (1.4 s)\n",
"L= 8.25, m_init_vortex Running mumax3 (ExeMumax3Runner)[2022/06/22 11:24]... (2.8 s)\n",
"L= 8.25, m_init_flower Running mumax3 (ExeMumax3Runner)[2022/06/22 11:24]... (1.3 s)\n",
"L= 8.375, m_init_vortex Running mumax3 (ExeMumax3Runner)[2022/06/22 11:24]... (2.6 s)\n",
"L= 8.375, m_init_flower Running mumax3 (ExeMumax3Runner)[2022/06/22 11:24]... (1.4 s)\n",
"L= 8.4375, m_init_vortex Running mumax3 (ExeMumax3Runner)[2022/06/22 11:24]... (2.6 s)\n",
"L= 8.4375, m_init_flower Running mumax3 (ExeMumax3Runner)[2022/06/22 11:24]... (1.4 s)\n",
"L= 8.0, m_init_vortex Running mumax3 (ExeMumax3Runner)[2022-06-22T11:24:00]... (3.4 s)\n",
"L= 8.0, m_init_flower Running mumax3 (ExeMumax3Runner)[2022-06-22T11:24:00]... (1.3 s)\n",
"L= 9.0, m_init_vortex Running mumax3 (ExeMumax3Runner)[2022-06-22T11:24:00]... (2.1 s)\n",
"L= 9.0, m_init_flower Running mumax3 (ExeMumax3Runner)[2022-06-22T11:24:00]... (1.6 s)\n",
"L= 8.5, m_init_vortex Running mumax3 (ExeMumax3Runner)[2022-06-22T11:24:00]... (2.5 s)\n",
"L= 8.5, m_init_flower Running mumax3 (ExeMumax3Runner)[2022-06-22T11:24:00]... (1.4 s)\n",
"L= 8.25, m_init_vortex Running mumax3 (ExeMumax3Runner)[2022-06-22T11:24:00]... (2.8 s)\n",
"L= 8.25, m_init_flower Running mumax3 (ExeMumax3Runner)[2022-06-22T11:24:00]... (1.3 s)\n",
"L= 8.375, m_init_vortex Running mumax3 (ExeMumax3Runner)[2022-06-22T11:24:00]... (2.6 s)\n",
"L= 8.375, m_init_flower Running mumax3 (ExeMumax3Runner)[2022-06-22T11:24:00]... (1.4 s)\n",
"L= 8.4375, m_init_vortex Running mumax3 (ExeMumax3Runner)[2022-06-22T11:24:00]... (2.6 s)\n",
"L= 8.4375, m_init_flower Running mumax3 (ExeMumax3Runner)[2022-06-22T11:24:00]... (1.4 s)\n",
"The transition between vortex and flower states occurs at 8.4375*lex\n"
]
}
Expand Down
4 changes: 2 additions & 2 deletions docs/tutorial-standard-problem4.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Running mumax3 (ExeMumax3Runner)[2022/06/22 11:39]... (0.9 s)\n"
"Running mumax3 (ExeMumax3Runner)[2022-06-22T11:39:00]... (0.9 s)\n"
]
}
],
Expand Down Expand Up @@ -494,7 +494,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Running mumax3 (ExeMumax3Runner)[2022/06/22 11:39]... (0.9 s)\n"
"Running mumax3 (ExeMumax3Runner)[2022-06-22T11:39:00]... (0.9 s)\n"
]
}
],
Expand Down
4 changes: 2 additions & 2 deletions docs/tutorial-standard-problem5.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Running mumax3 (ExeMumax3Runner)[2023/01/18 17:49]... (3.5 s)\n"
"Running mumax3 (ExeMumax3Runner)[2023-01-18T17:49:00]... (3.5 s)\n"
]
}
],
Expand Down Expand Up @@ -299,7 +299,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Running mumax3 (ExeMumax3Runner)[2023/01/18 17:49]... (14.6 s)\n"
"Running mumax3 (ExeMumax3Runner)[2023-01-18T17:49:00]... (14.6 s)\n"
]
}
],
Expand Down
4 changes: 0 additions & 4 deletions mumax3c/drivers/driver.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,6 @@ def write_mx3(self, system, dirname=".", ovf_format="bin8", abspath=True, **kwar
with open(self._mx3filename(system), "w", encoding="utf-8") as mx3file:
mx3file.write(mx3)

# Generate and save json info file for a drive (not compute).
if True: # compute is None: # TODO does mumxa3 support compute?
self._write_info_json(system, **kwargs)

# TODO if self/system is modified for mx3 creation reset it here
delattr(system, "region_relator")

Expand Down
8 changes: 6 additions & 2 deletions nbval.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,18 @@ replace: \(OOMMFRunner\)
regex: \w+OOMMFRunner\(.*\)
replace: OOMMFRunner

[timestamp]
regex: \d{4}-\d{2}-d{2}T\d{2}:\d{2}:\d{2}
replace: TIME-STAMP

[timestamp-date]
regex: \d{4}([/-])\d{2}\1\d{2}
replace: TIME-STAMP
replace: TIME-STAMP-DATE
# matches: 2020-01-01 and 2020/01/01

[timestamp-time]
regex: \d{2}(:\d{2}){1,2}
replace: TIME-STAMP
replace: TIME-STAMP-TIME

[oommf runtime]
regex: [0-9.]+ s
Expand Down

0 comments on commit 98e3465

Please sign in to comment.