Skip to content

[dsl]: Fix and cleanup GF2020 and GFDL_1M translate tests #12

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.

Sign up for GitHub

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

Merged
CharlesKrop merged 2 commits into from
Apr 1, 2026
Merged

[dsl]: Fix and cleanup GF2020 and GFDL_1M translate tests #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a5e1b5
fix/cleanup GF translate tests
romanc Apr 1, 2026
ad6b58f
fix / cleanup GFDL_1M translate tests
romanc Apr 1, 2026
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
1 change: 0 additions & 1 deletion ...p/pyMoist/pyMoist/convection/GF_2020/cumulus_parameterization/cumulus_parameterization.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,6 @@ def __init__(
)
self._static_control = StaticControl(
stencil_factory=stencil_factory,
quantity_factory=quantity_factory,
Copy link
Copy Markdown
Collaborator Author

@romanc romanc Apr 1, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fallout from cleanups in #11

config=config,
cumulus_parameterization_config=cumulus_parameterization_config,
)
Expand Down
19 changes: 6 additions & 13 deletions ...eterization/air_density/translate_GF2020_CumulusParameterization_HydrostaticAirDensity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ class TestCore:
def __init__(
self,
grid: Grid,
namelist: Namelist,
stencil_factory: StencilFactory,
in_vars: dict,
out_vars: dict,
Expand Down Expand Up @@ -114,14 +113,12 @@ class TranslateGF2020_CumulusParameterization_HydrostaticAirDensity_shallow(Tran
def __init__(
self,
grid: Grid,
namelist: Namelist,
_namelist: Namelist,
stencil_factory: StencilFactory,
):
super().__init__(grid, stencil_factory)
self.stencil_factory = stencil_factory
self.quantity_factory = grid.quantity_factory

self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars)
self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars)

def extra_data_load(self, data_loader: DataLoader):
self.constants = data_loader.load("GF2020-constants")
Expand All @@ -137,14 +134,12 @@ class TranslateGF2020_CumulusParameterization_HydrostaticAirDensity_mid(Translat
def __init__(
self,
grid: Grid,
namelist: Namelist,
_namelist: Namelist,
stencil_factory: StencilFactory,
):
super().__init__(grid, stencil_factory)
self.stencil_factory = stencil_factory
self.quantity_factory = grid.quantity_factory

self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars)
self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars)

def extra_data_load(self, data_loader: DataLoader):
self.constants = data_loader.load("GF2020-constants")
Expand All @@ -160,14 +155,12 @@ class TranslateGF2020_CumulusParameterization_HydrostaticAirDensity_deep(Transla
def __init__(
self,
grid: Grid,
namelist: Namelist,
_namelist: Namelist,
stencil_factory: StencilFactory,
):
super().__init__(grid, stencil_factory)
self.stencil_factory = stencil_factory
self.quantity_factory = grid.quantity_factory

self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars)
self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars)

def extra_data_load(self, data_loader: DataLoader):
self.constants = data_loader.load("GF2020-constants")
Expand Down
19 changes: 6 additions & 13 deletions ...mulus_parameterization/buoyancy/translate_GF2020_CumulusParameterization_GetBuoyancy_1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ class TestCore:
def __init__(
self,
grid: Grid,
namelist: Namelist,
stencil_factory: StencilFactory,
in_vars: dict,
out_vars: dict,
Expand Down Expand Up @@ -148,14 +147,12 @@ class TranslateGF2020_CumulusParameterization_GetBuoyancy_1_shallow(TranslateFor
def __init__(
self,
grid: Grid,
namelist: Namelist,
_namelist: Namelist,
stencil_factory: StencilFactory,
):
super().__init__(grid, stencil_factory)
self.stencil_factory = stencil_factory
self.quantity_factory = grid.quantity_factory

self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars)
self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars)

def extra_data_load(self, data_loader: DataLoader):
self.constants = data_loader.load("GF2020-constants")
Expand All @@ -171,14 +168,12 @@ class TranslateGF2020_CumulusParameterization_GetBuoyancy_1_mid(TranslateFortran
def __init__(
self,
grid: Grid,
namelist: Namelist,
_namelist: Namelist,
stencil_factory: StencilFactory,
):
super().__init__(grid, stencil_factory)
self.stencil_factory = stencil_factory
self.quantity_factory = grid.quantity_factory

self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars)
self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars)

