From e19f52f2bd60a560a10bd22113ae0fa5236f2151 Mon Sep 17 00:00:00 2001 From: Kauser Zulfiqar Date: Fri, 11 Oct 2024 15:05:47 +0200 Subject: [PATCH 1/3] removed _write_info_json --- mumax3c/drivers/driver.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mumax3c/drivers/driver.py b/mumax3c/drivers/driver.py index 4385275..0e8b515 100644 --- a/mumax3c/drivers/driver.py +++ b/mumax3c/drivers/driver.py @@ -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") From 9fbd4249a305aeda4c1070b763d295026293abbf Mon Sep 17 00:00:00 2001 From: Martin Lang Date: Sun, 2 Feb 2025 14:35:45 +0100 Subject: [PATCH 2/3] Update nbval regex for timestamps --- nbval.cfg | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nbval.cfg b/nbval.cfg index 5f4201d..a0fc627 100644 --- a/nbval.cfg +++ b/nbval.cfg @@ -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 From 4f7596658921a6f80cc79d3a6fa00d2ee0ab6971 Mon Sep 17 00:00:00 2001 From: Martin Lang Date: Sun, 2 Feb 2025 14:51:25 +0100 Subject: [PATCH 3/3] Update timestamps --- ...tting-started-first-ubermag-notebook.ipynb | 4 +- docs/tutorial-standard-problem3.ipynb | 48 +++++++++---------- docs/tutorial-standard-problem4.ipynb | 4 +- docs/tutorial-standard-problem5.ipynb | 4 +- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/docs/getting-started-first-ubermag-notebook.ipynb b/docs/getting-started-first-ubermag-notebook.ipynb index cf1d3fb..04a9727 100644 --- a/docs/getting-started-first-ubermag-notebook.ipynb +++ b/docs/getting-started-first-ubermag-notebook.ipynb @@ -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" ] } ], @@ -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" ] }, { diff --git a/docs/tutorial-standard-problem3.ipynb b/docs/tutorial-standard-problem3.ipynb index 1150b73..9181b70 100644 --- a/docs/tutorial-standard-problem3.ipynb +++ b/docs/tutorial-standard-problem3.ipynb @@ -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" ] }, { @@ -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" ] }, { @@ -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" ] }, { @@ -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" ] } diff --git a/docs/tutorial-standard-problem4.ipynb b/docs/tutorial-standard-problem4.ipynb index a46b96b..2eddf16 100644 --- a/docs/tutorial-standard-problem4.ipynb +++ b/docs/tutorial-standard-problem4.ipynb @@ -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" ] } ], @@ -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" ] } ], diff --git a/docs/tutorial-standard-problem5.ipynb b/docs/tutorial-standard-problem5.ipynb index ba90a26..00f23d0 100644 --- a/docs/tutorial-standard-problem5.ipynb +++ b/docs/tutorial-standard-problem5.ipynb @@ -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" ] } ], @@ -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" ] } ],