Skip to content

Commit

Permalink
Nullify local pointer variables & pointer elements
Browse files Browse the repository at this point in the history 
  All pointers should be set to null when declared.  This has now been done for
all pointers in MOM.F90 and MOM_PressureForce_Mongomery.F90.  No answers change.
  • Loading branch information
@Hallberg-NOAA
Hallberg-NOAA committed May 3, 2018
1 parent a1c5679 commit 04bd7b6
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 43 deletions.
67 changes: 34 additions & 33 deletions src/core/MOM.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ module MOM
!! with a correction for the inverse barometer (meter)
eta_av_bc !< free surface height or column mass time averaged over the last
!! baroclinic dynamics time step (m or kg/m2)
real, pointer, dimension(:,:) :: &
real, dimension(:,:), pointer :: &
Hml => NULL() !< active mixed layer depth, in m
real :: time_in_cycle !< The running time of the current time-stepping cycle
!! in calls that step the dynamics, and also the length of
Expand Down Expand Up @@ -241,15 +241,15 @@ module MOM
type(time_type) :: Z_diag_interval !< amount of time between calculating Z-space diagnostics
type(time_type) :: Z_diag_time !< next time to compute Z-space diagnostics

real, pointer, dimension(:,:,:) :: &
real, dimension(:,:,:), pointer :: &
h_pre_dyn => NULL(), & !< The thickness before the transports, in H.
T_pre_dyn => NULL(), & !< Temperature before the transports, in degC.
S_pre_dyn => NULL() !< Salinity before the transports, in psu.
type(accel_diag_ptrs) :: ADp !< structure containing pointers to accelerations,
!! for derived diagnostics (e.g., energy budgets)
type(cont_diag_ptrs) :: CDp !< structure containing pointers to continuity equation
!! terms, for derived diagnostics (e.g., energy budgets)
real, pointer, dimension(:,:,:) :: &
real, dimension(:,:,:), pointer :: &
u_prev => NULL(), & !< previous value of u stored for diagnostics
v_prev => NULL() !< previous value of v stored for diagnostics

