-
Notifications
You must be signed in to change notification settings - Fork 0
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
Workplan for hooking up SUBDDs #64
Closed
Closed
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
c449f10
More concise ifdefs
jwallwork23 849b405
Set up output of chemicals; notes on appearance in GEOS-Chem
jwallwork23 bd0a32b
Avoid duplicate ifdefs in ATM_DRV; use elif
jwallwork23 03ef0c9
Add missing ifdef for lightning; add TODO note
jwallwork23 0a67bb6
Drop unnecessary files
jwallwork23 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
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 |
---|---|---|
|
@@ -1016,31 +1016,21 @@ subroutine new_io_atmvars(fid,iorw) | |
#ifdef CALCULATE_FLAMMABILITY | ||
call new_io_flammability(fid,iorw) | ||
#endif | ||
#ifdef TRACERS_ON | ||
select case (iorw) | ||
case (ioread) | ||
call tracerIO(fid, 'read_dist') | ||
case (iowrite) | ||
call tracerIO(fid, 'write_dist') | ||
end select | ||
#endif | ||
#ifdef TRACERS_GC | ||
select case (iorw) | ||
case (ioread) | ||
call IO_CHEM(fid, 'read_dist') | ||
case (iowrite) | ||
call IO_CHEM(fid, 'write_dist') | ||
end select | ||
#endif | ||
#ifdef TRACERS_GC | ||
#elif TRACERS_ON | ||
select case (iorw) | ||
case (ioread) | ||
call IO_CHEM(fid, 'read_dist') | ||
call tracerIO(fid, 'read_dist') | ||
case (iowrite) | ||
call IO_CHEM(fid, 'write_dist') | ||
call tracerIO(fid, 'write_dist') | ||
end select | ||
#endif | ||
|
||
call new_io_subdd (fid,iorw) | ||
call new_io_fluxes (fid,iorw) | ||
return | ||
|
@@ -1921,7 +1911,43 @@ subroutine accum_subdd_atm | |
call inc_subdd(subdd,k,ptropo*100) ! Convert to Pa | ||
case ('PS') | ||
sddarr2d = pedn(1,:,:)*100. ! Convert to Pa | ||
call inc_subdd(subdd,k,sddarr2d) | ||
call inc_subdd(subdd,k,sddarr2d) | ||
! NOTE: OH index is obtained using Ind_ function (from State_Chm_Mod) with | ||
! key 'OH' on L1426 of GEOS-Chem/GeosCore/diagnostics_mod.F90. | ||
case ('OH') | ||
call inc_subdd(subdd,k,ptropo) ! TODO: Output correct field, not ptropo | ||
! NOTE: NO index is obtained using Ind_ function (from State_Chm_Mod) with | ||
! key 'NO' on L282 of GEOS-Chem/GeosCore/hco_interface_gc_mod.F90. | ||
! This index is used on L2653 to access an entry of | ||
! State_Chm%Species. | ||
case ('NO') | ||
call inc_subdd(subdd,k,ptropo) ! TODO: Output correct field, not ptropo | ||
! NOTE: O3 appears in State_Diag with index 1 | ||
! (see L18820 of GEOS-Chem/Headers/state_diag_mod.F90) | ||
! NOTE: O3 index is obtained using Ind_ function (from State_Chm_Mod) with | ||
! key 'O3' on L284 of GEOS-Chem/GeosCore/hco_interface_gc_mod.F90. | ||
! This index is used on L2601 to access an entry of | ||
! State_Chm%Species. | ||
case ('O3') | ||
call inc_subdd(subdd,k,ptropo) ! TODO: Output correct field, not ptropo | ||
! NOTE: NO2 index is obtained using Ind_ function (from State_Chm_Mod) | ||
! with key 'NO2' on L283 of GEOS-Chem/GeosCore/hco_interface_gc_mod.F90. | ||
! This index is used on L2627 to access an entry of | ||
! State_Chm%Species. | ||
case ('NO2') | ||
call inc_subdd(subdd,k,ptropo) ! TODO: Output correct field, not ptropo | ||
! NOTE: CO index is obtained using Ind_ function (from State_Chm_Mod) with | ||
! key 'CO' on L936 of GEOS-Chem/GeosCore/carbon_gases_mod.F90. | ||
! This index is used on L219 to access an entry of | ||
! State_Chm%Species. | ||
case ('CO') | ||
call inc_subdd(subdd,k,ptropo) ! TODO: Output correct field, not ptropo | ||
! NOTE: CH4 index is obtained using Ind_ function (from State_Chm_Mod) | ||
! with key 'CH4' on L540 of GEOS-Chem/GeosCore/global_ch4_mod.F90. | ||
! This index is used on L549 to access an entry of | ||
! State_Chm%SpcData. | ||
case ('CH4') | ||
call inc_subdd(subdd,k,ptropo) ! TODO: Output correct field, not ptropo | ||
Comment on lines
+1914
to
+1950
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. I guess these should be in an |
||
#endif | ||
|
||
end select | ||
|
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.
This looked to me like a copy-paste error (the same code appears twice).