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

mom-36 #11

Merged
merged 14 commits into from
Nov 13, 2012
Merged

mom-36 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a2ffcda
mom-36 Turn on -Wampersand and fix warnings
timleslie Oct 26, 2012
c688512
mom-36 Add various warnings which don't trigger
timleslie Oct 26, 2012
5f65509
mom-36 Fix default warnings
timleslie Oct 26, 2012
7748a22
mom-36 Turn on more warnings and fix character truncation errors
timleslie Oct 26, 2012
ffce771
mom-36 Turn on type conversion warnings and fix errors
timleslie Oct 26, 2012
c94e2e1
mom-36 Turn on more warnings
timleslie Oct 26, 2012
caec006
mom-36 Turn on tabs warnings and fix errors
timleslie Oct 26, 2012
50c766b
mom-36 Turn on warning for unused parameters and fix some errors
timleslie Oct 26, 2012
75eca9d
mom-36 Fix more unused parameter warnings
timleslie Oct 26, 2012
2c1e086
mom-36 Fix more unused parameter warnings
timleslie Oct 26, 2012
d51c9dc
Merge branch 'master' into mom-36
timleslie Oct 26, 2012
0de6212
mom-36 Fix more unused parameter warnings
timleslie Oct 27, 2012
9f8b9bc
Merge branch 'master' into mom-36
timleslie Nov 13, 2012
e05b632
mom-36 Clean up warning list
timleslie Nov 13, 2012
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
2 changes: 1 addition & 1 deletion bin/mkmf.template.gfortran
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ MAKEFLAGS += --jobs=$(shell grep '^processor' /proc/cpuinfo | wc -l)

FPPFLAGS :=

