[Dart-dev] DART/branches Revision: 11797

[dart at ucar.edu]

thoar at ucar.edu
2017-07-07 10:02:06 -0600 (Fri, 07 Jul 2017)
109
Updated to rma_trunk revision 11703 - the last good revision before the repository corruption on June 14th.




Index: DART/branches/rma_openggcm
===================================================================
--- DART/branches/rma_openggcm	2017-07-07 15:53:12 UTC (rev 11796)
+++ DART/branches/rma_openggcm	2017-07-07 16:02:06 UTC (rev 11797)

Property changes on: DART/branches/rma_openggcm
___________________________________________________________________
Modified: svn:mergeinfo
## -30,7 +30,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:9832-11636
+/DART/branches/rma_trunk:9832-11703
 /DART/branches/rma_trunk_clamping:8792-8807
 /DART/branches/rma_trunk_filename:8017-8163
 /DART/branches/rma_trunk_get_state_fun:8574-8602
## -42,5 +42,6 ##
 /DART/branches/rma_trunk_read_transpose:9214-9256
 /DART/branches/rma_trunk_vert_loc:8538-8543
 /DART/branches/rma_types_kinds:11208-11242
+/DART/branches/rma_updates_nancy:11621-11682
 /DART/branches/trunk_with_cam_style:9473-9540
 /DART/trunk:6306-9556
\ No newline at end of property
Modified: DART/branches/rma_openggcm/assimilation_code/location/utilities/location_io_mod.f90
===================================================================
--- DART/branches/rma_openggcm/assimilation_code/location/utilities/location_io_mod.f90	2017-07-07 15:53:12 UTC (rev 11796)
+++ DART/branches/rma_openggcm/assimilation_code/location/utilities/location_io_mod.f90	2017-07-07 16:02:06 UTC (rev 11797)
@@ -34,7 +34,8 @@
 private
 
 public :: nc_write_location_atts, nc_get_location_varids, &
-          nc_write_location, nc_write_location_vert
+          nc_write_location, nc_write_location_vert,      &
+          nc_add_location_atts
 
 ! version controlled file description for error handling, do not edit
 character(len=256), parameter :: source   = &
@@ -76,7 +77,7 @@
 integer :: rc
 character(len=32) :: context = 'nc_write_location_atts'
 
-! get an id for the locations dimension:  
+! get an id for the location dimension:  
 !  if the user passes us in a dimension id, 
 !     assume it is already created and use it.
 !  if they pass in a valid length, create a 'location' dimension.
@@ -113,6 +114,28 @@
    call nc_check(rc, context, 'def_var4:location', fname)
 endif
 
+call nc_add_location_atts(ncFileID, 'location', fname)
+
+end subroutine nc_write_location_atts
+
+!----------------------------------------------------------------------------
+!> Add location-related attributes to the given variable.
+!> (assumes that this variable will contain location info)
+
+subroutine nc_add_location_atts(ncFileID, varname, fname) 
+ 
+integer,                    intent(in) :: ncFileID    ! handle to the netcdf file
+character(len=*),           intent(in) :: varname     ! name of location variable
+character(len=*), optional, intent(in) :: fname       ! file name (for error printing purposes)
+
+integer :: VarID
+integer :: rc
+character(len=32) :: context = 'nc_add_location_atts'
+
+! find the id of the given variable name
+rc = nf90_inq_varid(ncFileID, varname, varid=VarID)
+call nc_check(rc, context, 'inq_varid:'//trim(varname), fname)
+
 rc = nf90_put_att(ncFileID, VarID, 'description', 'location coordinates')
 call nc_check(rc, context, 'put_att:description', fname)
 
@@ -132,10 +155,10 @@
 ! create a variable to store the vert choice
 
 if (has_vertical_choice()) then
-   call nc_write_location_vert(ncFileID, LocDimID, fname)
+   call nc_write_location_vert(ncFileID, VarID, fname)
 endif
 
-end subroutine nc_write_location_atts
+end subroutine nc_add_location_atts
 
 !----------------------------------------------------------------------------
 !> Define the ancillary vertical array and attributes

Modified: DART/branches/rma_openggcm/assimilation_code/modules/assimilation/filter_mod.dopplerfold.f90
===================================================================
--- DART/branches/rma_openggcm/assimilation_code/modules/assimilation/filter_mod.dopplerfold.f90	2017-07-07 15:53:12 UTC (rev 11796)
+++ DART/branches/rma_openggcm/assimilation_code/modules/assimilation/filter_mod.dopplerfold.f90	2017-07-07 16:02:06 UTC (rev 11797)
@@ -2246,38 +2246,38 @@
 
 if ( do_prior_inflate ) then
    if ( inf_initial_from_restart(1)    ) &
-      call set_io_copy_flag(file_info, STAGE_COPIES(PRIORINF_MEAN), READ_COPY, has_units=.false.)
+      call set_io_copy_flag(file_info, STAGE_COPIES(PRIORINF_MEAN), READ_COPY, inherit_units=.false.)