<p><b>dwj07@fsu.edu</b> 2011-12-12 13:02:40 -0700 (Mon, 12 Dec 2011)</p><p><br>
-- BRANCH COMMIT --<br>
<br>
Fixing issues with gfortan.<br>
<br>
Changing logical flags in modules to integers, where appropriate.<br>
<br>
Fixing a pointer that was missing.<br>
</p><hr noshade><pre><font color="gray">Modified: branches/ocean_projects/performance/src/core_ocean/Registry
===================================================================
--- branches/ocean_projects/performance/src/core_ocean/Registry 2011-12-12 18:49:17 UTC (rev 1253)
+++ branches/ocean_projects/performance/src/core_ocean/Registry 2011-12-12 20:02:40 UTC (rev 1254)
@@ -194,7 +194,6 @@
var persistent real temperature ( nVertLevels nCells Time ) 2 iro temperature state tracers dynamics
var persistent real salinity ( nVertLevels nCells Time ) 2 iro salinity state tracers dynamics
var persistent real tracer1 ( nVertLevels nCells Time ) 2 iro tracer1 state tracers testing
-var persistent real tracer2 ( nVertLevels nCells Time ) 2 iro tracer2 state tracers testing
# Tendency variables: neither read nor written to any files
var persistent real tend_u ( nVertLevels nEdges Time ) 1 - u tend - -
@@ -203,7 +202,6 @@
var persistent real tend_temperature ( nVertLevels nCells Time ) 1 - temperature tend tracers dynamics
var persistent real tend_salinity ( nVertLevels nCells Time ) 1 - salinity tend tracers dynamics
var persistent real tend_tracer1 ( nVertLevels nCells Time ) 1 - tracer1 tend tracers testing
-var persistent real tend_tracer2 ( nVertLevels nCells Time ) 1 - tracer2 tend tracers testing
# state variables for Split Explicit timesplitting
var persistent real uBtr ( nEdges Time ) 2 - uBtr state - -
Modified: branches/ocean_projects/performance/src/core_ocean/mpas_ocn_equation_of_state.F
===================================================================
--- branches/ocean_projects/performance/src/core_ocean/mpas_ocn_equation_of_state.F 2011-12-12 18:49:17 UTC (rev 1253)
+++ branches/ocean_projects/performance/src/core_ocean/mpas_ocn_equation_of_state.F 2011-12-12 20:02:40 UTC (rev 1254)
@@ -44,8 +44,8 @@
!
!--------------------------------------------------------------------
- logical :: eosON
- logical :: linearEos, jmEos
+ integer :: eosON
+ integer :: linearEos, jmEos
!***********************************************************************
@@ -96,18 +96,18 @@
err = 0
- if(.not.eosOn) return
+ if(eosOn == 0) return
tracers => s % tracers % array
indexT = s % index_temperature
indexS = s % index_salinity
- if (linearEos) then
+ if (linearEos == 1) then
rho => s % rho % array
call ocn_equation_of_state_linear_rho(grid, indexT, indexS, tracers, rho, err)
- elseif (jmEos) then
+ elseif (jmEos == 1) then
if(k_displaced == 0) then
rho => s % rho % array
@@ -150,17 +150,17 @@
integer, intent(out) :: err
err = 0
- eosON = .false.
- linearEos = .false.
- jmEos = .false.
+ eosON = 0
+ linearEos = 0
+ jmEos = 0
if(config_vert_grid_type.eq.'zlevel') then
- eosON = .true.
+ eosON = 1
if (config_eos_type.eq.'linear') then
- linearEos = .true.
+ linearEos = 1
elseif (config_eos_type.eq.'jm') then
- jmEos = .true.
+ jmEos = 1
else
print *,'Invalid choice for config_eos_type.'
print *,' Choices are: linear, jm'
Modified: branches/ocean_projects/performance/src/core_ocean/mpas_ocn_restoring.F
===================================================================
--- branches/ocean_projects/performance/src/core_ocean/mpas_ocn_restoring.F 2011-12-12 18:49:17 UTC (rev 1253)
+++ branches/ocean_projects/performance/src/core_ocean/mpas_ocn_restoring.F 2011-12-12 20:02:40 UTC (rev 1254)
@@ -42,7 +42,7 @@
!
!--------------------------------------------------------------------
- logical :: restoringOn !< Flag to turn on/off resotring
+ integer :: restoringOn !< Flag to turn on/off resotring
real (kind=RKIND) :: temperatureTimeScale, salinityTimeScale !< restoring timescales
@@ -115,7 +115,7 @@
err = 0
- if(.not.restoringOn) return
+ if(restoringOn == 0) return
nCellsSolve = grid % nCellsSolve
@@ -160,10 +160,10 @@
integer, intent(out) :: err !< Output: error flag
err = 0
- restoringOn = .false.
+ restoringOn = 0
if(config_restoreTS) then
- restoringOn = .true.
+ restoringOn = 1
temperatureTimeScale = config_restoreT_timescale
salinityTimeScale = config_restoreS_timescale
endif
Modified: branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tendency.F
===================================================================
--- branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tendency.F 2011-12-12 18:49:17 UTC (rev 1253)
+++ branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tendency.F 2011-12-12 20:02:40 UTC (rev 1254)
@@ -464,6 +464,7 @@
rho => s % rho % array
MontPot => s % MontPot % array
pressure => s % pressure % array
+ tracers => s % tracers % array
weightsOnEdge => grid % weightsOnEdge % array
kiteAreasOnVertex => grid % kiteAreasOnVertex % array
@@ -565,7 +566,7 @@
d2fdx2_cell1 = 0.0
d2fdx2_cell2 = 0.0
- boundaryMask = .not.(boundaryCell(k,cell1) == 0 .and. boundaryCell(k,cell2) == 0)
+ boundaryMask = abs(transfer(.not.(boundaryCell(k,cell1) == 0 .and. boundaryCell(k,cell2) == 0), boundaryMask))
d2fdx2_cell1 = deriv_two(1,1,iEdge) * h(k,cell1) * boundaryMask
d2fdx2_cell2 = deriv_two(1,2,iEdge) * h(k,cell2) * boundaryMask
Modified: branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_hadv2.F
===================================================================
--- branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_hadv2.F 2011-12-12 18:49:17 UTC (rev 1253)
+++ branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_hadv2.F 2011-12-12 20:02:40 UTC (rev 1254)
@@ -124,7 +124,7 @@
err = 0
- if(.not.hadv2On) return
+ if(hadv2On == 0) return
nEdges = grid % nEdges
maxLevelEdgeTop => grid % maxLevelEdgeTop % array
Modified: branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_hadv3.F
===================================================================
--- branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_hadv3.F 2011-12-12 18:49:17 UTC (rev 1253)
+++ branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_hadv3.F 2011-12-12 20:02:40 UTC (rev 1254)
@@ -129,7 +129,7 @@
err = 0
- if(.not.hadv3On) return
+ if(hadv3On == 0) return
nEdges = grid % nEdges
num_tracers = size(tracers, dim=1)
Modified: branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_hadv4.F
===================================================================
--- branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_hadv4.F 2011-12-12 18:49:17 UTC (rev 1253)
+++ branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_hadv4.F 2011-12-12 20:02:40 UTC (rev 1254)
@@ -126,7 +126,7 @@
err = 0
- if(.not.hadv4On) return
+ if(hadv4On == 0) return
nEdges = grid % nEdges
num_tracers = size(tracers, dim=1)
Modified: branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_hmix_del2.F
===================================================================
--- branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_hmix_del2.F 2011-12-12 18:49:17 UTC (rev 1253)
+++ branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_hmix_del2.F 2011-12-12 20:02:40 UTC (rev 1254)
@@ -131,7 +131,7 @@
err = 0
- if (.not.del2On) return
+ if (del2On == 0) return
nEdges = grid % nEdges
nVertLevels = grid % nVertLevels
Modified: branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_hmix_del4.F
===================================================================
--- branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_hmix_del4.F 2011-12-12 18:49:17 UTC (rev 1253)
+++ branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_hmix_del4.F 2011-12-12 20:02:40 UTC (rev 1254)
@@ -45,7 +45,7 @@
!
!--------------------------------------------------------------------
- logical :: Del4On
+ integer :: del4On
real (kind=RKIND) :: eddyDiff4
@@ -133,7 +133,7 @@
err = 0
- if (.not.Del4On) return
+ if (del4On == 0) return
call mpas_timer_start("compute_scalar_tend-horiz diff 4")
@@ -245,10 +245,10 @@
integer, intent(out) :: err !< Output: error flag
err = 0
- Del4on = .false.
+ del4on = 0
if ( config_h_tracer_eddy_diff4 > 0.0 ) then
- Del4On = .true.
+ del4On = 1
eddyDiff4 = config_h_tracer_eddy_diff4
endif
Modified: branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv.F
===================================================================
--- branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv.F 2011-12-12 18:49:17 UTC (rev 1253)
+++ branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv.F 2011-12-12 20:02:40 UTC (rev 1254)
@@ -45,7 +45,7 @@
!
!--------------------------------------------------------------------
- logical :: vadvOn
+ integer :: vadvOn
!***********************************************************************
@@ -122,7 +122,7 @@
err = 0
- if(.not.vadvOn) return
+ if(vadvOn == 0) return
call ocn_tracer_vadv_stencil_tend(grid, wTop, tracers, tend, err1)
call ocn_tracer_vadv_spline_tend(grid, wTop, tracers, tend, err2)
@@ -164,10 +164,10 @@
integer :: err1, err2
err = 0
- vadvOn = .false.
+ vadvOn = 0
if (config_vert_grid_type.eq.'zlevel') then
- vadvOn = .true.
+ vadvOn = 1
call ocn_tracer_vadv_stencil_init(err1)
call ocn_tracer_vadv_spline_init(err2)
Modified: branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_spline.F
===================================================================
--- branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_spline.F 2011-12-12 18:49:17 UTC (rev 1253)
+++ branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_spline.F 2011-12-12 20:02:40 UTC (rev 1254)
@@ -45,7 +45,7 @@
!
!--------------------------------------------------------------------
- logical :: splineOn
+ integer :: splineOn
!***********************************************************************
@@ -122,7 +122,7 @@
err = 0
- if(.not.splineOn) return
+ if(splineOn == 0) return
call ocn_tracer_vadv_spline2_tend(grid, wTop, tracers, tend, err1)
call ocn_tracer_vadv_spline3_tend(grid, wTop, tracers, tend, err2)
@@ -165,10 +165,10 @@
err = 0
- splineOn = .false.
+ splineOn = 0
if(config_vert_tracer_adv.eq.'spline') then
- splineOn = .true.
+ splineOn = 1
call ocn_tracer_vadv_spline2_init(err1)
call ocn_tracer_vadv_spline3_init(err2)
Modified: branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_spline2.F
===================================================================
--- branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_spline2.F 2011-12-12 18:49:17 UTC (rev 1253)
+++ branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_spline2.F 2011-12-12 20:02:40 UTC (rev 1254)
@@ -43,7 +43,7 @@
!
!--------------------------------------------------------------------
- logical :: spline2On
+ integer :: spline2On
!***********************************************************************
@@ -122,7 +122,7 @@
err = 0
- if(.not.spline2On) return
+ if(spline2On == 0) return
! Compute tracerTop using linear interpolation.
call mpas_timer_start("compute_scalar_tend-vert adv spline 2")
@@ -197,10 +197,10 @@
err = 0
- spline2On = .false.
+ spline2On = 0
if(config_vert_tracer_adv_order.eq.2) then
- spline2On = .true.
+ spline2On = 1
endif
Modified: branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_spline3.F
===================================================================
--- branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_spline3.F 2011-12-12 18:49:17 UTC (rev 1253)
+++ branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_spline3.F 2011-12-12 20:02:40 UTC (rev 1254)
@@ -44,7 +44,7 @@
!
!--------------------------------------------------------------------
- logical :: spline3On
+ integer :: spline3On
!***********************************************************************
@@ -126,7 +126,7 @@
err = 0
- if(.not.spline3On) return
+ if(spline3On == 0) return
! Compute tracerTop using linear interpolation.
call mpas_timer_start("compute_scalar_tend-vert adv spline 3")
@@ -225,10 +225,10 @@
err = 0
- spline3On = .false.
+ spline3On = 0
if(config_vert_tracer_adv_order.eq.3) then
- spline3On = .true.
+ spline3On = 1
endif
Modified: branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_stencil.F
===================================================================
--- branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_stencil.F 2011-12-12 18:49:17 UTC (rev 1253)
+++ branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_stencil.F 2011-12-12 20:02:40 UTC (rev 1254)
@@ -46,7 +46,7 @@
!
!--------------------------------------------------------------------
- logical :: stencilOn
+ integer :: stencilOn
!***********************************************************************
@@ -123,7 +123,7 @@
err = 0
- if(.not. stencilOn) return
+ if(stencilOn == 0) return
call ocn_tracer_vadv_stencil2_tend(grid, wTop, tracers, tend, err1)
call ocn_tracer_vadv_stencil3_tend(grid, wTop, tracers, tend, err2)
@@ -167,10 +167,10 @@
err = 0
- stencilOn = .false.
+ stencilOn = 0
if (config_vert_tracer_adv.eq.'stencil') then
- stencilOn = .true.
+ stencilOn = 1
call ocn_tracer_vadv_stencil2_init(err1)
call ocn_tracer_vadv_stencil3_init(err2)
Modified: branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_stencil2.F
===================================================================
--- branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_stencil2.F 2011-12-12 18:49:17 UTC (rev 1253)
+++ branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_stencil2.F 2011-12-12 20:02:40 UTC (rev 1254)
@@ -43,7 +43,7 @@
!
!--------------------------------------------------------------------
- logical :: stencil2On
+ integer :: stencil2On
!***********************************************************************
@@ -122,7 +122,7 @@
err = 0
- if(.not. stencil2On) return
+ if(stencil2On == 0) return
call mpas_timer_start("compute_scalar_tend-vert adv stencil 2")
@@ -195,10 +195,10 @@
integer :: err1, err2, err3
err = 0
- stencil2On = .false.
+ stencil2On = 0
if(config_vert_tracer_adv_order.eq.2) then
- stencil2On = .true.
+ stencil2On = 1
endif
Modified: branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_stencil3.F
===================================================================
--- branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_stencil3.F 2011-12-12 18:49:17 UTC (rev 1253)
+++ branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_stencil3.F 2011-12-12 20:02:40 UTC (rev 1254)
@@ -43,7 +43,7 @@
!
!--------------------------------------------------------------------
- logical :: stencil3On
+ integer :: stencil3On
!***********************************************************************
@@ -124,7 +124,7 @@
err = 0
- if(.not. stencil3On) return
+ if(stencil3On == 0) return
nCells = grid % nCells
nCellsSolve = grid % nCellsSolve
@@ -216,10 +216,10 @@
integer, intent(out) :: err !< Output: error flag
err = 0
- stencil3On = .false.
+ stencil3On = 0
if(config_vert_tracer_adv_order.eq.3) then
- stencil3On = .true.
+ stencil3On = 1
endif
Modified: branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_stencil4.F
===================================================================
--- branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_stencil4.F 2011-12-12 18:49:17 UTC (rev 1253)
+++ branches/ocean_projects/performance/src/core_ocean/mpas_ocn_tracer_vadv_stencil4.F 2011-12-12 20:02:40 UTC (rev 1254)
@@ -43,7 +43,7 @@
!
!--------------------------------------------------------------------
- logical :: stencil4On
+ integer :: stencil4On
!***********************************************************************
@@ -124,7 +124,7 @@
err = 0
- if(.not. Stencil4On) return
+ if(Stencil4On == 0) return
call mpas_timer_start("compute_scalar_tend-vert adv stencil 4")
@@ -211,10 +211,10 @@
integer, intent(out) :: err !< Output: error flag
err = 0
- stencil4On = .false.
+ stencil4On = 0
if(config_vert_tracer_adv_order.eq.4) then
- stencil4On = .true.
+ stencil4On = 1
endif
Modified: branches/ocean_projects/performance/src/core_ocean/mpas_ocn_vel_forcing_bottomdrag.F
===================================================================
--- branches/ocean_projects/performance/src/core_ocean/mpas_ocn_vel_forcing_bottomdrag.F 2011-12-12 18:49:17 UTC (rev 1253)
+++ branches/ocean_projects/performance/src/core_ocean/mpas_ocn_vel_forcing_bottomdrag.F 2011-12-12 20:02:40 UTC (rev 1254)
@@ -121,7 +121,7 @@
err = 0
- if(.not.bottomDragOn) return
+ if(bottomDragOn == 0) return
nEdgesSolve = grid % nEdgesSolve
maxLevelEdgeTop => grid % maxLevelEdgeTop % array
Modified: branches/ocean_projects/performance/src/core_ocean/mpas_ocn_vel_forcing_windstress.F
===================================================================
--- branches/ocean_projects/performance/src/core_ocean/mpas_ocn_vel_forcing_windstress.F 2011-12-12 18:49:17 UTC (rev 1253)
+++ branches/ocean_projects/performance/src/core_ocean/mpas_ocn_vel_forcing_windstress.F 2011-12-12 20:02:40 UTC (rev 1254)
@@ -118,7 +118,7 @@
err = 0
- if(.not.windStressOn) return
+ if(windStressOn == 0) return
nEdgesSolve = grid % nEdgesSolve
maxLevelEdgeTop => grid % maxLevelEdgeTop % array
Modified: branches/ocean_projects/performance/src/core_ocean/mpas_ocn_vel_hmix_del2.F
===================================================================
--- branches/ocean_projects/performance/src/core_ocean/mpas_ocn_vel_hmix_del2.F 2011-12-12 18:49:17 UTC (rev 1253)
+++ branches/ocean_projects/performance/src/core_ocean/mpas_ocn_vel_hmix_del2.F 2011-12-12 20:02:40 UTC (rev 1254)
@@ -128,7 +128,7 @@
err = 0
- if(.not.hmixDel2On) return
+ if(hmixDel2On == 0) return
nEdgesSolve = grid % nEdgesSolve
maxLevelEdgeTop => grid % maxLevelEdgeTop % array
Modified: branches/ocean_projects/performance/src/core_ocean/mpas_ocn_vel_hmix_del4.F
===================================================================
--- branches/ocean_projects/performance/src/core_ocean/mpas_ocn_vel_hmix_del4.F 2011-12-12 18:49:17 UTC (rev 1253)
+++ branches/ocean_projects/performance/src/core_ocean/mpas_ocn_vel_hmix_del4.F 2011-12-12 20:02:40 UTC (rev 1254)
@@ -42,7 +42,7 @@
!
!--------------------------------------------------------------------
- logical :: &
+ integer :: &
hmixDel4On !< local flag to determine whether del4 chosen
real (kind=RKIND) :: &
@@ -132,7 +132,7 @@
err = 0
- if(.not.hmixDel4On) return
+ if(hmixDel4On == 0) return
nCells = grid % nCells
nEdges = grid % nEdges
@@ -269,10 +269,10 @@
err = 0
- hmixDel4On = .false.
+ hmixDel4On = 0
if ( config_h_mom_eddy_visc4 > 0.0 ) then
- hmixDel4On = .true.
+ hmixDel4On = 1
eddyVisc4 = config_h_mom_eddy_visc4
if (config_visc_vorticity_term) then
viscVortCoef = config_visc_vorticity_visc4_scale
Modified: branches/ocean_projects/performance/src/core_ocean/mpas_ocn_vel_vadv.F
===================================================================
--- branches/ocean_projects/performance/src/core_ocean/mpas_ocn_vel_vadv.F 2011-12-12 18:49:17 UTC (rev 1253)
+++ branches/ocean_projects/performance/src/core_ocean/mpas_ocn_vel_vadv.F 2011-12-12 20:02:40 UTC (rev 1254)
@@ -112,7 +112,7 @@
real, dimension(:), allocatable :: w_dudzTopEdge
real, dimension(:), pointer :: zMidZLevel
- if(.not.velVadvOn) return
+ if(velVadvOn == 0) return
err = 0
Modified: branches/ocean_projects/performance/src/core_ocean/mpas_ocn_vmix_coefs_const.F
===================================================================
--- branches/ocean_projects/performance/src/core_ocean/mpas_ocn_vmix_coefs_const.F 2011-12-12 18:49:17 UTC (rev 1253)
+++ branches/ocean_projects/performance/src/core_ocean/mpas_ocn_vmix_coefs_const.F 2011-12-12 20:02:40 UTC (rev 1254)
@@ -121,7 +121,7 @@
!-----------------------------------------------------------------
err = 0
- if((.not.constViscOn) .and. (.not.constDiffOn)) return
+ if((constViscOn == 0) .and. (constDiffOn == 0)) return
vertViscTopOfEdge => d % vertViscTopOfEdge % array
vertDiffTopOfCell => d % vertDiffTopOfCell % array
@@ -183,7 +183,7 @@
err = 0
- if(.not.constViscOn) return
+ if(constViscOn == 0) return
vertViscTopOfEdge = constVisc
@@ -239,7 +239,7 @@
err = 0
- if(.not.constDiffOn) return
+ if(constDiffOn == 0) return
vertDiffTopOfCell = constDiff
Modified: branches/ocean_projects/performance/src/core_ocean/mpas_ocn_vmix_coefs_rich.F
===================================================================
--- branches/ocean_projects/performance/src/core_ocean/mpas_ocn_vmix_coefs_rich.F 2011-12-12 18:49:17 UTC (rev 1253)
+++ branches/ocean_projects/performance/src/core_ocean/mpas_ocn_vmix_coefs_rich.F 2011-12-12 20:02:40 UTC (rev 1254)
@@ -49,7 +49,7 @@
!
!--------------------------------------------------------------------
- logical :: richViscOn, richDiffOn
+ integer :: richViscOn, richDiffOn
!***********************************************************************
@@ -124,7 +124,7 @@
!-----------------------------------------------------------------
err = 0
- if((.not.richViscOn) .and. (.not.richDiffOn)) return
+ if((richViscOn == 0) .and. (richDiffOn == 0)) return
indexT = s%index_temperature
indexS = s%index_salinity
@@ -216,7 +216,7 @@
err = 0
- if(.not.richViscOn) return
+ if(richViscOn == 0) return
nEdges = grid % nEdges
@@ -322,7 +322,7 @@
err = 0
- if(.not.richDiffOn) return
+ if(richDiffOn == 0) return
nCells = grid % nCells
@@ -444,7 +444,7 @@
err = 0
- if(.not.richViscOn .and. .not.richDiffOn) return
+ if((richViscOn == 0) .and. (richDiffOn == 0)) return
nVertLevels = grid % nVertLevels
nCells = grid % nCells
@@ -580,15 +580,15 @@
err = 0
- richViscOn = .false.
- richDiffOn = .false.
+ richViscOn = 0
+ richDiffOn = 0
if (config_vert_visc_type.eq.'rich') then
- richViscOn = .true.
+ richViscOn = 1
endif
if (config_vert_diff_type.eq.'rich') then
- richDiffOn = .true.
+ richDiffOn = 1
endif
Modified: branches/ocean_projects/performance/src/core_ocean/mpas_ocn_vmix_coefs_tanh.F
===================================================================
--- branches/ocean_projects/performance/src/core_ocean/mpas_ocn_vmix_coefs_tanh.F 2011-12-12 18:49:17 UTC (rev 1253)
+++ branches/ocean_projects/performance/src/core_ocean/mpas_ocn_vmix_coefs_tanh.F 2011-12-12 20:02:40 UTC (rev 1254)
@@ -44,7 +44,7 @@
!
!--------------------------------------------------------------------
- logical :: tanhViscOn, tanhDiffOn
+ integer :: tanhViscOn, tanhDiffOn
!***********************************************************************
@@ -115,7 +115,7 @@
!-----------------------------------------------------------------
err = 0
- if((.not.tanhViscOn) .and. (.not.tanhDiffOn)) return
+ if((tanhViscOn == 0) .and. (tanhDiffOn == 0)) return
vertViscTopOfEdge => d % vertViscTopOfEdge % array
vertDiffTopOfCell => d % vertDiffTopOfCell % array
@@ -181,7 +181,7 @@
err = 0
- if(.not.tanhViscOn) return
+ if(tanhViscOn == 0) return
nVertLevels = grid % nVertLevels
zTopZLevel => grid % zTopZLevel % array
@@ -250,7 +250,7 @@
err = 0
- if(.not.tanhDiffOn) return
+ if(tanhDiffOn == 0) return
nVertLevels = grid % nVertLevels
zTopZLevel => grid % zTopZLevel % array
@@ -297,18 +297,18 @@
err = 0
- tanhViscOn = .false.
- tanhDiffOn = .false.
+ tanhViscOn = 0
+ tanhDiffOn = 0
if (config_vert_visc_type.eq.'tanh') then
- tanhViscOn = .true.
+ tanhViscOn = 1
endif
if (config_vert_diff_type.eq.'tanh') then
- tanhDiffOn = .true.
+ tanhDiffOn = 1
endif
- if(tanhViscOn .or. tanhDiffOn) then
+ if((tanhViscOn == 1) .or. (tanhDiffOn == 1)) then
if (config_vert_grid_type.ne.'zlevel') then
write(0,*) 'Abort: config_vert_diff_type.eq.tanh may only', &
' use config_vert_grid_type of zlevel at this time'
</font>
</pre>