[Dart-dev] DART/branches Revision: 13014

[dart at ucar.edu]

nancy at ucar.edu
2019-03-14 15:59:07 -0600 (Thu, 14 Mar 2019)
1118
added 'compute_posterior' to the input.nml::&filter_nml namelists.

fixed a bug in the cam-fv model mod if you were localizing in
scale height and had the no_normalization_of_scaleheight .false. ;
thanks to nick pedatella for the fix.

removed an errant 'make clean' in the observations/utilities/threed_sphere
quickbuild.csh file

took an initial stab at moving all the use statements to
get nc_check from the netcdf utilities mod instead of the
utilities mod.  it's needed as we try to isolate the netcdf
code to fewer modules.

also removed many unused variables to cut down on the number
of compile time warnings.

added new tests for the default model time read/write
routines, to support both scalar and time arrays in user
netcdf files.

removed unused code from some of the less often used
location modules to match the current required interfaces.

removed commas from a write() line that provoked a
compiler warning in all the random number test routines.

simplified the default bgrid_solo input.nml namelist
by putting the input/output filenames directly into
the namelist instead of indirect text files.




Modified: DART/branches/recam/assimilation_code/location/channel/location_mod.f90
===================================================================
--- DART/branches/recam/assimilation_code/location/channel/location_mod.f90	2019-03-13 17:43:03 UTC (rev 13013)
+++ DART/branches/recam/assimilation_code/location/channel/location_mod.f90	2019-03-14 21:59:07 UTC (rev 13014)
@@ -13,7 +13,7 @@
 
 use      types_mod, only : r8, i8, MISSING_R8, MISSING_I, PI, RAD2DEG, DEG2RAD
 use  utilities_mod, only : register_module, error_handler, E_ERR, ascii_file_format, &
-                           nc_check, E_MSG, open_file, close_file, set_output,       &
+                           E_MSG, open_file, close_file, set_output,                 &
                            logfileunit, nmlfileunit, find_namelist_in_file,          &
                            check_namelist_read, do_output, do_nml_file,              &
                            do_nml_term, is_longitude_between
@@ -77,11 +77,6 @@
 
 character(len = 512) :: errstring
 
-real(r8) :: radius     ! used only for converting points on a sphere into x,y,z and back
-
-! If maxdist stays the same, don't need to do box distance calculations
-integer :: last_maxdist = -1.0
-
 integer :: nx               = 10
 integer :: ny               = 10
 integer :: nz               = 10
@@ -119,7 +114,7 @@
  
 ! things which need doing exactly once.
 
-integer :: iunit, io, i
+integer :: iunit, io
 
 if (module_initialized) return
 
@@ -331,7 +326,6 @@
 
 integer             :: charlength
 logical             :: writebuf
-character(len=129)  :: string1
 
 10 format(1X,3(G25.16,1X))
 
@@ -484,108 +478,6 @@
 
 !----------------------------------------------------------------------------
 
-function nc_write_location_atts( ncFileID, fname, ObsNumDimID ) result (ierr)
- 
-! Writes the "location module" -specific attributes to a netCDF file.
-
-use typeSizes
-use netcdf
-
-integer,          intent(in) :: ncFileID     ! handle to the netcdf file
-character(len=*), intent(in) :: fname        ! file name (for printing purposes)
-integer,          intent(in) :: ObsNumDimID  ! handle to the dimension that grows
-integer                      :: ierr
-
-integer :: LocDimID
-integer :: VarID
-
-if ( .not. module_initialized ) call initialize_module
-
-ierr = -1 ! assume things will fail ...
-
-! define the rank/dimension of the location information
-call nc_check(nf90_def_dim(ncid=ncFileID, name='location', len=LocationDims, &
-       dimid = LocDimID), 'nc_write_location_atts', 'def_dim:location '//trim(fname))
-
-! Define the location variable and attributes
-
-call nc_check(nf90_def_var(ncid=ncFileID, name='location', xtype=nf90_double, &
-          dimids=(/ LocDimID, ObsNumDimID /), varid=VarID), &
-            'nc_write_location_atts', 'location:def_var')
-
-call nc_check(nf90_put_att(ncFileID, VarID, 'description', &
-        'location coordinates'), 'nc_write_location_atts', 'location:description')
-call nc_check(nf90_put_att(ncFileID, VarID, 'location_type', &
-        trim(LocationName)), 'nc_write_location_atts', 'location:location_type')
-call nc_check(nf90_put_att(ncFileID, VarID, 'long_name', &
-        trim(LocationLName)), 'nc_write_location_atts', 'location:long_name')
-call nc_check(nf90_put_att(ncFileID, VarID, 'storage_order',     &
-        'X Y Z'), 'nc_write_location_atts', 'location:storage_order')
-call nc_check(nf90_put_att(ncFileID, VarID, 'units',     &
-        'X Y Z'), 'nc_write_location_atts', 'location:units')
-
-ierr = 0
-
-end function nc_write_location_atts
-
-!----------------------------------------------------------------------------
-
-subroutine nc_get_location_varids( ncFileID, fname, LocationVarID, WhichVertVarID )
-
-! Return the LocationVarID and WhichVertVarID variables from a given netCDF file.
-!
-! ncFileId         the netcdf file descriptor
-! fname            the name of the netcdf file (for error messages only)
-! LocationVarID    the integer ID of the 'location' variable in the netCDF file
-! WhichVertVarID   the integer ID of the 'which_vert' variable in the netCDF file
-