From f239037e86aab76c79650cb8703e3d3a13eaba79 Mon Sep 17 00:00:00 2001 From: Niki Zadeh Date: Tue, 9 Aug 2016 16:21:06 -0400 Subject: [PATCH] Fixes to compile with -openmp --- src/core/MOM_PressureForce_Montgomery.F90 | 4 ++-- src/core/MOM_PressureForce_analytic_FV.F90 | 4 ++-- src/core/MOM_continuity_PPM.F90 | 4 ++-- src/tracer/MOM_generic_tracer.F90 | 3 ++- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/core/MOM_PressureForce_Montgomery.F90 b/src/core/MOM_PressureForce_Montgomery.F90 index c0418aeb0a..72c97f924d 100644 --- a/src/core/MOM_PressureForce_Montgomery.F90 +++ b/src/core/MOM_PressureForce_Montgomery.F90 @@ -261,12 +261,12 @@ subroutine PressureForce_Mont_nonBouss(h, tv, PFu, PFv, G, GV, CS, p_atm, pbce, !$OMP end parallel call calc_tidal_forcing(CS%Time, SSH, e_tidal, G, CS%tides_CSp) -!$OMP parallel do default(none) shared(Isq,Ieq,Jsq,Jeq,geopot_bot,G,e_tidal) +!$OMP parallel do default(none) shared(Isq,Ieq,Jsq,Jeq,geopot_bot,G,GV,e_tidal) do j=Jsq,Jeq+1 ; do i=Isq,Ieq+1 geopot_bot(i,j) = -GV%g_Earth*(e_tidal(i,j) + G%bathyT(i,j)) enddo ; enddo else -!$OMP parallel do default(none) shared(Isq,Ieq,Jsq,Jeq,geopot_bot,G) +!$OMP parallel do default(none) shared(Isq,Ieq,Jsq,Jeq,geopot_bot,G,GV) do j=Jsq,Jeq+1 ; do i=Isq,Ieq+1 geopot_bot(i,j) = -GV%g_Earth*G%bathyT(i,j) enddo ; enddo diff --git a/src/core/MOM_PressureForce_analytic_FV.F90 b/src/core/MOM_PressureForce_analytic_FV.F90 index 21aabfabbc..34cbda2c0c 100644 --- a/src/core/MOM_PressureForce_analytic_FV.F90 +++ b/src/core/MOM_PressureForce_analytic_FV.F90 @@ -320,7 +320,7 @@ subroutine PressureForce_AFV_nonBouss(h, tv, PFu, PFv, G, GV, CS, p_atm, pbce, e ! inty_dza to be 3-D arrays. ! Sum vertically to determine the surface geopotential anomaly. -!$OMP parallel do default(none) shared(Isq,Ieq,Jsq,Jeq,nz,za,alpha_ref,p,G,dza) +!$OMP parallel do default(none) shared(Isq,Ieq,Jsq,Jeq,nz,za,alpha_ref,p,G,GV,dza) do j=Jsq,Jeq+1 do i=Isq,Ieq+1 za(i,j) = alpha_ref*p(i,j,nz+1) - GV%g_Earth*G%bathyT(i,j) @@ -337,7 +337,7 @@ subroutine PressureForce_AFV_nonBouss(h, tv, PFu, PFv, G, GV, CS, p_atm, pbce, e SSH(i,j) = (za(i,j) - alpha_ref*p(i,j,1)) * I_gEarth enddo ; enddo call calc_tidal_forcing(CS%Time, SSH, e_tidal, G, CS%tides_CSp) -!$OMP parallel do default(none) shared(Isq,Ieq,Jsq,Jeq,za,G,e_tidal) +!$OMP parallel do default(none) shared(Isq,Ieq,Jsq,Jeq,za,G,GV,e_tidal) do j=Jsq,Jeq+1 ; do i=Isq,Ieq+1 za(i,j) = za(i,j) - GV%g_Earth*e_tidal(i,j) enddo ; enddo diff --git a/src/core/MOM_continuity_PPM.F90 b/src/core/MOM_continuity_PPM.F90 index 6529de4474..44dd7c9f23 100644 --- a/src/core/MOM_continuity_PPM.F90 +++ b/src/core/MOM_continuity_PPM.F90 @@ -416,7 +416,7 @@ subroutine zonal_mass_flux(u, h_in, uh, dt, G, GV, CS, LB, uhbt, OBC, & call cpu_clock_begin(id_clock_correct) !$OMP parallel do default(none) shared(ish,ieh,jsh,jeh,nz,u,h_in,hL,hR,use_visc_rem,visc_rem_u, & !$OMP uh,dt,G,GV,CS,apply_OBC_u,OBC,uhbt,do_aux,set_BT_cont, & -!$OMP CFL_dt,I_dt,u_cor,uhbt_aux,u_cor_aux,BT_cont) & +!$OMP CFL_dt,I_dt,u_cor,uhbt_aux,u_cor_aux,BT_cont, apply_OBC_flather) & !$OMP private(do_i,duhdu,du,du_max_CFL,du_min_CFL,uh_tot_0,duhdu_tot_0, & !$OMP visc_rem_max, I_vrm, du_lim, dx_E, dx_W, any_simple_OBC ) & !$OMP firstprivate(visc_rem) @@ -1182,7 +1182,7 @@ subroutine meridional_mass_flux(v, h_in, vh, dt, G, GV, CS, LB, vhbt, OBC, & !$OMP parallel do default(none) shared(ish,ieh,jsh,jeh,nz,v,h_in,hL,hR,vh,use_visc_rem, & !$OMP visc_rem_v,dt,G,GV,CS,apply_OBC_v,OBC,vhbt,do_aux, & !$OMP set_BT_cont,CFL_dt,I_dt,v_cor,vhbt_aux, & -!$OMP v_cor_aux,BT_cont ) & +!$OMP v_cor_aux,BT_cont, apply_OBC_flather ) & !$OMP private(do_i,dvhdv,dv,dv_max_CFL,dv_min_CFL,vh_tot_0, & !$OMP dvhdv_tot_0,visc_rem_max,I_vrm,dv_lim,dy_N, & !$OMP dy_S,any_simple_OBC ) & diff --git a/src/tracer/MOM_generic_tracer.F90 b/src/tracer/MOM_generic_tracer.F90 index c2300e9dc1..6c2c6c2bef 100644 --- a/src/tracer/MOM_generic_tracer.F90 +++ b/src/tracer/MOM_generic_tracer.F90 @@ -69,7 +69,8 @@ module MOM_generic_tracer use MOM_tracer_registry, only : tracer_vertdiff use MOM_tracer_Z_init, only : tracer_Z_init use MOM_tracer_initialization_from_Z, only : MOM_initialize_tracer_from_Z - use MOM_variables, only : surface, ocean_OBC_type, thermo_var_ptrs + use MOM_variables, only : surface, thermo_var_ptrs + use MOM_open_boundary, only : ocean_OBC_type use MOM_verticalGrid, only : verticalGrid_type