[Dart-dev] [5861] DART/branches/development/models/bgrid_solo/model_mod.f90: merge changes from trunk & kodiak:

[nancy at ucar.edu]

Revision: 5861
Author:   nancy
Date:     2012-09-06 11:53:29 -0600 (Thu, 06 Sep 2012)
Log Message:
-----------
merge changes from trunk & kodiak:
get_state_meta_data() was returning level numbers between 2-6 for the temperature field if no tracers are defined. the interpolation and results are (and have always been) correct; just the level numbers reported by get_state_meta_data() are incorrect.  this fix makes it return levels 1-5 for temperature, regardless of the number of tracers defined.

Modified Paths:
--------------
    DART/branches/development/models/bgrid_solo/model_mod.f90

Property Changed:
----------------
    DART/branches/development/models/bgrid_solo/model_mod.f90

-------------- next part --------------
Modified: DART/branches/development/models/bgrid_solo/model_mod.f90
===================================================================
--- DART/branches/development/models/bgrid_solo/model_mod.f90	2012-09-06 17:52:45 UTC (rev 5860)
+++ DART/branches/development/models/bgrid_solo/model_mod.f90	2012-09-06 17:53:29 UTC (rev 5861)
@@ -1099,7 +1099,7 @@
       local_var_type = TYPE_PS 
    else ! Rest of variables are temperature and tracers
 
-      lev = int((col_elem  + 1)/ (1 + ntracers))
+      lev = int(col_elem / (1 + ntracers))
       var_type_temp = mod(col_elem - 1, 1 + ntracers)
 
       ! First element on each level is T, 


Property changes on: DART/branches/development/models/bgrid_solo/model_mod.f90
___________________________________________________________________
Added: svn:mergeinfo
   + /DART/trunk/models/bgrid_solo/model_mod.f90:4680-5860