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

Develop satellite #182

Merged
merged 148 commits into from
Nov 20, 2023
Merged

Develop satellite #182

merged 148 commits into from
Nov 20, 2023

Conversation

dwfncar
Copy link
Collaborator

@dwfncar dwfncar commented Jun 29, 2023

Initial PR for develop_satellite to develop, to start review comments.

mlirenzhenmayi and others added 30 commits October 25, 2021 14:54
added logic needed for pairing aeronet and fv3raqms.
First pull of satellite read in code.
Develop satellite - merging in everything.
…ME in fnames. Should this be done across the driver module?
melodies_monet/driver.py Outdated Show resolved Hide resolved
melodies_monet/driver.py Outdated Show resolved Hide resolved
melodies_monet/driver.py Outdated Show resolved Hide resolved
@dwfncar
Copy link
Collaborator Author

dwfncar commented Sep 26, 2023

Fixed

@dwfncar dwfncar closed this Sep 26, 2023
@dwfncar dwfncar reopened this Sep 26, 2023
@colin-harkins
Copy link
Collaborator

@dwfncar I went through and resolved the outstanding issues. The merge conflict I think should be resolved as follows:

                            if obs_type == 'pt_sfc': 
                                pairdf = pairdf.set_index(grp_dict['data_proc']['ts_select_time'])

                            # Specify ts_avg_window if noted in yaml file. 
                            if 'ts_avg_window' in grp_dict['data_proc'].keys():
                                a_w = grp_dict['data_proc']['ts_avg_window']
                            else:
                                a_w = None 

I think once that is fixed this is good to go.

Fixing final conflict.
@rrbuchholz
Copy link
Collaborator

rrbuchholz commented Oct 5, 2023

Fixed final conflict - should be good to merge.

If we remove "if obs_type == 'pt_sfc':" we could run into issues with xarray versus pandas dataframe.

Copy link
Collaborator

@colin-harkins colin-harkins left a comment

Choose a reason for hiding this comment

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

All of the recent changes look good to me.

@dwfncar dwfncar merged commit 067ef1e into develop Nov 20, 2023
4 checks passed
@dwfncar dwfncar deleted the develop_satellite branch November 20, 2023 18:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants