<p><b>mpetersen@lanl.gov</b> 2012-04-27 11:28:16 -0600 (Fri, 27 Apr 2012)</p><p>Fixed string input problem by simply changing<br>
character(len=StrKIND), intent(in) :: displacement_type<br>
to<br>
character(len=*), intent(in) :: displacement_type<br>
<br>
I also reverted the changes in rev 1826 that fixed it by making the passed argument len=StrKIND.<br>
Tested with 120km global.<br>
</p><hr noshade><pre><font color="gray">Modified: trunk/mpas/src/core_ocean/mpas_ocn_equation_of_state.F
===================================================================
--- trunk/mpas/src/core_ocean/mpas_ocn_equation_of_state.F        2012-04-27 16:49:09 UTC (rev 1826)
+++ trunk/mpas/src/core_ocean/mpas_ocn_equation_of_state.F        2012-04-27 17:28:16 UTC (rev 1827)
@@ -87,7 +87,7 @@
type (mesh_type), intent(in) :: grid
integer, intent(out) :: err
integer :: k_displaced
- character(len=StrKIND), intent(in) :: displacement_type
+ character(len=*), intent(in) :: displacement_type
integer, dimension(:), pointer :: maxLevelCell
real (kind=RKIND), dimension(:,:), pointer :: rho
Modified: trunk/mpas/src/core_ocean/mpas_ocn_equation_of_state_jm.F
===================================================================
--- trunk/mpas/src/core_ocean/mpas_ocn_equation_of_state_jm.F        2012-04-27 16:49:09 UTC (rev 1826)
+++ trunk/mpas/src/core_ocean/mpas_ocn_equation_of_state_jm.F        2012-04-27 17:28:16 UTC (rev 1827)
@@ -86,7 +86,7 @@
type (mesh_type), intent(in) :: grid
integer :: k_displaced, indexT, indexS
- character(len=StrKIND), intent(in) :: displacement_type
+ character(len=*), intent(in) :: displacement_type
integer, intent(out) :: err
type (dm_info) :: dminfo
Modified: trunk/mpas/src/core_ocean/mpas_ocn_tendency.F
===================================================================
--- trunk/mpas/src/core_ocean/mpas_ocn_tendency.F        2012-04-27 16:49:09 UTC (rev 1826)
+++ trunk/mpas/src/core_ocean/mpas_ocn_tendency.F        2012-04-27 17:28:16 UTC (rev 1827)
@@ -419,7 +419,6 @@
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
@@ -754,11 +753,10 @@
! 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, displacement_type, err)
+ call ocn_equation_of_state_rho(s, grid, 0, 'relative', err)
! mrp 110324 In order to visualize rhoDisplaced, include the following
- call ocn_equation_of_state_rho(s, grid, 1, displacement_type, err)
+ call ocn_equation_of_state_rho(s, grid, 1, 'relative', 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 16:49:09 UTC (rev 1826)
+++ trunk/mpas/src/core_ocean/mpas_ocn_vmix_coefs_rich.F        2012-04-27 17:28:16 UTC (rev 1827)
@@ -114,7 +114,6 @@
real (kind=RKIND), dimension(:,:), pointer :: RiTopOfEdge, RiTopOfCell
real (kind=RKIND), dimension(:,:,:), pointer :: tracers
- character(len=StrKIND) :: displacement_type
!-----------------------------------------------------------------
!
@@ -143,9 +142,8 @@
tracers => s % tracers % array
call mpas_timer_start("eos rich", .false., richEOSTimer)
- 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 ocn_equation_of_state_rho(s, grid, 0,'relative', err)
+ call ocn_equation_of_state_rho(s, grid, 1,'relative', err)
call mpas_timer_stop("eos rich", richEOSTimer)
call ocn_vmix_get_rich_numbers(grid, indexT, indexS, u, h, h_edge, &
</font>
</pre>