Skip to content

Commit 88a7159

Browse files
committed
refactor convergence target schema (#322)
* refactor convergence target schema * add convergence test module * generalize get_convergence_value * revert Results removal * rename to threshold_type * fix convergence test module * clean and ruff * ruff format * fix bool treatment in tests * fix reference assignment * doc string format fix * docstring fixes * update with parsing refactor * ruff
1 parent fb69089 commit 88a7159

File tree

6 files changed

+1050
-158
lines changed

6 files changed

+1050
-158
lines changed

src/nomad_simulations/schema_packages/general.py

Lines changed: 1 addition & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -151,49 +151,10 @@ class BaseSimulation(Activity, SimulationTime):
151151
links=['https://liusemweb.github.io/mdo/core/1.1/index.html#Calculation']
152152
)
153153

154-
datetime_end = Quantity(
155-
type=Datetime,
156-
description="""
157-
The date and time when this computation ended.
158-
""",
159-
)
160-
161-
cpu1_start = Quantity(
162-
type=np.float64,
163-
unit='second',
164-
description="""
165-
The starting time of the computation on the (first) CPU 1.
166-
""",
167-
)
168-
169-
cpu1_end = Quantity(
170-
type=np.float64,
171-
unit='second',
172-
description="""
173-
The end time of the computation on the (first) CPU 1.
174-
""",
175-
)
176-
177-
wall_start = Quantity(
178-
type=np.float64,
179-
unit='second',
180-
description="""
181-
The internal wall-clock time from the starting of the computation.
182-
""",
183-
)
184-
185-
wall_end = Quantity(
186-
type=np.float64,
187-
unit='second',
188-
description="""
189-
The internal wall-clock time from the end of the computation.
190-
""",
191-
)
192-
193154
finished_without_errors = Quantity(
194155
type=bool,
195156
description="""
196-
Indicates whether this code run terminated without error (true),
157+
Indicates whether this code run terminated without error (true),
197158
or if it exited with an error code unequal to zero (false).
198159
""",
199160
)

src/nomad_simulations/schema_packages/workflow/__init__.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
11
from .dmft import DFTTBDMFTWorkflow
22
from .elastic import Elastic
33
from .equation_of_state import EquationOfState
4-
from .general import ParallelWorkflow, SerialWorkflow, SimulationWorkflow
4+
from .general import (
5+
ChargeConvergenceTarget,
6+
EnergyConvergenceTarget,
7+
ForceConvergenceTarget,
8+
ParallelWorkflow,
9+
PotentialConvergenceTarget,
10+
SerialWorkflow,
11+
SimulationWorkflow,
12+
WorkflowConvergenceResults,
13+
WorkflowConvergenceTarget,
14+
)
515
from .geometry_optimization import GeometryOptimization
616
from .gw import DFTGWWorkflow
717
from .max_ent import DMFTMaxEntWorkflow

0 commit comments

Comments
 (0)