Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ def ensemble_block(template_dict: Mapping) -> Mapping:
# 'sea_surface_temperature': 'ts_found',
# 'mole_fraction_of_carbon_dioxide_in_air': 'co2',
}
}
},
'pattern': '%mem%',
'nmembers': template_dict['ensemble_num_members'],
'zero padding': 3
},
'pattern': '%mem%',
'nmembers': template_dict['ensemble_num_members'],
'zero padding': 3
}
}

return ensemble_block
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,17 @@
# --------------------------------------------------------------------------------------------------


def ensemble_cube_mean_output(template_dict: Mapping) -> Mapping:
def ensemble_latlon_prior_mean_output(template_dict: Mapping) -> Mapping:

ensemble_cube_mean_output = {
'filetype': 'cube sphere history',
'provider': 'geos',
ensemble_latlon_prior_mean_output = {
'filetype': 'auxgrid',
'gridtype': 'latlon',
'datapath': template_dict['cycle_dir'],
'filename': 'geos.ensemblemean.%yyyy%mm%dd_%hh%MM%ssz.nc4',
'filename': 'geos.prior.mean.',
'field io names': field_io_names_ensemble
}

return ensemble_cube_mean_output
return ensemble_latlon_prior_mean_output


# --------------------------------------------------------------------------------------------------
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,17 @@
# --------------------------------------------------------------------------------------------------


def ensemble_cube_mean_output(template_dict: Mapping) -> Mapping:
def ensemble_latlon_prior_variance_output(template_dict: Mapping) -> Mapping:

ensemble_cube_mean_output = {
'filetype': 'cube sphere history',
'provider': 'geos',
ensemble_latlon_prior_variance_output = {
'filetype': 'auxgrid',
'gridtype': 'latlon',
'datapath': template_dict['cycle_dir'],
'filename': 'geos.ensemblevariance.%yyyy%mm%dd_%hh%MM%ssz.nc4',
'filename': 'geos.prior.variance.',
'field io names': field_io_names_ensemble
}

return ensemble_cube_mean_output
return ensemble_latlon_prior_variance_output


# --------------------------------------------------------------------------------------------------
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
# --------------------------------------------------------------------------------------------------

from collections.abc import Mapping
from swell.configuration.jedi.interfaces.geos_atmosphere.model.shared import field_io_names_ensemble

# --------------------------------------------------------------------------------------------------

Expand All @@ -19,17 +20,7 @@ def ensemble_mean_increment_output(template_dict: Mapping) -> Mapping:
'filetype': 'auxgrid',
'gridtype': 'latlon',
'filename': f'{cycle_dir}/geos.mean-inc.',
'field io names': {
'eastward_wind': 'ua',
'northward_wind': 'va',
'air_temperature': 't',
'air_pressure_at_surface': 'ps',
'air_pressure_levels': 'pe',
'water_vapor_mixing_ratio_wrt_moist_air': 'q',
'cloud_liquid_ice': 'qi',
'cloud_liquid_water': 'ql',
'mole_fraction_of_ozone_in_air': 'o3ppmv',
}
'field io names': field_io_names_ensemble
}

return ensemble_mean_increment_output
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@
'eastward_wind': 'ua',
'northward_wind': 'va',
'air_temperature': 't',
'air_pressure_at_surface': 'ps',
'air_pressure_levels': 'pe',
'water_vapor_mixing_ratio_wrt_moist_air': 'q',
'cloud_liquid_ice': 'qi',
Expand Down
4 changes: 2 additions & 2 deletions src/swell/configuration/jedi/oops/ensmeanvariance.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ def render_oops(self):
oops = {
'geometry': self.interface_model('geometry'),
'ensemble': self.interface_model('ensemble_block'),
'variance output': self.interface_model('ensemble_cube_variance_output'),
'mean output': self.interface_model('ensemble_cube_mean_output')
'variance output': self.interface_model('ensemble_latlon_prior_variance_output'),
'mean output': self.interface_model('ensemble_latlon_prior_mean_output')
}

return oops
Expand Down
Loading