Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add test class for ACCESS-ESM1.6 #122

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
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
8 changes: 7 additions & 1 deletion src/model_config_tests/models/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
from model_config_tests.models.accessesm1p5 import AccessEsm1p5
from model_config_tests.models.accessesm1p6 import AccessEsm1p6
from model_config_tests.models.accessom2 import AccessOm2
from model_config_tests.models.accessom3 import AccessOm3

# Mapping payu configuration model name to class
index = {"access-om2": AccessOm2, "access-om3": AccessOm3, "access": AccessEsm1p5}
index = {
"access-om2": AccessOm2,
"access-om3": AccessOm3,
"access": AccessEsm1p5,
"access-esm1.6": AccessEsm1p6,
}
5 changes: 3 additions & 2 deletions src/model_config_tests/models/accessesm1p5.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ def __init__(self, experiment):
# Override model default runtime
self.default_runtime_seconds = DEFAULT_RUNTIME_SECONDS

self.output_file = self.output_0 / "access.out"
self.output_filename = "access.out"
self.output_file = self.output_0 / self.output_filename

def set_model_runtime(
self, years: int = 0, months: int = 0, seconds: int = DEFAULT_RUNTIME_SECONDS
Expand Down Expand Up @@ -57,7 +58,7 @@ def extract_checksums(
) -> dict[str, Any]:
"""Parse output file and create checksum using defined schema"""
if output_directory:
output_filename = output_directory / "access.out"
output_filename = output_directory / self.output_filename
else:
output_filename = self.output_file

Expand Down
11 changes: 11 additions & 0 deletions src/model_config_tests/models/accessesm1p6.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
"""Specific ACCESS-ESM1.6 Model setup and post-processing"""

from model_config_tests.models.accessesm1p5 import AccessEsm1p5


class AccessEsm1p6(AccessEsm1p5):
def __init__(self, experiment):
super().__init__(experiment)

self.output_filename = "access-esm1.6.out"
self.output_file = self.output_0 / self.output_filename
5 changes: 3 additions & 2 deletions src/model_config_tests/models/accessom2.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
class AccessOm2(Model):
def __init__(self, experiment):
super().__init__(experiment)
self.output_file = self.output_0 / "access-om2.out"
self.output_filename = "access-om2.out"
self.output_file = self.output_0 / self.output_filename

self.accessom2_config = experiment.control_path / "accessom2.nml"
self.ocean_config = experiment.control_path / "ocean" / "input.nml"
Expand Down Expand Up @@ -48,7 +49,7 @@ def extract_checksums(
) -> dict[str, Any]:
"""Parse output file and create checksum using defined schema"""
if output_directory:
output_filename = output_directory / "access-om2.out"
output_filename = output_directory / self.output_filename
else:
output_filename = self.output_file

Expand Down
5 changes: 3 additions & 2 deletions src/model_config_tests/models/accessom3.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ def __init__(self, experiment):
self.output_0 = self.experiment.restart000
self.output_1 = self.experiment.restart001

self.mom_restart_pointer = self.output_0 / "rpointer.ocn"
self.mom_restart_pointer_filename = "rpointer.ocn"
self.mom_restart_pointer = self.output_0 / self.mom_restart_pointer_filename
self.runconfig = experiment.control_path / "nuopc.runconfig"
self.wav_in = experiment.control_path / "wav_in"

Expand Down Expand Up @@ -82,7 +83,7 @@ def extract_checksums(
) -> dict[str, Any]:
"""Parse output file and create checksum using defined schema"""
if output_directory:
mom_restart_pointer = output_directory / "rpointer.ocn"
mom_restart_pointer = output_directory / self.mom_restart_pointer_filename
else:
mom_restart_pointer = self.mom_restart_pointer

Expand Down
Loading