<p><b>dwj07@fsu.edu</b> 2011-11-09 14:11:52 -0700 (Wed, 09 Nov 2011)</p><p><br>
-- TRUNK COMMIT --<br>
<br>
Changing logical or's from ocean core to bitwise or's for compatibility with gnu fortran compiler.<br>
</p><hr noshade><pre><font color="gray">Modified: trunk/mpas/src/core_ocean/mpas_ocn_mpas_core.F
===================================================================
--- trunk/mpas/src/core_ocean/mpas_ocn_mpas_core.F 2011-11-08 22:59:25 UTC (rev 1181)
+++ trunk/mpas/src/core_ocean/mpas_ocn_mpas_core.F 2011-11-09 21:11:52 UTC (rev 1182)
@@ -55,29 +55,29 @@
call ocn_timestep_init(err)
call ocn_vel_pressure_grad_init(err_tmp)
- err = err .or. err_tmp
+ err = ior(err, err_tmp)
call ocn_vel_vadv_init(err_tmp)
- err = err .or. err_tmp
+ err = ior(err, err_tmp)
call ocn_vel_hmix_init(err_tmp)
- err = err .or. err_tmp
+ err = ior(err, err_tmp)
call ocn_vel_forcing_init(err_tmp)
- err = err .or. err_tmp
+ err = ior(err, err_tmp)
call ocn_tracer_hadv_init(err_tmp)
- err = err .or. err_tmp
+ err = ior(err, err_tmp)
call ocn_tracer_vadv_init(err_tmp)
- err = err .or. err_tmp
+ err = ior(err, err_tmp)
call ocn_tracer_hmix_init(err_tmp)
- err = err .or. err_tmp
+ err = ior(err, err_tmp)
call ocn_restoring_init(err_tmp)
- err = err .or. err_tmp
+ err = ior(err, err_tmp)
call ocn_vmix_init(err_tmp)
- err = err .or. err_tmp
+ err = ior(err, err_tmp)
call ocn_equation_of_state_init(err_tmp)
- err = err .or. err_tmp
+ err = ior(err, err_tmp)
if(err.eq.1) then
call mpas_dmpar_abort(dminfo)
Modified: trunk/mpas/src/core_ocean/mpas_ocn_tracer_hadv.F
===================================================================
--- trunk/mpas/src/core_ocean/mpas_ocn_tracer_hadv.F 2011-11-08 22:59:25 UTC (rev 1181)
+++ trunk/mpas/src/core_ocean/mpas_ocn_tracer_hadv.F 2011-11-09 21:11:52 UTC (rev 1182)
@@ -126,7 +126,7 @@
call ocn_tracer_hadv3_tend(grid, u, h_edge, tracers, tend, err2)
call ocn_tracer_hadv4_tend(grid, u, h_edge, tracers, tend, err3)
- err = err1 .or. err2 .or. err3
+ err = ior(err1, ior(err2, err3))
!--------------------------------------------------------------------
@@ -166,7 +166,7 @@
call ocn_tracer_hadv3_init(err2)
call ocn_tracer_hadv4_init(err3)
- err = err1 .or. err2 .or. err3
+ err = ior(err1, ior(err2, err3))
!--------------------------------------------------------------------
@@ -177,4 +177,4 @@
end module ocn_tracer_hadv
!|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-! vim: foldmetho=marker
+! vim: foldmethod=marker
Modified: trunk/mpas/src/core_ocean/mpas_ocn_tracer_hmix.F
===================================================================
--- trunk/mpas/src/core_ocean/mpas_ocn_tracer_hmix.F 2011-11-08 22:59:25 UTC (rev 1181)
+++ trunk/mpas/src/core_ocean/mpas_ocn_tracer_hmix.F 2011-11-09 21:11:52 UTC (rev 1182)
@@ -122,7 +122,7 @@
call ocn_tracer_hmix_del2_tend(grid, h_edge, tracers, tend, err1)
call ocn_tracer_hmix_del4_tend(grid, h_edge, tracers, tend, err2)
- err = err1 .or. err2
+ err = ior(err1, err2)
!--------------------------------------------------------------------
@@ -161,7 +161,7 @@
call ocn_tracer_hmix_del2_init(err1)
call ocn_tracer_hmix_del4_init(err2)
- err = err1 .or. err2
+ err = ior(err1, err2)
!--------------------------------------------------------------------
Modified: trunk/mpas/src/core_ocean/mpas_ocn_tracer_vadv.F
===================================================================
--- trunk/mpas/src/core_ocean/mpas_ocn_tracer_vadv.F 2011-11-08 22:59:25 UTC (rev 1181)
+++ trunk/mpas/src/core_ocean/mpas_ocn_tracer_vadv.F 2011-11-09 21:11:52 UTC (rev 1182)
@@ -127,7 +127,7 @@
call ocn_tracer_vadv_stencil_tend(grid, wTop, tracers, tend, err1)
call ocn_tracer_vadv_spline_tend(grid, wTop, tracers, tend, err2)
- err = err1 .or. err2
+ err = ior(err1, err2)
!--------------------------------------------------------------------
@@ -163,6 +163,7 @@
integer :: err1, err2
+ err = 0
vadvOn = .false.
if (config_vert_grid_type.eq.'zlevel') then
@@ -170,7 +171,7 @@
call ocn_tracer_vadv_stencil_init(err1)
call ocn_tracer_vadv_spline_init(err2)
- err = err1 .or. err2
+ err = ior(err1, err2)
endif
!--------------------------------------------------------------------
Modified: trunk/mpas/src/core_ocean/mpas_ocn_tracer_vadv_spline.F
===================================================================
--- trunk/mpas/src/core_ocean/mpas_ocn_tracer_vadv_spline.F 2011-11-08 22:59:25 UTC (rev 1181)
+++ trunk/mpas/src/core_ocean/mpas_ocn_tracer_vadv_spline.F 2011-11-09 21:11:52 UTC (rev 1182)
@@ -127,7 +127,7 @@
call ocn_tracer_vadv_spline2_tend(grid, wTop, tracers, tend, err1)
call ocn_tracer_vadv_spline3_tend(grid, wTop, tracers, tend, err2)
- err = err1 .or. err2
+ err = ior(err1, err2)
!--------------------------------------------------------------------
@@ -171,7 +171,7 @@
call ocn_tracer_vadv_spline2_init(err1)
call ocn_tracer_vadv_spline3_init(err2)
- err = err1 .or. err2
+ err = ior(err1, err2)
endif
!--------------------------------------------------------------------
Modified: trunk/mpas/src/core_ocean/mpas_ocn_tracer_vadv_stencil.F
===================================================================
--- trunk/mpas/src/core_ocean/mpas_ocn_tracer_vadv_stencil.F 2011-11-08 22:59:25 UTC (rev 1181)
+++ trunk/mpas/src/core_ocean/mpas_ocn_tracer_vadv_stencil.F 2011-11-09 21:11:52 UTC (rev 1182)
@@ -129,7 +129,7 @@
call ocn_tracer_vadv_stencil3_tend(grid, wTop, tracers, tend, err1)
call ocn_tracer_vadv_stencil4_tend(grid, wTop, tracers, tend, err1)
- err = err1 .or. err2 .or. err3
+ err = ior(err1, ior(err2, err3))
!--------------------------------------------------------------------
@@ -176,7 +176,7 @@
call ocn_tracer_vadv_stencil3_init(err2)
call ocn_tracer_vadv_stencil4_init(err3)
- err = err1 .or. err2 .or. err3
+ err = ior(err1, ior(err2, err3))
endif
!--------------------------------------------------------------------
Modified: trunk/mpas/src/core_ocean/mpas_ocn_vel_forcing.F
===================================================================
--- trunk/mpas/src/core_ocean/mpas_ocn_vel_forcing.F 2011-11-08 22:59:25 UTC (rev 1181)
+++ trunk/mpas/src/core_ocean/mpas_ocn_vel_forcing.F 2011-11-09 21:11:52 UTC (rev 1182)
@@ -127,7 +127,7 @@
call ocn_vel_forcing_windstress_tend(grid, u_src, h_edge, tend, err1)
call ocn_vel_forcing_bottomdrag_tend(grid, u, ke_edge, h_edge, tend, err2)
- err = err1 .or. err2
+ err = ior(err1, err2)
!--------------------------------------------------------------------
@@ -166,7 +166,7 @@
call ocn_vel_forcing_windstress_init(err1)
call ocn_vel_forcing_bottomdrag_init(err2)
- err = err1 .or. err2
+ err = ior(err1, err2)
!--------------------------------------------------------------------
Modified: trunk/mpas/src/core_ocean/mpas_ocn_vel_hmix.F
===================================================================
--- trunk/mpas/src/core_ocean/mpas_ocn_vel_hmix.F 2011-11-08 22:59:25 UTC (rev 1181)
+++ trunk/mpas/src/core_ocean/mpas_ocn_vel_hmix.F 2011-11-09 21:11:52 UTC (rev 1182)
@@ -122,7 +122,7 @@
call ocn_vel_hmix_del2_tend(grid, divergence, vorticity, tend, err1)
call ocn_vel_hmix_del4_tend(grid, divergence, vorticity, tend, err2)
- err = err1 .or. err2
+ err = ior(err1, err2)
!--------------------------------------------------------------------
@@ -161,7 +161,7 @@
call ocn_vel_hmix_del2_init(err1)
call ocn_vel_hmix_del4_init(err2)
- err = err1 .or. err2
+ err = ior(err1, err2)
!--------------------------------------------------------------------
Modified: trunk/mpas/src/core_ocean/mpas_ocn_vmix.F
===================================================================
--- trunk/mpas/src/core_ocean/mpas_ocn_vmix.F 2011-11-08 22:59:25 UTC (rev 1181)
+++ trunk/mpas/src/core_ocean/mpas_ocn_vmix.F 2011-11-09 21:11:52 UTC (rev 1182)
@@ -126,7 +126,7 @@
call ocn_vmix_coefs_tanh_build(grid, s, d, err2)
call ocn_vmix_coefs_rich_build(grid, s, d, err3)
- err = err1 .or. err2 .or. err3
+ err = ior(err1, ior(err2, err3))
!--------------------------------------------------------------------
@@ -609,7 +609,7 @@
call ocn_vmix_coefs_tanh_init(err2)
call ocn_vmix_coefs_rich_init(err3)
- err = err .or. err1 .or. err2 .or. err3
+ err = ior(err1, ior(err2, err3))
!--------------------------------------------------------------------
Modified: trunk/mpas/src/core_ocean/mpas_ocn_vmix_coefs_const.F
===================================================================
--- trunk/mpas/src/core_ocean/mpas_ocn_vmix_coefs_const.F 2011-11-08 22:59:25 UTC (rev 1181)
+++ trunk/mpas/src/core_ocean/mpas_ocn_vmix_coefs_const.F 2011-11-09 21:11:52 UTC (rev 1182)
@@ -129,7 +129,7 @@
call ocn_vel_vmix_coefs_const(grid, vertViscTopOfEdge, err1)
call ocn_tracer_vmix_coefs_const(grid, vertDiffTopOfCell, err2)
- err = err1 .or. err2
+ err = ior(err1, err2)
!--------------------------------------------------------------------
Modified: trunk/mpas/src/core_ocean/mpas_ocn_vmix_coefs_rich.F
===================================================================
--- trunk/mpas/src/core_ocean/mpas_ocn_vmix_coefs_rich.F 2011-11-08 22:59:25 UTC (rev 1181)
+++ trunk/mpas/src/core_ocean/mpas_ocn_vmix_coefs_rich.F 2011-11-09 21:11:52 UTC (rev 1182)
@@ -148,7 +148,7 @@
call ocn_vel_vmix_coefs_rich(grid, RiTopOfEdge, h_edge, vertViscTopOfEdge, err2)
call ocn_tracer_vmix_coefs_rich(grid, RiTopOfCell, h, vertDiffTopOfCell, err3)
- err = err1 .or. err2 .or. err3
+ err = ior(err1, ior(err2, err3))
!--------------------------------------------------------------------
Modified: trunk/mpas/src/core_ocean/mpas_ocn_vmix_coefs_tanh.F
===================================================================
--- trunk/mpas/src/core_ocean/mpas_ocn_vmix_coefs_tanh.F 2011-11-08 22:59:25 UTC (rev 1181)
+++ trunk/mpas/src/core_ocean/mpas_ocn_vmix_coefs_tanh.F 2011-11-09 21:11:52 UTC (rev 1182)
@@ -123,7 +123,7 @@
call ocn_vel_vmix_coefs_tanh(grid, vertViscTopOfEdge, err1)
call ocn_tracer_vmix_coefs_tanh(grid, vertDiffTopOfCell, err2)
- err = err1 .or. err2
+ err = ior(err1, err2)
!--------------------------------------------------------------------
</font>
</pre>