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

Added native versions of GEOS-FP as menu options in GCHP run directory creation #1230

Merged
merged 12 commits into from Jun 2, 2022

Conversation

LiamBindle
Copy link
Contributor

@LiamBindle LiamBindle commented Apr 26, 2022

This is a WIP. I'll add more in the coming days.

Things I need to check

  • fullchem + native GEOS-FP
  • fullchem + native GEOS-FP + mass fluxes
  • fullchem + normal GEOS-FP
  • fullchem + normal MERRA2

@LiamBindle LiamBindle added this to the 14.0.0 milestone Apr 26, 2022
@LiamBindle LiamBindle changed the title [WIP] Added native versions of GEOS-FP, MERRA2, and GEOS-IT as menu options in GCHP run directory creation [WIP] Added native versions of GEOS-FP as menu options in GCHP run directory creation May 20, 2022
@LiamBindle LiamBindle changed the title [WIP] Added native versions of GEOS-FP as menu options in GCHP run directory creation Added native versions of GEOS-FP as menu options in GCHP run directory creation May 20, 2022
@LiamBindle
Copy link
Contributor Author

LiamBindle commented May 20, 2022

This is ready to merge @msulprizio.

This adds "GEOS-FP native data" as an option to "Choose meteorology source:". If you select it, it also asks

Do you want to use mass fluxes for advection? (yes/no, default=no):
Do you want to use mass fluxes derived winds for advection? (yes/no, default=no):

The metfields for mass fluxes and mass flux derived winds are available here: http://geoschemdata.wustl.edu/ExtData/GEOS_C720/ (I'll add them to the input data catalogs once I've finished processing the backlog). FYI, @sdeastham.

Based on your response, it will initialize the run directory appropriately.

Copy link
Contributor

@msulprizio msulprizio left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@lizziel Will this cause any conflicts with #1259? Any preference on the order of merging this PR and that one? Both can probably go into 14.0.0-alpha.5.

Copy link
Contributor

@msulprizio msulprizio left a comment

Choose a reason for hiding this comment

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

Upon further review and testing, I've found these updates break GCClassic run directory creation. I think this may be because of lines added to run/shared/settings/geosfp.txt and run/shared/settings/merra2.txt. We are therefore going to have to exclude this update from the 14.0.0 release candidate.

@LiamBindle Could you please test this with both GCClassic and GCHP and push any fixes? PRs should pass integration tests for both GCClassic and GCHP before merging.

@msulprizio msulprizio modified the milestones: 14.0.0, 14.1.0 Jun 1, 2022
…re the shared metfield variables (which use RUNDIR_GRID_DIR). Previously, erroneous sort was getting correct order by mistake.
@LiamBindle
Copy link
Contributor Author

Sorry about that @msulprizio. I forgot to add an update to the copy of init_rd.sh. One of the updates was removing the sort command in ./createRunDir.sh so that multi-line template values can be used. After fixing that, I found RUNDIR_MET_DIR and RUNDIR_GRID_DIR were being defined in the wrong order but sort was happening to reorder them "correctly". Now that I removed the sort, I had to include the shared met settings (e.g., geosfp.txt) after the grid definition section.

I don't have the capability to run integration tests. Are you guys able to run that easily?

@LiamBindle
Copy link
Contributor Author

LiamBindle commented Jun 1, 2022

I should note I confirmed there's no difference in GEOS-FP or GCAP2 run directories with GC-Classic between alpha.3 and after this update.

006f7fa should make it so the order of RUNDIR_ variables doesn't matter.

@msulprizio msulprizio modified the milestones: 14.1.0, 14.0.0 Jun 2, 2022
@msulprizio
Copy link
Contributor

@LiamBindle Thanks for pushing those fixes. I tested on my end and this looks good to merge now.

@msulprizio msulprizio merged commit ab08f3e into dev Jun 2, 2022
@msulprizio msulprizio deleted the feature/native-met-and-mass-flux-menu-option branch June 2, 2022 13:51
@LiamBindle
Copy link
Contributor Author

Thanks Melissa!

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.

None yet

2 participants