[Dart-dev] DART/branches Revision: 11457

Wed Apr 12 11:35:25 MDT 2017

nancy at ucar.edu
2017-04-12 11:35:19 -0600 (Wed, 12 Apr 2017)
369
merge in recent rma_trunk changes, and update the code
in the locations_io_mod to write out the locations correctly.
also fix a place in assim_tools where it was querying the
vertical when no vertical conversion was being done.
also converted 9var model_mod and cleaned it up.
i've tested L63, bgrid, and a small wrf case
and it reproduces exactly with the rma_trunk.




Index: DART/branches/model_mod_changes
===================================================================

--- DART/branches/model_mod_changes	2017-04-11 22:38:59 UTC (rev 11456)
+++ DART/branches/model_mod_changes	2017-04-12 17:35:19 UTC (rev 11457)

Property changes on: DART/branches/model_mod_changes
___________________________________________________________________
Modified: svn:mergeinfo
## -28,6 +28,7 ##
 /DART/branches/rma_sprint:8101-8172
 /DART/branches/rma_state_structure_test_dir:9478-9682
 /DART/branches/rma_state_structure_unit_test:9697-10274
+/DART/branches/rma_trunk:11409-11456
 /DART/branches/rma_trunk_clamping:8792-8807
 /DART/branches/rma_trunk_filename:8017-8163
 /DART/branches/rma_trunk_get_state_fun:8574-8602
Modified: DART/branches/model_mod_changes/assimilation_code/location/channel/location_mod.html
===================================================================
--- DART/branches/model_mod_changes/assimilation_code/location/channel/location_mod.html	2017-04-11 22:38:59 UTC (rev 11456)
+++ DART/branches/model_mod_changes/assimilation_code/location/channel/location_mod.html	2017-04-12 17:35:19 UTC (rev 11457)
@@ -2,7 +2,7 @@
           "http://www.w3.org/TR/html4/strict.dtd">
 <HTML>
 <HEAD>
-<TITLE>module location_mod</TITLE>
+<TITLE>module location_mod (channel)</TITLE>
 <link rel="stylesheet" type="text/css" href="../../../documentation/html/doc.css" />
 <link href="../../../documentation/images/dart.ico" rel="shortcut icon" />
 </HEAD>

Modified: DART/branches/model_mod_changes/assimilation_code/location/oned/location_mod.html
===================================================================
--- DART/branches/model_mod_changes/assimilation_code/location/oned/location_mod.html	2017-04-11 22:38:59 UTC (rev 11456)
+++ DART/branches/model_mod_changes/assimilation_code/location/oned/location_mod.html	2017-04-12 17:35:19 UTC (rev 11457)
@@ -2,7 +2,7 @@
           "http://www.w3.org/TR/html4/strict.dtd">
 <HTML>
 <HEAD>
-<TITLE>module location_mod</TITLE>
+<TITLE>module location_mod (1D)</TITLE>
 <link rel="stylesheet" type="text/css" href="../../../documentation/html/doc.css" />
 <link href="../../../documentation/images/dart.ico" rel="shortcut icon" />
 </HEAD>

Modified: DART/branches/model_mod_changes/assimilation_code/location/threed_cartesian/location_mod.html
===================================================================
--- DART/branches/model_mod_changes/assimilation_code/location/threed_cartesian/location_mod.html	2017-04-11 22:38:59 UTC (rev 11456)
+++ DART/branches/model_mod_changes/assimilation_code/location/threed_cartesian/location_mod.html	2017-04-12 17:35:19 UTC (rev 11457)
@@ -2,7 +2,7 @@
           "http://www.w3.org/TR/html4/strict.dtd">
 <HTML>
 <HEAD>
-<TITLE>module location_mod</TITLE>
+<TITLE>module location_mod (threed_cartesian)</TITLE>
 <link rel="stylesheet" type="text/css" href="../../../documentation/html/doc.css" />
 <link href="../../../documentation/images/dart.ico" rel="shortcut icon" />
 </HEAD>
@@ -47,7 +47,7 @@
 cartesian coordinates, cylindrical coordinates, etc.  DART provides
 about half a dozen possible coordinate systems, and others can be added.  
 The most common one for geophysical models is the
-<a href="../threed_sphere/location.html">threed_sphere</a> version.
+<a href="../threed_sphere/location_mod.html">threed_sphere</a> version.
 This document describes an alternative 3D cartesian coordinate system.
 </P>
 <P><strong>Note that only one location module can be compiled into

Modified: DART/branches/model_mod_changes/assimilation_code/location/threed_sphere/location_mod.html
===================================================================
--- DART/branches/model_mod_changes/assimilation_code/location/threed_sphere/location_mod.html	2017-04-11 22:38:59 UTC (rev 11456)
+++ DART/branches/model_mod_changes/assimilation_code/location/threed_sphere/location_mod.html	2017-04-12 17:35:19 UTC (rev 11457)
@@ -2,7 +2,7 @@
           "http://www.w3.org/TR/html4/strict.dtd">
 <HTML>
 <HEAD>
-<TITLE>module location_mod</TITLE>
+<TITLE>module location_mod (threed_sphere)</TITLE>
 <link rel="stylesheet" type="text/css" href="../../../documentation/html/doc.css" />
 <link href="../../../documentation/images/dart.ico" rel="shortcut icon" />
 </HEAD>
@@ -506,7 +506,7 @@
 <TR><TD>maintain_original_vert</TD>
     <TD>logical</TD>
     <TD>If using per-type specialized localization distances
-(see <a href="../../assimilation_code/modules/assimilation/assim_tools_mod.html#Namelist">assim_tools_mod</a>)
+(see <a href="../../modules/assimilation/assim_tools_mod.html#Namelist">assim_tools_mod</a>)
 by default the vertical distances are altered also.  To maintain
 the original vertical scaling while changing the horizontal, set this to true.
 </TD></TR>

Modified: DART/branches/model_mod_changes/assimilation_code/location/utilities/location_io_mod.f90
===================================================================
--- DART/branches/model_mod_changes/assimilation_code/location/utilities/location_io_mod.f90	2017-04-11 22:38:59 UTC (rev 11456)
+++ DART/branches/model_mod_changes/assimilation_code/location/utilities/location_io_mod.f90	2017-04-12 17:35:19 UTC (rev 11457)
@@ -225,8 +225,13 @@
 
 locations = get_location( loc ) 
 
-rc = nf90_put_var(ncFileID, LocationVarId, locations, &
-                 start=(/ 1, locindex /), count=(/ LocationDims, 1 /) )
+if (LocationDims > 1) then
