-
Notifications
You must be signed in to change notification settings - Fork 168
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
Remove f000 from atmos rocoto tasks for replay cases #2778
Merged
aerorahul
merged 25 commits into
NOAA-EMC:develop
from
EricSinsky-NOAA:feature/issue2771
Jul 29, 2024
Merged
Changes from 21 commits
Commits
Show all changes
25 commits
Select commit
Hold shift + click to select a range
9e6206c
Update linters.yaml
EricSinsky-NOAA 4e13fbe
Revert changes in linters.yaml
EricSinsky-NOAA 1eb0c26
Merge branch 'NOAA-EMC:develop' into develop
EricSinsky-NOAA 720276b
Merge branch 'NOAA-EMC:develop' into develop
EricSinsky-NOAA 219adb2
Merge branch 'NOAA-EMC:develop' into develop
EricSinsky-NOAA 37e2a6f
Merge branch 'NOAA-EMC:develop' into develop
EricSinsky-NOAA b7ba980
Merge branch 'NOAA-EMC:develop' into develop
EricSinsky-NOAA a3efe66
Merge branch 'NOAA-EMC:develop' into develop
EricSinsky-NOAA 12e1ec1
Merge branch 'NOAA-EMC:develop' into develop
EricSinsky-NOAA e114de5
Merge branch 'NOAA-EMC:develop' into develop
EricSinsky-NOAA e09f27d
Merge branch 'NOAA-EMC:develop' into develop
EricSinsky-NOAA 3fdcdae
Use FHMIN_GFS for atmos component in tasks.py
EricSinsky-NOAA 235ee26
Use FHMIN_GFS in FV3_predet
EricSinsky-NOAA 61b14e9
Merge remote-tracking branch 'EMC/develop' into feature/issue2771
EricSinsky-NOAA b8fec2a
Revert "Use FHMIN_GFS in FV3_predet"
EricSinsky-NOAA c8b49e2
Use offset_start_hour as atmos fhmin
EricSinsky-NOAA 6e132ad
Simplify variable definitions
EricSinsky-NOAA 82dd2b6
Remove 0 from fhrs in gefs/gfs tasks for ocn/ice
EricSinsky-NOAA c7fe7e7
Remove f000 task for atmos_prod when replaying
EricSinsky-NOAA 5d0a31c
Remove f000 task for atmos_ensstat when replaying
EricSinsky-NOAA 9e004a5
Add Neil Barton's bugfix in exglobal_stage_ic
EricSinsky-NOAA 1f6c580
Remove deep copy according to reviewer's comment
EricSinsky-NOAA fcac4e9
Merge remote-tracking branch 'EMC/develop' into feature/issue2771
EricSinsky-NOAA c3d3e9c
Merge remote-tracking branch 'EMC/develop' into feature/issue2771
EricSinsky-NOAA 09b60c1
Merge branch 'develop' into feature/issue2771
aerorahul File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||||
---|---|---|---|---|---|---|---|---|
|
@@ -270,6 +270,17 @@ def _atmosoceaniceprod(self, component: str): | |||||||
'maxtries': '&MAXTRIES;'} | ||||||||
|
||||||||
fhrs = self._get_forecast_hours('gefs', self._configs[config], component) | ||||||||
|
||||||||
# when replaying, atmos component does not have fhr 0, therefore remove 0 from fhrs | ||||||||
local_config = self._configs[config].deepcopy() | ||||||||
is_replay = local_config['REPLAY_ICS'] | ||||||||
if is_replay and component in ['atmos'] and 0 in fhrs: | ||||||||
fhrs.remove(0) | ||||||||
|
||||||||
# ocean/ice components do not have fhr 0 as they are averaged output | ||||||||
if component in ['ocean', 'ice'] and 0 in fhrs: | ||||||||
fhrs.remove(0) | ||||||||
|
||||||||
fhr_var_dict = {'fhr': ' '.join([f"{fhr:03d}" for fhr in fhrs])} | ||||||||
|
||||||||
fhr_metatask_dict = {'task_name': f'{component}_prod_#member#', | ||||||||
|
@@ -314,6 +325,13 @@ def atmos_ensstat(self): | |||||||
'maxtries': '&MAXTRIES;'} | ||||||||
|
||||||||
fhrs = self._get_forecast_hours('gefs', self._configs['atmos_ensstat']) | ||||||||
|
||||||||
# when replaying, atmos component does not have fhr 0, therefore remove 0 from fhrs | ||||||||
local_config = self._configs['atmos_ensstat'].deepcopy() | ||||||||
is_replay = local_config['REPLAY_ICS'] | ||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same here
Suggested change
|
||||||||
if is_replay and 0 in fhrs: | ||||||||
fhrs.remove(0) | ||||||||
|
||||||||
fhr_var_dict = {'fhr': ' '.join([f"{fhr:03d}" for fhr in fhrs])} | ||||||||
|
||||||||
fhr_metatask_dict = {'task_name': f'atmos_ensstat', | ||||||||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think we need to make a deep copy here. We're not changing the configs, just reading them. We can use the original for that.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure. Deep copy has been removed here and for atmos_ensstat.