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

PG-46: renaming abortutils as cam_abortuitls to enable running with COSP #93

Merged
merged 3 commits into from
Mar 3, 2015
Merged

PG-46: renaming abortutils as cam_abortuitls to enable running with COSP #93

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
d78c6f2
replacing abortutils.F90 with cam_abortutils.F90
Feb 1, 2015
649d728
replacing "abortutils" with "cam_abortutils" in CAM
Feb 1, 2015
307f124
updating PGI version and threadstack size for Titan
Feb 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions models/atm/cam/bld/Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,9 @@ $(MODEL_EXEDIR)/$(EXENAME): $(OBJS)
$(LINKER) -o $@ $(OBJS) $(NC_LDFLAGS) $(LDFLAGS)

ifneq ($(strip $(COSP_LIBDIR)),)
# Rules to build COSP in its own library. Add abortutils dependency so
# Rules to build COSP in its own library. Add cam_abortutils dependency so
# cosp code can make use of subroutine endrun.
$(COSP_LIBDIR)/libcosp.a: abortutils.o
$(COSP_LIBDIR)/libcosp.a: cam_abortutils.o
$(MAKE) -C $(COSP_LIBDIR)

cospsimulator_intr.o: $(COSP_LIBDIR)/libcosp.a
Expand Down
2 changes: 1 addition & 1 deletion models/atm/cam/chem_proc/procfiles/cam/mo_imp_sol_scalar.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ subroutine imp_slv_inti
! ... Initialize the implict solver
!-----------------------------------------------------------------------
use mo_chem_utls, only : get_spc_ndx, get_rxt_ndx
use abortutils, only : endrun
use cam_abortutils, only : endrun
use cam_history, only : addfld, add_default, phys_decomp
use ppgrid, only : pver
use mo_tracname, only : solsym
Expand Down
2 changes: 1 addition & 1 deletion models/atm/cam/chem_proc/src/cam_chempp/make_sim_dat.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ subroutine make_sim_dat( model, sparse )
write(30,100) trim(line)
line(7:) = 'use chem_mods, only : extfrc_lst, inv_lst, slvd_lst'
write(30,100) trim(line)
line(7:) = 'use abortutils, only : endrun'
line(7:) = 'use cam_abortutils, only : endrun'
write(30,100) trim(line)
line(7:) = 'use mo_tracname, only : solsym'
write(30,100) trim(line)
Expand Down
2 changes: 1 addition & 1 deletion models/atm/cam/src/advection/slt/qmassa.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ subroutine qmassarun(cwava ,w ,q3 ,pdel ,hw1lat , &
use pmgrid, only: plev, plon
use constituents, only: pcnst, cnst_get_type_byind
use dycore, only: dycore_is
use abortutils, only: endrun
use cam_abortutils, only: endrun

implicit none

Expand Down
2 changes: 1 addition & 1 deletion models/atm/cam/src/chemistry/aerosol/dust_common.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
module dust_common

use shr_kind_mod, only: r8 => shr_kind_r8, cl => shr_kind_cl
use abortutils, only: endrun
use cam_abortutils, only: endrun
use cam_logfile, only: iulog

implicit none
Expand Down
2 changes: 1 addition & 1 deletion models/atm/cam/src/chemistry/aerosol/dust_sediment_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module dust_sediment_mod
use ppgrid, only: pcols, pver, pverp
use physconst, only: gravit, rair
use cam_logfile, only: iulog
use abortutils, only: endrun
use cam_abortutils, only: endrun

private
public :: dust_sediment_vel, dust_sediment_tend
Expand Down
2 changes: 1 addition & 1 deletion models/atm/cam/src/chemistry/aerosol/soil_erod_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module soil_erod_mod
use shr_kind_mod, only: r8 => shr_kind_r8, cl => shr_kind_cl
use cam_logfile, only: iulog
use spmd_utils, only: masterproc
use abortutils, only: endrun
use cam_abortutils, only: endrun

implicit none
private
Expand Down
2 changes: 1 addition & 1 deletion models/atm/cam/src/chemistry/bulk_aero/aero_model.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module aero_model
use shr_kind_mod, only: r8 => shr_kind_r8
use constituents, only: pcnst, cnst_name, cnst_get_ind
use ppgrid, only: pcols, pver, pverp
use abortutils, only: endrun
use cam_abortutils, only: endrun
use cam_logfile, only: iulog
use perf_mod, only: t_startf, t_stopf
use camsrfexch, only: cam_in_t, cam_out_t
Expand Down
2 changes: 1 addition & 1 deletion models/atm/cam/src/chemistry/bulk_aero/dust_model.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
module dust_model
use shr_kind_mod, only: r8 => shr_kind_r8, cl => shr_kind_cl
use spmd_utils, only: masterproc
use abortutils, only: endrun
use cam_abortutils, only: endrun

implicit none
private
Expand Down
4 changes: 2 additions & 2 deletions models/atm/cam/src/chemistry/bulk_aero/mo_setsoa.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module mo_setsoa
use shr_kind_mod, only : r8 => shr_kind_r8
use cam_logfile, only : iulog
use ppgrid, only : pcols, pver, begchunk, endchunk
use abortutils, only : endrun
use cam_abortutils, only : endrun
use mo_constants, only : avogadro, Rgas

implicit none
Expand Down Expand Up @@ -216,7 +216,7 @@ subroutine setsoa_old(dt,reaction_rates,tfld,vmr,xhnm,ncol,lchnk)
use chem_mods, only : adv_mass, gas_pcnst, rxntot
use mo_chem_utls, only : get_spc_ndx, get_rxt_ndx
use cam_history, only : outfld
use abortutils, only : endrun
use cam_abortutils, only : endrun
!
implicit none
!
Expand Down
2 changes: 1 addition & 1 deletion models/atm/cam/src/chemistry/bulk_aero/sox_cldaero_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
module sox_cldaero_mod

use shr_kind_mod, only : r8 => shr_kind_r8
use abortutils, only : endrun
use cam_abortutils, only : endrun
use ppgrid, only : pcols, pver
use mo_chem_utls, only : get_spc_ndx
use cldaero_mod, only : cldaero_conc_t, cldaero_allocate, cldaero_deallocate
Expand Down
4 changes: 2 additions & 2 deletions models/atm/cam/src/chemistry/modal_aero/aero_model.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ module aero_model
use shr_kind_mod, only: r8 => shr_kind_r8
use constituents, only: pcnst, cnst_name, cnst_get_ind
use ppgrid, only: pcols, pver, pverp
use abortutils, only: endrun
use cam_abortutils, only: endrun
use cam_logfile, only: iulog
use perf_mod, only: t_startf, t_stopf
use camsrfexch, only: cam_in_t, cam_out_t
Expand Down Expand Up @@ -1672,7 +1672,7 @@ subroutine modal_aero_bcscavcoef_init

use shr_kind_mod,only: r8 => shr_kind_r8
use modal_aero_data
use abortutils, only: endrun
use cam_abortutils, only: endrun

implicit none

Expand Down
2 changes: 1 addition & 1 deletion models/atm/cam/src/chemistry/modal_aero/dust_model.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
module dust_model
use shr_kind_mod, only: r8 => shr_kind_r8, cl => shr_kind_cl
use spmd_utils, only: masterproc
use abortutils, only: endrun
use cam_abortutils, only: endrun

implicit none
private
Expand Down
4 changes: 2 additions & 2 deletions models/atm/cam/src/chemistry/modal_aero/modal_aero_coag.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ subroutine modal_aero_coag_sub( &
use modal_aero_gasaerexch, only: n_so4_monolayers_pcage, &
soa_equivso4_factor

use abortutils, only: endrun
use cam_abortutils, only: endrun
use cam_history, only: outfld, fieldname_len
use chem_mods, only: adv_mass
use constituents, only: pcnst, cnst_name
Expand Down Expand Up @@ -759,7 +759,7 @@ subroutine modal_aero_coag_init
use modal_aero_gasaerexch, only: &
modefrm_pcage, nspecfrm_pcage, lspecfrm_pcage, lspectoo_pcage

use abortutils, only: endrun
use cam_abortutils, only: endrun
use cam_history, only: addfld, add_default, fieldname_len, phys_decomp
use constituents, only: pcnst, cnst_name
use spmd_utils, only: masterproc
Expand Down
4 changes: 2 additions & 2 deletions models/atm/cam/src/chemistry/modal_aero/modal_aero_data.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ module modal_aero_data
contains

subroutine qqcw_set_ptr(index, iptr)
use abortutils, only : endrun
use cam_abortutils, only : endrun
use time_manager, only : is_first_step


Expand All @@ -193,7 +193,7 @@ subroutine qqcw_set_ptr(index, iptr)
end subroutine qqcw_set_ptr

function qqcw_get_field(pbuf, index, lchnk, errorhandle)
use abortutils, only : endrun
use cam_abortutils, only : endrun
use physics_buffer, only : physics_buffer_desc, pbuf_get_field

integer, intent(in) :: index, lchnk
Expand Down
4 changes: 2 additions & 2 deletions models/atm/cam/src/chemistry/modal_aero/modal_aero_gasaerexch.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ subroutine modal_aero_gasaerexch_sub( &
use mo_tracname, only: solsym
use physconst, only: gravit, mwdry, rair
use ppgrid, only: pcols, pver
use abortutils, only : endrun
use cam_abortutils, only : endrun
use spmd_utils, only : iam, masterproc


Expand Down Expand Up @@ -1201,7 +1201,7 @@ subroutine modal_aero_gasaerexch_init
use modal_aero_data
use modal_aero_rename

use abortutils, only : endrun
use cam_abortutils, only : endrun
use cam_history, only : addfld, add_default, fieldname_len, phys_decomp
use constituents, only : pcnst, cnst_get_ind, cnst_name
use spmd_utils, only : masterproc
Expand Down
2 changes: 1 addition & 1 deletion models/atm/cam/src/chemistry/modal_aero/modal_aero_initialize_data.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module modal_aero_initialize_data
use cam_logfile, only : iulog
use abortutils, only: endrun
use cam_abortutils, only: endrun
use spmd_utils, only: masterproc, iam
use ppgrid, only: pcols, pver, begchunk, endchunk
use modal_aero_data
Expand Down
4 changes: 2 additions & 2 deletions models/atm/cam/src/chemistry/modal_aero/modal_aero_newnuc.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ subroutine modal_aero_newnuc_sub( &

! !USES:
use modal_aero_data
use abortutils, only: endrun
use cam_abortutils, only: endrun
use cam_history, only: outfld, fieldname_len
use chem_mods, only: adv_mass
use constituents, only: pcnst, cnst_name
Expand Down Expand Up @@ -1429,7 +1429,7 @@ subroutine modal_aero_newnuc_init
use modal_aero_data
use modal_aero_rename

use abortutils, only: endrun
use cam_abortutils, only: endrun
use cam_history, only: addfld, add_default, fieldname_len, phys_decomp
use constituents, only: pcnst, cnst_get_ind, cnst_name
use spmd_utils, only: masterproc
Expand Down
2 changes: 1 addition & 1 deletion models/atm/cam/src/chemistry/modal_aero/modal_aero_rename.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module modal_aero_rename

! !USES:
use shr_kind_mod, only: r8 => shr_kind_r8
use abortutils, only: endrun
use cam_abortutils, only: endrun
use modal_aero_data, only: maxd_aspectype
use chem_mods, only: gas_pcnst

Expand Down
2 changes: 1 addition & 1 deletion models/atm/cam/src/chemistry/modal_aero/sox_cldaero_mod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
module sox_cldaero_mod

use shr_kind_mod, only : r8 => shr_kind_r8
use abortutils, only : endrun
use cam_abortutils, only : endrun
use ppgrid, only : pcols, pver
use mo_chem_utls, only : get_spc_ndx
use cldaero_mod, only : cldaero_conc_t, cldaero_allocate, cldaero_deallocate
Expand Down
6 changes: 3 additions & 3 deletions models/atm/cam/src/chemistry/mozart/apex_subs.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1590,7 +1590,7 @@ SUBROUTINE GRADLPV (HR,ALT,FX,FY,FZ,FV,GRADX,GRADY,GRADZ,GRADV, &
!-----------------------------------------------------------------------
!
use shr_kind_mod, only: r8 => shr_kind_r8
use abortutils, only: endrun
use cam_abortutils, only: endrun
use cam_logfile, only: iulog
implicit none
!
Expand Down Expand Up @@ -2601,7 +2601,7 @@ SUBROUTINE FNDAPX (ALT,ZMAG,A,ALAT,ALON)
!-----------------------------------------------------------------------
!
use shr_kind_mod, only: r8 => shr_kind_r8
use abortutils, only: endrun
use cam_abortutils, only: endrun
use cam_logfile, only: iulog
implicit none
!
Expand Down Expand Up @@ -2894,7 +2894,7 @@ SUBROUTINE COFRM (DATE)
!-----------------------------------------------------------------------
!
use shr_kind_mod, only: r8 => shr_kind_r8
use abortutils, only: endrun
use cam_abortutils, only: endrun
use cam_logfile, only: iulog
implicit none

Expand Down
2 changes: 1 addition & 1 deletion models/atm/cam/src/chemistry/mozart/cfc11star.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module cfc11star
use cam_logfile, only : iulog

use physics_buffer, only : pbuf_add_field, dtype_r8
use abortutils, only : endrun
use cam_abortutils, only : endrun
use ppgrid, only : pcols, pver, begchunk, endchunk
use spmd_utils, only : masterproc

Expand Down
4 changes: 2 additions & 2 deletions models/atm/cam/src/chemistry/mozart/chemistry.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ subroutine chem_readnl(nlfile)

! Read chem namelist group.

use abortutils, only: endrun
use cam_abortutils, only: endrun
use namelist_utils, only: find_group_name
use units, only: getunit, freeunit
use mpishorthand
Expand Down Expand Up @@ -895,7 +895,7 @@ subroutine chem_init(phys_state, pbuf2d)
use chem_mods, only : adv_mass
use infnan, only : nan, assignment(=)
use mo_chem_utls, only : get_spc_ndx
use abortutils, only : endrun
use cam_abortutils, only : endrun
use aero_model, only : aero_model_init
use mo_setsox, only : sox_inti
use constituents, only : sflxnam
Expand Down
2 changes: 1 addition & 1 deletion models/atm/cam/src/chemistry/mozart/chlorine_loading_data.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
module chlorine_loading_data
use shr_kind_mod, only: r8 => shr_kind_r8
use spmd_utils, only: masterproc
use abortutils, only: endrun
use cam_abortutils, only: endrun
use cam_logfile, only: iulog
use linoz_data, only: has_linoz_data

Expand Down
2 changes: 1 addition & 1 deletion models/atm/cam/src/chemistry/mozart/efield.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ module efield

use shr_kind_mod, only: r8 => shr_kind_r8
use physconst, only: pi
use abortutils, only: endrun
use cam_abortutils, only: endrun
use cam_logfile, only: iulog

implicit none
Expand Down
2 changes: 1 addition & 1 deletion models/atm/cam/src/chemistry/mozart/euvac.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module euvac

use shr_kind_mod, only : r8 => shr_kind_r8
use abortutils, only : endrun
use cam_abortutils, only : endrun
use cam_logfile, only : iulog
implicit none

Expand Down
4 changes: 2 additions & 2 deletions models/atm/cam/src/chemistry/mozart/gas_wetdep_opts.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module gas_wetdep_opts
use cam_logfile, only : iulog
use constituents, only : pcnst
use spmd_utils, only : masterproc
use abortutils, only : endrun
use cam_abortutils, only : endrun

implicit none

Expand All @@ -24,7 +24,7 @@ module gas_wetdep_opts

subroutine gas_wetdep_readnl(nlfile)

use abortutils, only: endrun
use cam_abortutils, only: endrun
use namelist_utils, only: find_group_name
use units, only: getunit, freeunit
#ifdef SPMD
Expand Down
2 changes: 1 addition & 1 deletion models/atm/cam/src/chemistry/mozart/lin_strat_chem.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module lin_strat_chem
use ppgrid, only : begchunk, endchunk
use physics_types,only : physics_state
use cam_logfile, only : iulog
use abortutils, only : endrun
use cam_abortutils, only : endrun
use spmd_utils, only : masterproc
!
implicit none
Expand Down
2 changes: 1 addition & 1 deletion models/atm/cam/src/chemistry/mozart/linoz_data.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
module linoz_data

use shr_kind_mod, only : r8 => shr_kind_r8
use abortutils, only : endrun
use cam_abortutils, only : endrun
use spmd_utils, only : masterproc
use tracer_data, only : trfld,trfile
use cam_logfile, only : iulog
Expand Down
2 changes: 1 addition & 1 deletion models/atm/cam/src/chemistry/mozart/mo_airglow.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
module mo_airglow

use shr_kind_mod, only : r8 => shr_kind_r8
use abortutils, only : endrun
use cam_abortutils, only : endrun

implicit none

Expand Down
2 changes: 1 addition & 1 deletion models/atm/cam/src/chemistry/mozart/mo_airplane.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module mo_airplane
!--------------------------------------------------------------------

use shr_kind_mod, only : r8 => shr_kind_r8
use abortutils, only : endrun
use cam_abortutils, only : endrun
use pio, only : pio_inq_dimid, pio_inq_dimlen, pio_get_var, &
file_desc_t, var_desc_t, pio_inq_vardimid, pio_inq_varndims, pio_nowrite, &
pio_inq_varid, pio_closefile
Expand Down
2 changes: 1 addition & 1 deletion models/atm/cam/src/chemistry/mozart/mo_apex.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ module mo_apex
use ppgrid, only: pcols, begchunk, endchunk ! physics grid
use phys_grid, only: get_lat_p, get_lon_p, get_ncols_p
use cam_history, only: addfld, phys_decomp, add_default ! for history saves
use abortutils, only: endrun
use cam_abortutils, only: endrun
use cam_control_mod, only: magfield_fix_year
use cam_logfile, only: iulog
use spmd_utils, only: masterproc
Expand Down
2 changes: 1 addition & 1 deletion models/atm/cam/src/chemistry/mozart/mo_chemini.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ subroutine chemini &
use spmd_utils, only : iam
use mo_fstrat, only : fstrat_inti
use m_types, only : time_ramp
use abortutils, only : endrun
use cam_abortutils, only : endrun
use pmgrid, only : plev
use mo_sethet, only : sethet_inti
use mo_usrrxt, only : usrrxt_inti
Expand Down
Loading