FFLAGS := -fcray-pointer -fdefault-real-8 -Waliasing -ffree-line-length-none -fno-range-check
FFLAGS := -fcray-pointer -fdefault-real-8 -ffree-line-length-none -fno-range-check -Waliasing -Wampersand -Warray-bounds -Wcharacter-truncation -Wconversion -Wline-truncation -Wintrinsics-std -Wsurprising -Wno-tabs -Wunderflow -Wunused-parameter -Wintrinsic-shadow -Wno-align-commons
FFLAGS += -I/usr/include/mpich2 -I/usr/include
FFLAGS += -DGFORTRAN
#FFLAGS += -I/net2/nnz/opt/netcdf-4.1.1/include
Expand Down
90 changes: 8 additions & 82 deletions src/mom5/ocean_bgc/ocean_bgc_restore.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,34 +486,34 @@ module ocean_bgc_restore_mod !{

character*128 :: alk_star_file
integer :: alk_star_id
character*32 :: alk_star_name
character*128 :: alk_star_name
real, allocatable, dimension(:,:,:) :: alk_star_t
integer :: dep_wet_id
character*128 :: dep_wet_file
character*32 :: dep_wet_name
character*128 :: dep_wet_name
real, allocatable, dimension(:,:) :: dep_wet_t
integer :: dep_dry_id
character*128 :: dep_dry_file
character*32 :: dep_dry_name
character*128 :: dep_dry_name
real, allocatable, dimension(:,:) :: dep_dry_t
character*128 :: fed_star_file
integer :: fed_star_id
character*32 :: fed_star_name
character*128 :: fed_star_name
real, allocatable, dimension(:,:,:) :: fed_star_t
integer :: id_o2_sat
integer :: km_c_max
character*128 :: no3_star_file
integer :: no3_star_id
character*32 :: no3_star_name
character*128 :: no3_star_name
real, allocatable, dimension(:,:,:) :: no3_star_t
character*128 :: po4_star_file
integer :: po4_star_id
character*32 :: po4_star_name
character*128 :: po4_star_name
real, allocatable, dimension(:,:,:) :: po4_star_t
real, allocatable, dimension(:,:) :: sc_no_term
character*128 :: sio4_star_file
integer :: sio4_star_id
character*32 :: sio4_star_name
character*128 :: sio4_star_name
real, allocatable, dimension(:,:,:) :: sio4_star_t
type(biotic_type), allocatable, dimension(:) :: biotic
integer :: instances
Expand Down Expand Up @@ -1034,14 +1034,6 @@ subroutine ocean_bgc_restore_bbc(isc, iec, jsc, jec, isd, ied, jsd, jed, T_prog,
!-----------------------------------------------------------------------
!

character(len=64), parameter :: sub_name = 'ocean_bgc_restore_bbc'
character(len=256), parameter :: error_header = &
'==>Error from ' // trim(mod_name) // '(' // trim(sub_name) // '):'
character(len=256), parameter :: warn_header = &
'==>Warning from ' // trim(mod_name) // '(' // trim(sub_name) // '):'
character(len=256), parameter :: note_header = &
'==>Note from ' // trim(mod_name) // '(' // trim(sub_name) // '):'

!
!-----------------------------------------------------------------------
! local variables
Expand Down Expand Up @@ -1148,10 +1140,6 @@ subroutine ocean_bgc_restore_end(isc, iec, jsc, jec, nk, isd, ied, jsd, jed,
!

character(len=64), parameter :: sub_name = 'ocean_bgc_restore_end'
character(len=256), parameter :: error_header = &
'==>Error from ' // trim(mod_name) // '(' // trim(sub_name) // '):'
character(len=256), parameter :: warn_header = &
'==>Warning from ' // trim(mod_name) // '(' // trim(sub_name) // '):'
character(len=256), parameter :: note_header = &
'==>Note from ' // trim(mod_name) // '(' // trim(sub_name) // '):'

Expand Down Expand Up @@ -1424,19 +1412,6 @@ subroutine ocean_bgc_restore_sbc(isc, iec, jsc, jec, nk, isd, ied, jsd, jed,
!-----------------------------------------------------------------------
!

character(len=64), parameter :: sub_name = 'ocean_bgc_restore_sbc'
character(len=256), parameter :: error_header = &
'==>Error from ' // trim(mod_name) // '(' // trim(sub_name) // '):'
character(len=256), parameter :: warn_header = &
'==>Warning from ' // trim(mod_name) // '(' // trim(sub_name) // '):'
character(len=256), parameter :: note_header = &
'==>Note from ' // trim(mod_name) // '(' // trim(sub_name) // '):'
real, parameter :: po4_molwt = 31.0
real, parameter :: dop_molwt = 31.0
real, parameter :: o2_molwt = 32.0
real, parameter :: dic_molwt = 12.0
real, parameter :: alk_molwt = 1.0

!
!-----------------------------------------------------------------------
! local variables
Expand Down Expand Up @@ -1567,8 +1542,6 @@ subroutine ocean_bgc_restore_flux_init !{
character(len=64), parameter :: sub_name = 'ocean_bgc_restore_flux_init'
character(len=256), parameter :: error_header = &
'==>Error from ' // trim(mod_name) // '(' // trim(sub_name) // '):'
character(len=256), parameter :: warn_header = &
'==>Warning from ' // trim(mod_name) // '(' // trim(sub_name) // '):'
character(len=256), parameter :: note_header = &
'==>Note from ' // trim(mod_name) // '(' // trim(sub_name) // '):'

Expand Down Expand Up @@ -1740,14 +1713,11 @@ subroutine ocean_bgc_restore_init !{
character(len=64), parameter :: sub_name = 'ocean_bgc_restore_init'
character(len=256), parameter :: error_header = &
'==>Error from ' // trim(mod_name) // '(' // trim(sub_name) // '):'
character(len=256), parameter :: warn_header = &
'==>Warning from ' // trim(mod_name) // '(' // trim(sub_name) // '):'
character(len=256), parameter :: note_header = &
'==>Note from ' // trim(mod_name) // '(' // trim(sub_name) // '):'

real, parameter :: rho_avg = 1024.5
real, parameter :: sperd = 24.0 * 3600.0
real, parameter :: spery = 365.25 * sperd

!
!-----------------------------------------------------------------------
Expand Down Expand Up @@ -2230,14 +2200,6 @@ subroutine ocean_bgc_restore_init_sfc(isc, iec, jsc, jec, nk, isd, ied, jsd, jed
! local parameters
!

character(len=64), parameter :: sub_name = 'ocean_bgc_restore_initialize_sfc'
character(len=256), parameter :: error_header = &
'==>Error from ' // trim(mod_name) // '(' // trim(sub_name) // '):'
character(len=256), parameter :: warn_header = &
'==>Warning from ' // trim(mod_name) // '(' // trim(sub_name) // '):'
character(len=256), parameter :: note_header = &
'==>Note from ' // trim(mod_name) // '(' // trim(sub_name) // '):'

!
!-----------------------------------------------------------------------
! local variables
Expand Down Expand Up @@ -2443,14 +2405,6 @@ subroutine ocean_bgc_restore_sum_sfc(isc, iec, jsc, jec, nk, isd, ied, jsd, jed,
! local parameters
!

character(len=64), parameter :: sub_name = 'ocean_bgc_restore_sum_sfc'
character(len=256), parameter :: error_header = &
'==>Error from ' // trim(mod_name) // '(' // trim(sub_name) // '):'
character(len=256), parameter :: warn_header = &
'==>Warning from ' // trim(mod_name) // '(' // trim(sub_name) // '):'
character(len=256), parameter :: note_header = &
'==>Note from ' // trim(mod_name) // '(' // trim(sub_name) // '):'

!
!-----------------------------------------------------------------------
! local variables
Expand Down Expand Up @@ -2617,14 +2571,6 @@ subroutine ocean_bgc_restore_zero_sfc(Ocean_fields) !{
! local parameters
!

character(len=64), parameter :: sub_name = 'ocean_bgc_restore_zero_sfc'
character(len=256), parameter :: error_header = &
'==>Error from ' // trim(mod_name) // '(' // trim(sub_name) // '):'
character(len=256), parameter :: warn_header = &
'==>Warning from ' // trim(mod_name) // '(' // trim(sub_name) // '):'
character(len=256), parameter :: note_header = &
'==>Note from ' // trim(mod_name) // '(' // trim(sub_name) // '):'

!
!-----------------------------------------------------------------------
! local variables
Expand Down Expand Up @@ -2693,14 +2639,6 @@ subroutine ocean_bgc_restore_avg_sfc(isc, iec, jsc, jec, nk, isd, ied, jsd, jed,
! local parameters
!

character(len=64), parameter :: sub_name = 'ocean_bgc_restore_avg_sfc'
character(len=256), parameter :: error_header = &
'==>Error from ' // trim(mod_name) // '(' // trim(sub_name) // '):'
character(len=256), parameter :: warn_header = &
'==>Warning from ' // trim(mod_name) // '(' // trim(sub_name) // '):'
character(len=256), parameter :: note_header = &
'==>Note from ' // trim(mod_name) // '(' // trim(sub_name) // '):'

!
!-----------------------------------------------------------------------
! local variables
Expand Down Expand Up @@ -2777,14 +2715,6 @@ subroutine ocean_bgc_restore_sfc_end !{
! local parameters
!

character(len=64), parameter :: sub_name = 'ocean_bgc_restore_sfc_end'
character(len=256), parameter :: error_header = &
'==>Error from ' // trim(mod_name) // '(' // trim(sub_name) // '):'
character(len=256), parameter :: warn_header = &
'==>Warning from ' // trim(mod_name) // '(' // trim(sub_name) // '):'
character(len=256), parameter :: note_header = &
'==>Note from ' // trim(mod_name) // '(' // trim(sub_name) // '):'

!
!-----------------------------------------------------------------------
! local variables
Expand Down Expand Up @@ -2847,7 +2777,7 @@ subroutine ocean_bgc_restore_source(isc, iec, jsc, jec, nk, isd, ied, jsd, jed,
!-----------------------------------------------------------------------
!

character(len=64), parameter :: sub_name = 'ocean_bgc_restore_source'
!character(len=64), parameter :: sub_name = 'ocean_bgc_restore_source'

!
!-----------------------------------------------------------------------
Expand Down Expand Up @@ -4310,8 +4240,6 @@ subroutine ocean_bgc_restore_start(isc, iec, jsc, jec, nk, isd, ied, jsd, jed,
character(len=64), parameter :: sub_name = 'ocean_bgc_restore_start'
character(len=256), parameter :: error_header = &
'==>Error from ' // trim(mod_name) // '(' // trim(sub_name) // '): '
character(len=256), parameter :: warn_header = &
'==>Warning from ' // trim(mod_name) // '(' // trim(sub_name) // '): '
character(len=256), parameter :: note_header = &
'==>Note from ' // trim(mod_name) // '(' // trim(sub_name) // '): '

Expand Down Expand Up @@ -6126,8 +6054,6 @@ subroutine set_array(array, isd, ied, jsd, jed, &
character(len=64), parameter :: sub_name = 'set_array'
character(len=256), parameter :: error_header = &
'==>Error from ' // trim(mod_name) // '(' // trim(sub_name) // '):'
character(len=256), parameter :: warn_header = &
'==>Warning from ' // trim(mod_name) // '(' // trim(sub_name) // '):'
character(len=256), parameter :: note_header = &
'==>Note from ' // trim(mod_name) // '(' // trim(sub_name) // '):'

Expand Down
5 changes: 2 additions & 3 deletions src/mom5/ocean_bgc/ocean_generic_tracer.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,16 +429,15 @@ end subroutine ocean_generic_sbc
! </DESCRIPTION>
! <TEMPLATE>
! call ocean_generic_column_physics(Thickness, hblt_depth, Time, Grid, dtts, Disd,Djsd, T_prog, T_diag,&
! sw_pen,opacity, diff_cbt, Dens, river, Velocity )
! sw_pen,opacity, diff_cbt, river, Velocity )
! </TEMPLATE>
! </SUBROUTINE>
subroutine ocean_generic_column_physics(Thickness, hblt_depth, Time, Grid, dtts, Disd,Djsd, T_prog, T_diag,&
sw_pen,opacity, diff_cbt, Dens, Velocity)
sw_pen,opacity, diff_cbt, Velocity)
integer, intent(in) :: Disd,Djsd
type(ocean_grid_type), intent(in) :: Grid
type(ocean_time_type), intent(in) :: Time
type(ocean_thickness_type), intent(in) :: Thickness
type(ocean_density_type), intent(in) :: Dens
type(ocean_Velocity_type), intent(in) :: Velocity
real, intent(in), dimension(Disd:,Djsd:) :: hblt_depth,sw_pen
real, intent(in), dimension(Disd:,Djsd:,:) :: opacity
Expand Down
Loading