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.

Sign up for GitHub

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
wants to merge 5 commits into from
Closed

Workplan for hooking up SUBDDs #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c449f10
More concise ifdefs
jwallwork23 Dec 6, 2024
849b405
Set up output of chemicals; notes on appearance in GEOS-Chem
jwallwork23 Dec 6, 2024
bd0a32b
Avoid duplicate ifdefs in ATM_DRV; use elif
jwallwork23 Dec 6, 2024
03ef0c9
Add missing ifdef for lightning; add TODO note
jwallwork23 Dec 6, 2024
0a67bb6
Drop unnecessary files
jwallwork23 Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/rundecks/GISS_GC_14.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,7 @@ aer_rad_forc=0 ! turn off aerosol radiative forcing diagnostics
cloud_rad_forc=1 ! turn on cloud radiative forcing diagnostics

! diagnostics
! SUBDD='OH:4 NO:4 O3:4 NO2:4 CO:4 CH4:4 PS:4' ! TODO: Turn these on
SUBDD=''
SUBDD='OH:4 NO:4 O3:4 NO2:4 CO:4 CH4:4 PS:4'
NSUBDD=1 ! saving sub-daily diags every NSUBDD-th physics timestep
DAYS_PER_FILE=1
KCOPY=1 ! save accumulated diagnostics files
Expand Down
3 changes: 1 addition & 2 deletions .github/rundecks/GISS_ONLY.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,8 +232,7 @@ aer_rad_forc=0 ! turn off aerosol radiative forcing diagnostics
cloud_rad_forc=1 ! turn on cloud radiative forcing diagnostics

! diagnostics
! SUBDD='OH:4 NO:4 O3:4 NO2:4 CO:4 CH4:4 PS:4' ! TODO: Turn these on
SUBDD=''
SUBDD='OH:4 NO:4 O3:4 NO2:4 CO:4 CH4:4 PS:4'
NSUBDD=1 ! saving sub-daily diags every NSUBDD-th physics timestep
DAYS_PER_FILE=1
KCOPY=1 ! save accumulated diagnostics files
Expand Down
54 changes: 40 additions & 14 deletions model/ATM_DRV.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Comment on lines -1019 to -1043
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 looked to me like a copy-paste error (the same code appears twice).

call new_io_subdd (fid,iorw)
call new_io_fluxes (fid,iorw)
return
Expand Down Expand Up @@ -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
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I guess these should be in an #ifdef TRACERS_GC block?

#endif

end select
Expand Down
6 changes: 4 additions & 2 deletions model/CLOUDS2_DRV.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,7 @@ subroutine CONDSE

numThreads = 1 ! no openmp

#if (defined CALCULATE_LIGHTNING) || (defined TRACERS_SPECIAL_Shindell)
#ifdef AUTOTUNE_LIGHTNING
IF ( SUM(CNT_FR) .gt. 0 ) THEN
TUNE_LT_LAND = LAND_FR_LIS*SUM(CNT_FR)/SUM(LAND_FR_UNC)
Expand All @@ -651,10 +652,11 @@ subroutine CONDSE
'CLOUDS2_DRV: Calculating land/sea tuning parameters:', &
TUNE_LT_LAND, TUNE_LT_SEA
!CALL STOP_MODEL( 'LTM Testing',17)
FLASH_DENS = 0d0
!CG_DENS = 0d0
FLASH_UNC = 0d0
#endif
FLASH_DENS = 0d0
! CG_DENS = 0d0 ! TODO: Should this variable be dropped?
#endif

!****
!**** MAIN J LOOP
Expand Down
Loading