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

Jump to bottom

new aerocom namelist #35

Merged
merged 3 commits into from
Aug 28, 2024
Merged

new aerocom namelist #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0db5173
make aerocom run time configurable
mvertens Aug 28, 2024
f04c735
Add physpkg.F90 shawdow file from cam_dev
Aug 28, 2024
986424b
protect use_aerocom namelist variable
Aug 28, 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
10 changes: 5 additions & 5 deletions src/aero_model.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ module aero_model
use oslo_aero_share, only: lifeCycleNumberMedianRadius, rhopart, lifeCycleSigma
use oslo_aero_share, only: l_so4_a2, l_bc_n, l_bc_ax
use oslo_aero_share, only: MODE_IDX_BC_NUC, MODE_IDX_BC_EXT_AC
use oslo_aero_control, only: oslo_aero_ctl_readnl
use oslo_aero_control, only: oslo_aero_ctl_readnl, use_aerocom
use oslo_aero_depos, only: oslo_aero_depos_init
use oslo_aero_depos, only: oslo_aero_depos_dry, oslo_aero_depos_wet, oslo_aero_wetdep_init
use oslo_aero_coag, only: initializeCoagulation, coagtend, clcoag
Expand Down Expand Up @@ -153,10 +153,10 @@ subroutine aero_model_init( pbuf2d )
call init_interp_constants() ! table initialization constants
call initopt() ! table initialization
call initlogn() ! table initialization
#ifdef AEROCOM
call initdry() ! table initialization
call initaeropt() ! table initialization
#endif
if (use_aerocom) then
call initdry() ! table initialization
call initaeropt() ! table initialization
end if
call initializeCondensation()
call oslo_aero_ocean_init()
call oslo_aero_depos_init(pbuf2d)
Expand Down
13 changes: 10 additions & 3 deletions src/oslo_aero_control.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,11 @@ module oslo_aero_control
integer, parameter :: unset_int = huge(1)
integer, parameter, public :: dir_string_length=256

! Namelist variables:
real(r8) :: volc_fraction_coarse = 0.0_r8 !Fraction of volcanic aerosols in coarse mode
! Public Namelist variables:
logical, public, protected :: use_aerocom = .false. ! If true, turn on aerocom output

! Private Namelist variables:
real(r8) :: volc_fraction_coarse = 0.0_r8 !Fraction of volcanic aerosols in coarse mode
character(len=dir_string_length) :: aerotab_table_dir = unset_str

! DMS/Ocean namelist variables
Expand Down Expand Up @@ -53,7 +56,8 @@ subroutine oslo_aero_ctl_readnl(nlfile)

namelist /oslo_ctl_nl/ volc_fraction_coarse, aerotab_table_dir, dms_source, &
dms_source_type, opom_source, opom_source_type, &
ocean_filename, ocean_filepath, dms_cycle_year, opom_cycle_year
ocean_filename, ocean_filepath, dms_cycle_year, opom_cycle_year, &
use_aerocom
!-----------------------------------------------------------------------------

if (masterproc) then
Expand All @@ -69,6 +73,9 @@ subroutine oslo_aero_ctl_readnl(nlfile)
end if

! Broadcast namelist variables
call mpi_bcast(use_aerocom, 1 , mpi_logical, mstrid, mpicom, ierr)
if (ierr /= mpi_success) call endrun(subname//" mpi_bcast: volc_fraction_coarse")

call mpi_bcast(volc_fraction_coarse, 1 , mpi_real8, mstrid, mpicom, ierr)
if (ierr /= mpi_success) call endrun(subname//" mpi_bcast: volc_fraction_coarse")
call mpi_bcast(aerotab_table_dir, len(aerotab_table_dir) , mpi_character, mstrid, mpicom, ierr)
Expand Down
Loading