Expand All @@ -259,7 +259,7 @@ module MOM
logical :: p_surf_prev_set !< If true, p_surf_prev has been properly set from
!! a previous time-step or the ocean restart file.
!! This is only valid when interp_p_surf is true.
real, pointer, dimension(:,:) :: &
real, dimension(:,:), pointer :: &
p_surf_prev => NULL(), & !< surface pressure (Pa) at end previous call to step_MOM
p_surf_begin => NULL(), & !< surface pressure (Pa) at start of step_MOM_dyn_...
p_surf_end => NULL() !< surface pressure (Pa) at end of step_MOM_dyn_...
Expand Down Expand Up @@ -368,7 +368,8 @@ subroutine step_MOM(forces, fluxes, sfc_state, Time_start, time_interval, CS, &
Waves, do_dynamics, do_thermodynamics, start_cycle, &
end_cycle, cycle_length, reset_therm)
type(mech_forcing), intent(inout) :: forces !< A structure with the driving mechanical forces
type(forcing), intent(inout) :: fluxes !< pointers to forcing fields
type(forcing), intent(inout) :: fluxes !< A structure with pointers to themodynamic,
!! tracer and mass exchange forcing fields
type(surface), intent(inout) :: sfc_state !< surface ocean state
type(time_type), intent(in) :: Time_start !< starting time of a segment, as a time type
real, intent(in) :: time_interval !< time interval covered by this run segment, in s.
Expand All @@ -392,8 +393,8 @@ subroutine step_MOM(forces, fluxes, sfc_state, Time_start, time_interval, CS, &
!! If missing, this is like start_cycle.

! local
type(ocean_grid_type), pointer :: G ! pointer to a structure containing
! metrics and related information
type(ocean_grid_type), pointer :: G => NULL() ! pointer to a structure containing
! metrics and related information
type(verticalGrid_type), pointer :: GV => NULL()

integer :: ntstep ! time steps between tracer updates or diabatic forcing
Expand Down Expand Up @@ -431,11 +432,11 @@ subroutine step_MOM(forces, fluxes, sfc_state, Time_start, time_interval, CS, &
real, dimension(SZI_(CS%G),SZJ_(CS%G)) :: &
ssh ! sea surface height, which may be based on eta_av (meter)

real, pointer, dimension(:,:,:) :: &
u, & ! u : zonal velocity component (m/s)
v, & ! v : meridional velocity component (m/s)
h ! h : layer thickness (meter (Bouss) or kg/m2 (non-Bouss))
real, pointer, dimension(:,:) :: &
real, dimension(:,:,:), pointer :: &
u => NULL(), & ! u : zonal velocity component (m/s)
v => NULL(), & ! v : meridional velocity component (m/s)
h => NULL() ! h : layer thickness (meter (Bouss) or kg/m2 (non-Bouss))
real, dimension(:,:), pointer :: &
p_surf => NULL() ! A pointer to the ocean surface pressure, in Pa.
real :: I_wt_ssh

Expand Down Expand Up @@ -850,17 +851,17 @@ subroutine step_MOM_dynamics(forces, p_surf_begin, p_surf_end, dt, dt_thermo, &
type(time_type), intent(in) :: Time_local !< End time of a segment, as a time type
type(wave_parameters_CS), &
optional, pointer :: Waves !< Container for wave related parameters; the
!! fields in Waves are intent(in) here.
!! fields in Waves are intent in here.

! local
type(ocean_grid_type), pointer :: G ! pointer to a structure containing
! metrics and related information
type(verticalGrid_type), pointer :: GV => NULL()
type(ocean_grid_type), pointer :: G => NULL() ! pointer to a structure containing
! metrics and related information
type(verticalGrid_type), pointer :: GV => NULL()
type(MOM_diag_IDs), pointer :: IDs => NULL() ! A structure with the diagnostic IDs.
real, pointer, dimension(:,:,:) :: &
u, & ! u : zonal velocity component (m/s)
v, & ! v : meridional velocity component (m/s)
h ! h : layer thickness (meter (Bouss) or kg/m2 (non-Bouss))
real, dimension(:,:,:), pointer :: &
u => NULL(), & ! u : zonal velocity component (m/s)
v => NULL(), & ! v : meridional velocity component (m/s)
h => NULL() ! h : layer thickness (meter (Bouss) or kg/m2 (non-Bouss))

logical :: calc_dtbt ! Indicates whether the dynamically adjusted
! barotropic time step needs to be updated.
Expand Down Expand Up @@ -1099,7 +1100,7 @@ subroutine step_MOM_thermo(CS, G, GV, u, v, h, tv, fluxes, dtdia, &
logical, intent(in) :: update_BBL !< If true, calculate the bottom boundary layer properties.
type(wave_parameters_CS), &
optional, pointer :: Waves !< Container for wave related parameters;
!! the fields in Waves are intent(in) here.
!! the fields in Waves are intent in here.

logical :: use_ice_shelf ! Needed for selecting the right ALE interface.
logical :: showCallTree
Expand Down Expand Up @@ -1279,15 +1280,15 @@ subroutine step_offline(forces, fluxes, sfc_state, Time_start, time_interval, CS
logical :: skip_diffusion
integer :: id_eta_diff_end

integer, pointer :: accumulated_time
integer, pointer :: accumulated_time => NULL()
integer :: i,j,k
integer :: is, ie, js, je, isd, ied, jsd, jed

! 3D pointers
real, dimension(:,:,:), pointer :: &
uhtr, vhtr, &
eatr, ebtr, &
h_end
real, dimension(:,:,:), pointer :: &
uhtr => NULL(), vhtr => NULL(), &
eatr => NULL(), ebtr => NULL(), &
h_end => NULL()

! 2D Array for diagnostics
real, dimension(SZI_(CS%G),SZJ_(CS%G)) :: eta_pre, eta_end
Expand Down Expand Up @@ -1472,7 +1473,7 @@ subroutine initialize_MOM(Time, Time_init, param_file, dirs, CS, restart_CSp, &
type(hor_index_type) :: HI ! A hor_index_type for array extents
type(verticalGrid_type), pointer :: GV => NULL()
type(dyn_horgrid_type), pointer :: dG => NULL()
type(diag_ctrl), pointer :: diag
type(diag_ctrl), pointer :: diag => NULL()

character(len=4), parameter :: vers_num = 'v2.0'

Expand All @@ -1488,7 +1489,7 @@ subroutine initialize_MOM(Time, Time_init, param_file, dirs, CS, restart_CSp, &
real, allocatable, dimension(:,:) :: eta ! free surface height (m) or bottom press (Pa)
real, allocatable, dimension(:,:) :: area_shelf_h ! area occupied by ice shelf
real, dimension(:,:), allocatable, target :: frac_shelf_h ! fraction of total area occupied by ice shelf
real, dimension(:,:), pointer :: shelf_area
real, dimension(:,:), pointer :: shelf_area => NULL()
type(MOM_restart_CS), pointer :: restart_CSp_tmp => NULL()
type(group_pass_type) :: tmp_pass_uv_T_S_h, pass_uv_T_S_h
! GMM, the following *is not* used. Should we delete it?
Expand Down Expand Up @@ -2617,11 +2618,11 @@ subroutine extract_surface_state(CS, sfc_state)
real :: hu, hv
type(ocean_grid_type), pointer :: G => NULL() ! pointer to a structure containing
! metrics and related information
type(verticalGrid_type), pointer :: GV => NULL()
real, pointer, dimension(:,:,:) :: &
u, & ! u : zonal velocity component (m/s)
v, & ! v : meridional velocity component (m/s)
h ! h : layer thickness (meter (Bouss) or kg/m2 (non-Bouss))
type(verticalGrid_type), pointer :: GV => NULL()
real, dimension(:,:,:), pointer :: &
u => NULL(), & ! u : zonal velocity component (m/s)
v => NULL(), & ! v : meridional velocity component (m/s)
h => NULL() ! h : layer thickness (meter (Bouss) or kg/m2 (non-Bouss))
real :: depth(SZI_(CS%G)) ! distance from the surface (meter)
real :: depth_ml ! depth over which to average to
! determine mixed layer properties (meter)
Expand Down
22 changes: 12 additions & 10 deletions src/core/MOM_PressureForce_Montgomery.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ module MOM_PressureForce_Mont
real :: GFS_scale !< Ratio between gravity applied to top interface
!! and the gravitational acceleration of the planet.
!! Usually this ratio is 1.
type(time_type), pointer :: Time ! A pointer to the ocean model's clock.
type(diag_ctrl), pointer :: diag ! A structure that is used to regulate the
! timing of diagnostic output.
real, pointer :: PFu_bc(:,:,:) => NULL() ! Accelerations due to pressure
real, pointer :: PFv_bc(:,:,:) => NULL() ! gradients deriving from density
! gradients within layers, m s-2.
type(time_type), pointer :: Time => NULL() !< A pointer to the ocean model's clock.
type(diag_ctrl), pointer :: diag => NULL() !< A structure that is used to regulate
!! the timing of diagnostic output.
real, pointer :: PFu_bc(:,:,:) => NULL() !< Accelerations due to pressure
real, pointer :: PFv_bc(:,:,:) => NULL() !< gradients deriving from density
!! gradients within layers, m s-2.
integer :: id_PFu_bc = -1, id_PFv_bc = -1, id_e_tidal = -1
type(tidal_forcing_CS), pointer :: tides_CSp => NULL()
end type PressureForce_Mont_CS
Expand All @@ -63,12 +63,14 @@ subroutine PressureForce_Mont_nonBouss(h, tv, PFu, PFv, G, GV, CS, p_atm, pbce,
real, dimension(SZI_(G),SZJB_(G),SZK_(G)), intent(out) :: PFv !< Meridional acceleration due to pressure gradients
!! (equal to -dM/dy) in m/s2.
type(PressureForce_Mont_CS), pointer :: CS !< Control structure for Montgomery potential PGF
real, dimension(:,:), optional, pointer :: p_atm !< The pressure at the ice-ocean or
real, dimension(:,:), optional, pointer :: p_atm !< The pressure at the ice-ocean or
!! atmosphere-ocean in Pa.
real, dimension(SZI_(G),SZJ_(G),SZK_(G)), optional, intent(out) :: pbce !< The baroclinic pressure anomaly in
real, dimension(SZI_(G),SZJ_(G),SZK_(G)), &
optional, intent(out) :: pbce !< The baroclinic pressure anomaly in
!! each layer due to free surface height anomalies,
!! in m2 s-2 H-1.
real, dimension(SZI_(G),SZJ_(G)), optional, intent(out) :: eta !< Free surface height, in m.
real, dimension(SZI_(G),SZJ_(G)), optional, intent(out) :: eta !< Free surface height, in m.

! Local variables
real, dimension(SZI_(G),SZJ_(G),SZK_(G)) :: &
M, & ! The Montgomery potential, M = (p/rho + gz) , in m2 s-2.
Expand Down Expand Up @@ -902,7 +904,7 @@ end subroutine PressureForce_Mont_init

!> Deallocates the Montgomery-potential form of PGF control structure
subroutine PressureForce_Mont_end(CS)
type(PressureForce_Mont_CS), pointer :: CS
type(PressureForce_Mont_CS), pointer :: CS !< Control structure for Montgomery potential PGF
if (associated(CS)) deallocate(CS)
end subroutine PressureForce_Mont_end

Expand Down

0 comments on commit 04bd7b6

Please sign in to comment.