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

Upgrade develop to v14.3.1 #19

Merged
merged 30 commits into from
Aug 20, 2024
Merged

Conversation

jwallwork23
Copy link
Collaborator

Closes #17.

Linked PRs:
fetch4/geos-chem#5
fetch4/HEMCO#3

Second attempt at #18 using a rebased version of the dev/giss-gc-14 branch.

@jwallwork23 jwallwork23 added the enhancement New feature or request label Aug 9, 2024
@jwallwork23 jwallwork23 self-assigned this Aug 9, 2024
@jwallwork23 jwallwork23 changed the base branch from main to develop August 9, 2024 10:58
@jwallwork23 jwallwork23 force-pushed the jwallwork23/giss-gc-14-rebased branch from fb1270e to 16597f5 Compare August 9, 2024 11:00
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

These changes were already approved as part of #3.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

These changes were already approved as part of #3.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

These changes were already approved as part of #3.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

These changes were already approved as part of #3.

@jwallwork23 jwallwork23 force-pushed the jwallwork23/giss-gc-14-rebased branch from 4a0e8c6 to 53694dc Compare August 15, 2024 09:48
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

There are several TODOs in this file but I think it'd be fine to follow them up in subsequent issues.

@jwallwork23
Copy link
Collaborator Author

I think this is pretty much good to go but let's discuss this in the meeting next week. Feel free to leave comments in the meantime.

@jwallwork23 jwallwork23 linked an issue Aug 15, 2024 that may be closed by this pull request
Comment on lines -51 to -71
! Indices to radiatively active species
INTEGER :: i_H2O = 0
INTEGER :: i_CO2 = 0
INTEGER :: i_O3 = 0
INTEGER :: i_O2 = 0
INTEGER :: i_NO2 = 0
INTEGER :: i_N2O = 0
INTEGER :: i_CH4 = 0
INTEGER :: i_CFC11 = 0
INTEGER :: i_CFC12 = 0
INTEGER :: i_N2 = 0
INTEGER :: i_CFCY = 0
INTEGER :: i_CFCZ = 0
INTEGER :: i_SO2 = 0
INTEGER :: i_SO4 = 0
INTEGER :: i_NIT = 0
INTEGER :: i_OCPI = 0
INTEGER :: i_OCPO = 0
INTEGER :: i_BCPI = 0
INTEGER :: i_BCPO = 0
INTEGER :: i_SOAS = 0
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This is a change versus the previous implementation rather than GISS modelE itself.

Comment on lines +218 to +219
use CLOUDS_COM, only : pficu, pflcu, pfilsan, pfllsan
use CLOUDS_COM, only : dtrain, dqrcu, dqrlsan, reevapcn, reevapls, cmfmc
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This is to make these available to GEOS-Chem whilst avoiding a recursive dependency.

Comment on lines +1776 to +1781
#ifdef TRACERS_GC
k = k + 1
catshapes(k) = 'aijlh'; categories(k) = 'taijlh'
input_sizes3(k) = lm
call tijlh_defs(diaglists(1,k),nmax_possible,diaglens(k))
#endif
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Adds the ability to have GEOS-Chem tracers outputted at hourly timescales.

Backbone for how to translate #23.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This is the interface itself based on variables defined in CHEM_COM.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

It mimics main.F90 to have GEOS-Chem as a CTM.

@@ -267,9 +271,10 @@ SUBROUTINE DO_CHEM
State_Met%LAI (II,JJ) = lai_save(i,j)

! Land/water/ice indices [1]
State_Met%LWI (II,JJ) = 1
Copy link
Collaborator Author

@jwallwork23 jwallwork23 Aug 20, 2024

Choose a reason for hiding this comment

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

LWI = land, water, ice. (1, 0, 2 resp.)

Copy link

@AmyOctoCat AmyOctoCat left a comment

Choose a reason for hiding this comment

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

We did a live walkthrough together and this LGTM. :)

@jwallwork23 jwallwork23 merged commit b12e037 into develop Aug 20, 2024
1 check passed
@jwallwork23 jwallwork23 deleted the jwallwork23/giss-gc-14-rebased branch August 20, 2024 15:32
This was referenced Aug 20, 2024
@jwallwork23 jwallwork23 removed a link to an issue Oct 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Upgrade develop to v14.3.1
3 participants