def extra_data_load(self, data_loader: DataLoader):
self.constants = data_loader.load("GF2020-constants")
Expand All @@ -194,14 +189,12 @@ class TranslateGF2020_CumulusParameterization_GetBuoyancy_1_deep(TranslateFortra
def __init__(
self,
grid: Grid,
namelist: Namelist,
_namelist: Namelist,
stencil_factory: StencilFactory,
):
super().__init__(grid, stencil_factory)
self.stencil_factory = stencil_factory
self.quantity_factory = grid.quantity_factory

self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars)
self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars)

def extra_data_load(self, data_loader: DataLoader):
self.constants = data_loader.load("GF2020-constants")
Expand Down
19 changes: 6 additions & 13 deletions ...mulus_parameterization/buoyancy/translate_GF2020_CumulusParameterization_GetBuoyancy_2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ class TestCore:
def __init__(
self,
grid: Grid,
namelist: Namelist,
stencil_factory: StencilFactory,
in_vars: dict,
out_vars: dict,
Expand Down Expand Up @@ -144,14 +143,12 @@ class TranslateGF2020_CumulusParameterization_GetBuoyancy_2_shallow(TranslateFor
def __init__(
self,
grid: Grid,
namelist: Namelist,
_namelist: Namelist,
stencil_factory: StencilFactory,
):
super().__init__(grid, stencil_factory)
self.stencil_factory = stencil_factory
self.quantity_factory = grid.quantity_factory

self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars)
self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars)

def extra_data_load(self, data_loader: DataLoader):
self.constants = data_loader.load("GF2020-constants")
Expand All @@ -167,14 +164,12 @@ class TranslateGF2020_CumulusParameterization_GetBuoyancy_2_mid(TranslateFortran
def __init__(
self,
grid: Grid,
namelist: Namelist,
_namelist: Namelist,
stencil_factory: StencilFactory,
):
super().__init__(grid, stencil_factory)
self.stencil_factory = stencil_factory
self.quantity_factory = grid.quantity_factory

self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars)
self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars)

def extra_data_load(self, data_loader: DataLoader):
self.constants = data_loader.load("GF2020-constants")
Expand All @@ -190,14 +185,12 @@ class TranslateGF2020_CumulusParameterization_GetBuoyancy_2_deep(TranslateFortra
def __init__(
self,
grid: Grid,
namelist: Namelist,
_namelist: Namelist,
stencil_factory: StencilFactory,
):
super().__init__(grid, stencil_factory)
self.stencil_factory = stencil_factory
self.quantity_factory = grid.quantity_factory

self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars)
self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars)

def extra_data_load(self, data_loader: DataLoader):
self.constants = data_loader.load("GF2020-constants")
Expand Down
19 changes: 6 additions & 13 deletions ...mulus_parameterization/buoyancy/translate_GF2020_CumulusParameterization_GetBuoyancy_3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ class TestCore:
def __init__(
self,
grid: Grid,
namelist: Namelist,
stencil_factory: StencilFactory,
in_vars: dict,
out_vars: dict,
Expand Down Expand Up @@ -148,14 +147,12 @@ class TranslateGF2020_CumulusParameterization_GetBuoyancy_3_shallow(TranslateFor
def __init__(
self,
grid: Grid,
namelist: Namelist,
_namelist: Namelist,
stencil_factory: StencilFactory,
):
super().__init__(grid, stencil_factory)
self.stencil_factory = stencil_factory
self.quantity_factory = grid.quantity_factory

self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars)
self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars)

def extra_data_load(self, data_loader: DataLoader):
self.constants = data_loader.load("GF2020-constants")
Expand All @@ -171,14 +168,12 @@ class TranslateGF2020_CumulusParameterization_GetBuoyancy_3_mid(TranslateFortran
def __init__(
self,
grid: Grid,
namelist: Namelist,
_namelist: Namelist,
stencil_factory: StencilFactory,
):
super().__init__(grid, stencil_factory)
self.stencil_factory = stencil_factory
self.quantity_factory = grid.quantity_factory

self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars)
self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars)

def extra_data_load(self, data_loader: DataLoader):
self.constants = data_loader.load("GF2020-constants")
Expand All @@ -194,14 +189,12 @@ class TranslateGF2020_CumulusParameterization_GetBuoyancy_3_deep(TranslateFortra
def __init__(
self,
grid: Grid,
namelist: Namelist,
_namelist: Namelist,
stencil_factory: StencilFactory,
):
super().__init__(grid, stencil_factory)
self.stencil_factory = stencil_factory
self.quantity_factory = grid.quantity_factory

self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars)
self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars)

