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

Misc cleanup #68

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Misc cleanup #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b9a4302
More concise ifdefs
jwallwork23 Dec 6, 2024
3b158fb
Avoid duplicate ifdefs in ATM_DRV; use elif
jwallwork23 Dec 6, 2024
0338d48
Add missing ifdef for lightning; add TODO note
jwallwork23 Dec 6, 2024
e738a31
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
16 changes: 3 additions & 13 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

call new_io_subdd (fid,iorw)
call new_io_fluxes (fid,iorw)
return
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
882 changes: 0 additions & 882 deletions model/RAD2_COM.F90
View file
Open in desktop

This file was deleted.

Loading