Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
3 changes: 1 addition & 2 deletions simpeg_drivers/components/factories/directives_factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,7 @@ def scale_misfits(self):
):
nested_tiles = self.driver.get_nested_tiles()
self._scale_misfits = directives.ScaleMisfitMultipliers(
self.params.geoh5.h5file.parent
/ f"ChiFactors_{self.driver.logger.start_date_time}.log",
self.params.geoh5.h5file.parent / "ChiFactors.log",
nested_tiles,
Comment thread
domfournier marked this conversation as resolved.
target_chi=self.params.cooling_schedule.chi_factor,
)
Expand Down
9 changes: 6 additions & 3 deletions simpeg_drivers/driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -778,9 +778,12 @@ def __init__(self, driver):

self.initial_time = time()
self.start_date_time = datetime.now().strftime("%Y%m%d_%Hh%Mm%Ss")
self.logfile = self.get_path(f"SimPEG_{self.start_date_time}.log")
self.logfile = self.get_path("SimPEG.log")

def start(self):
if self.logfile.is_file():
self.logfile.unlink()

Comment thread
benk-mira marked this conversation as resolved.
self.write(
f"Running simpeg-drivers {__version__}\n"
f"Started {self.start_date_time}\n"
Expand All @@ -803,9 +806,9 @@ def close(self):
def flush(self):
pass

def get_path(self, filepath: str | Path) -> str:
def get_path(self, filepath: str | Path) -> Path:
root_directory = Path(self.driver.workspace.h5file).parent
return str(root_directory / filepath)
return root_directory / filepath


def driver_class_from_name(
Expand Down
12 changes: 3 additions & 9 deletions tests/run_tests/driver_grav_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,7 @@ def test_gravity_run(
assert driver.directives.directive_list[0].chifact_start == 0.75
assert driver.directives.directive_list[0].chifact_target == 0.75

with open(
workpath.parent / f"SimPEG_{driver.logger.start_date_time}.log", encoding="utf8"
) as file:
with open(workpath.parent / "SimPEG.log", encoding="utf8") as file:
content = file.read()
assert "Target Misfit: 3.00e+00 (3 data with chifact = 1.0)" in content
assert "IRLS Start Misfit: 3.00e+00 (3 data with chifact = 1.0)" in content
Expand All @@ -198,12 +196,8 @@ def test_gravity_run(
)
output["data"] = orig_gz

assert (
len(run_ws.get_entity(f"SimPEG_{driver.logger.start_date_time}.log")) == 1
)
assert (
len(run_ws.get_entity(f"SimPEG_{driver.logger.start_date_time}.out")) == 1
)
assert len(run_ws.get_entity("SimPEG.log")) == 2
assert len(run_ws.get_entity("SimPEG.out")) == 1
Comment thread
domfournier marked this conversation as resolved.

if pytest:
check_target(output, target_run)
Expand Down
Loading