def extra_data_load(self, data_loader: DataLoader):
self.constants = data_loader.load("GF2020-constants")
Expand Down
19 changes: 6 additions & 13 deletions ...on/convection_tracers/translate_GF2020_Cumulus_Parameterization_AtmosphericComposition.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ class TestCore:
def __init__(
self,
grid: Grid,
namelist: Namelist,
stencil_factory: StencilFactory,
in_vars: dict,
out_vars: dict,
Expand Down Expand Up @@ -321,14 +320,12 @@ class TranslateGF2020_CumulusParameterization_AtmosphericComposition_shallow(Tra
def __init__(
self,
grid: Grid,
namelist: Namelist,
_namelist: Namelist,
stencil_factory: StencilFactory,
):
super().__init__(grid, stencil_factory)
self.stencil_factory = stencil_factory
self.quantity_factory = grid.quantity_factory

self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars)
self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars)

def extra_data_load(self, data_loader: DataLoader):
self.constants = data_loader.load("GF2020-constants")
Expand All @@ -355,14 +352,12 @@ class TranslateGF2020_CumulusParameterization_AtmosphericComposition_mid(Transla
def __init__(
self,
grid: Grid,
namelist: Namelist,
_namelist: Namelist,
stencil_factory: StencilFactory,
):
super().__init__(grid, stencil_factory)
self.stencil_factory = stencil_factory
self.quantity_factory = grid.quantity_factory

self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars)
self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars)

def extra_data_load(self, data_loader: DataLoader):
self.constants = data_loader.load("GF2020-constants")
Expand All @@ -387,14 +382,12 @@ class TranslateGF2020_CumulusParameterization_AtmosphericComposition_deep(Transl
def __init__(
self,
grid: Grid,
namelist: Namelist,
_namelist: Namelist,
stencil_factory: StencilFactory,
):
super().__init__(grid, stencil_factory)
self.stencil_factory = stencil_factory
self.quantity_factory = grid.quantity_factory

self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars)
self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars)

def extra_data_load(self, data_loader: DataLoader):
self.constants = data_loader.load("GF2020-constants")
Expand Down
19 changes: 6 additions & 13 deletions ...s_parameterization/diurnal_cycle/translate_GF2020_CumulusParameterization_DiurnalCycle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ class TestCore:
def __init__(
self,
grid: Grid,
namelist: Namelist,
stencil_factory: StencilFactory,
in_vars: dict,
out_vars: dict,
Expand Down Expand Up @@ -194,14 +193,12 @@ class TranslateGF2020_CumulusParameterization_DiurnalCycle_shallow(TranslateFort
def __init__(
self,
grid: Grid,
namelist: Namelist,
_namelist: Namelist,
stencil_factory: StencilFactory,
):
super().__init__(grid, stencil_factory)
self.stencil_factory = stencil_factory
self.quantity_factory = grid.quantity_factory

self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars)
self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars)

def extra_data_load(self, data_loader: DataLoader):
self.constants = data_loader.load("GF2020-constants")
Expand All @@ -217,14 +214,12 @@ class TranslateGF2020_CumulusParameterization_DiurnalCycle_mid(TranslateFortranD
def __init__(
self,
grid: Grid,
namelist: Namelist,
_namelist: Namelist,
stencil_factory: StencilFactory,
):
super().__init__(grid, stencil_factory)
self.stencil_factory = stencil_factory
self.quantity_factory = grid.quantity_factory

self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars)
self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars)

def extra_data_load(self, data_loader: DataLoader):
self.constants = data_loader.load("GF2020-constants")
Expand All @@ -240,14 +235,12 @@ class TranslateGF2020_CumulusParameterization_DiurnalCycle_deep(TranslateFortran
def __init__(
self,
grid: Grid,
namelist: Namelist,
_namelist: Namelist,
stencil_factory: StencilFactory,
):
super().__init__(grid, stencil_factory)
self.stencil_factory = stencil_factory
self.quantity_factory = grid.quantity_factory

self.test_core = TestCore(grid, namelist, stencil_factory, self.in_vars, self.out_vars)
self.test_core = TestCore(grid, stencil_factory, self.in_vars, self.out_vars)

def extra_data_load(self, data_loader: DataLoader):
self.constants = data_loader.load("GF2020-constants")
Expand Down
Loading
Loading