Skip to content

Commit

Permalink
Merge pull request #28 from NOAA-GFDL/user/nnz/fix_omp_compile
Browse files Browse the repository at this point in the history
Corrects OMP directives to allow SIS2 to compile with -openmp
  • Loading branch information
adcroft committed Jan 5, 2016
2 parents 926c81e + cb454e6 commit 5c8f644
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion SIS_tracer_advect.F90
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ subroutine advect_scalar(scalar, h_prev, h_end, uhtr, vhtr, dt, G, CS) ! (, OBC)
h_neglect = G%H_subroundoff
!$OMP parallel default(none) shared(is,ie,js,je,ncat,domore_k,uhr,vhr,uhtr,vhtr,dt,G, &
!$OMP hprev,h_prev,h_end,isd,ied,jsd,jed,uh_neglect, &
!$OMP h_neglect,vh_neglect)
!$OMP h_neglect,vh_neglect,domore_u,domore_v)
!$OMP do
do k=1,ncat
domore_k(k)=1
Expand Down
2 changes: 1 addition & 1 deletion ice_model.F90
Original file line number Diff line number Diff line change
Expand Up @@ -2583,7 +2583,7 @@ subroutine SIS1_5L_thermodynamics(Ice, IST, G) !, runoff, calving, &
endif

!$OMP parallel do default(none) shared(isc,iec,jsc,jec,ncat,NkIce,G,IST,h_snow,h_ice, &
!$OMP dt_slow,snow_to_ice,Idt_slow,bsnk,S_col) &
!$OMP dt_slow,snow_to_ice,Idt_slow,bsnk,S_col,Ice) &
!$OMP private(T_col,T_Freeze_surf,evap_from_ocn,h2o_to_ocn, &
!$OMP heat_to_ocn,bablt,sn2ic)
do j=jsc,jec ; do k=1,ncat ; do i=isc,iec
Expand Down

0 comments on commit 5c8f644

Please sign in to comment.