<p><b>mpetersen@lanl.gov</b> 2012-04-27 10:49:09 -0600 (Fri, 27 Apr 2012)</p><p>New string dimension character(len=StrKIND) caused a problem passing text directly into a subroutine. So I pass a string variable into the subroutine instead. Tested with 120km global, bit-for-bit match.<br>
</p><hr noshade><pre><font color="gray">Modified: trunk/mpas/src/core_ocean/mpas_ocn_tendency.F
===================================================================
--- trunk/mpas/src/core_ocean/mpas_ocn_tendency.F        2012-04-27 15:33:20 UTC (rev 1825)
+++ trunk/mpas/src/core_ocean/mpas_ocn_tendency.F        2012-04-27 16:49:09 UTC (rev 1826)
@@ -419,6 +419,7 @@
real (kind=RKIND), dimension(:,:,:), pointer :: tracers, deriv_two
real (kind=RKIND), dimension(:,:), allocatable:: div_u
character :: c1*6
+ character(len=StrKIND) :: displacement_type
h => s % h % array
u => s % u % array
@@ -753,10 +754,11 @@
! For an isopycnal model, density should remain constant.
! For zlevel, calculate in-situ density
if (config_vert_grid_type.ne.'isopycnal') then
+ displacement_type = 'relative'
call mpas_timer_start("equation of state", .false., diagEOSTimer)
- call ocn_equation_of_state_rho(s, grid, 0, 'relative', err)
+ call ocn_equation_of_state_rho(s, grid, 0, displacement_type, err)
! mrp 110324 In order to visualize rhoDisplaced, include the following
- call ocn_equation_of_state_rho(s, grid, 1, 'relative', err)
+ call ocn_equation_of_state_rho(s, grid, 1, displacement_type, err)
call mpas_timer_stop("equation of state", diagEOSTimer)
endif
Modified: trunk/mpas/src/core_ocean/mpas_ocn_vmix_coefs_rich.F
===================================================================
--- trunk/mpas/src/core_ocean/mpas_ocn_vmix_coefs_rich.F        2012-04-27 15:33:20 UTC (rev 1825)
+++ trunk/mpas/src/core_ocean/mpas_ocn_vmix_coefs_rich.F        2012-04-27 16:49:09 UTC (rev 1826)
@@ -114,6 +114,7 @@
real (kind=RKIND), dimension(:,:), pointer :: RiTopOfEdge, RiTopOfCell
real (kind=RKIND), dimension(:,:,:), pointer :: tracers
+ character(len=StrKIND) :: displacement_type
!-----------------------------------------------------------------
!
@@ -142,8 +143,9 @@
tracers => s % tracers % array
call mpas_timer_start("eos rich", .false., richEOSTimer)
- call ocn_equation_of_state_rho(s, grid, 0, 'relative', err)
- call ocn_equation_of_state_rho(s, grid, 1, 'relative', err)
+ displacement_type = 'relative'
+ call ocn_equation_of_state_rho(s, grid, 0, displacement_type, err)
+ call ocn_equation_of_state_rho(s, grid, 1, displacement_type, err)
call mpas_timer_stop("eos rich", richEOSTimer)
call ocn_vmix_get_rich_numbers(grid, indexT, indexS, u, h, h_edge, &
</font>
</pre>