[Dart-dev] DART/branches Revision: 12067

[dart at ucar.edu]

thoar at ucar.edu
2017-11-08 15:57:02 -0700 (Wed, 08 Nov 2017)
168
Bringing up-to-date with respect to the model_mod_check (mmc) branch.
The mmc branch has some changes from the rma_trunk.
Really wanted the changes to the io modules.




Index: DART/branches/coamps
===================================================================
--- DART/branches/coamps	2017-11-08 22:12:59 UTC (rev 12066)
+++ DART/branches/coamps	2017-11-08 22:57:02 UTC (rev 12067)

Property changes on: DART/branches/coamps
___________________________________________________________________
Modified: svn:mergeinfo
## -5,6 +5,7 ##
 /DART/branches/gitm:5137-6209
 /DART/branches/gitm_lanai:6565-6646
 /DART/branches/helen:5989-6155
+/DART/branches/mmc:12038-12066
 /DART/branches/model_mod_changes:11403-11604
 /DART/branches/rma_array_nml:11814-11839
 /DART/branches/rma_cam_fv:9552-9728
## -34,7 +35,7 ##
 /DART/branches/rma_sprint:8095-8166
 /DART/branches/rma_state_structure_test_dir:9472-9676
 /DART/branches/rma_state_structure_unit_test:9691-10268
-/DART/branches/rma_trunk:11712-12017
+/DART/branches/rma_trunk:11712-12037
 /DART/branches/rma_trunk_clamping:8786-8801
 /DART/branches/rma_trunk_filename:8011-8157
 /DART/branches/rma_trunk_get_state_fun:8568-8596
Modified: DART/branches/coamps/assimilation_code/location/threed_sphere/location_mod.f90
===================================================================
--- DART/branches/coamps/assimilation_code/location/threed_sphere/location_mod.f90	2017-11-08 22:12:59 UTC (rev 12066)
+++ DART/branches/coamps/assimilation_code/location/threed_sphere/location_mod.f90	2017-11-08 22:57:02 UTC (rev 12067)
@@ -815,7 +815,7 @@
    case (VERTISSURFACE)
       write(charstring, '(A,F13.5,A)') trim(string1), loc%vloc, ' surface (m)'
    case (VERTISLEVEL)
-      write(charstring, '(A,F6.0,A)')  trim(string1), loc%vloc, '        level'
+      write(charstring, '(A,F13.6,A)') trim(string1), loc%vloc, '        level'
    case (VERTISPRESSURE)
       write(charstring, '(A,F13.7,A)') trim(string1), loc%vloc / 100.0_r8, ' hPa'
    case (VERTISHEIGHT)

Modified: DART/branches/coamps/assimilation_code/location/utilities/default_location_mod.f90
===================================================================
--- DART/branches/coamps/assimilation_code/location/utilities/default_location_mod.f90	2017-11-08 22:12:59 UTC (rev 12066)
+++ DART/branches/coamps/assimilation_code/location/utilities/default_location_mod.f90	2017-11-08 22:57:02 UTC (rev 12067)
@@ -23,17 +23,15 @@
           get_vertical_localization_coord, set_vertical_localization_coord
 
 ! version controlled file description for error handling, do not edit
-character(len=256), parameter :: source   = &
+character(len=*), parameter :: source   = &
    "$URL$"
-character(len=32 ), parameter :: revision = "$Revision$"
-character(len=128), parameter :: revdate  = "$Date$"
+character(len=*), parameter :: revision = "$Revision$"
+character(len=*), parameter :: revdate  = "$Date$"
 
 integer :: location_vertical_localization_coord = 0
 
 logical, save :: module_initialized = .false.
 
-character(len = 129) :: errstring
-
 contains
 
 !----------------------------------------------------------------------------

Modified: DART/branches/coamps/assimilation_code/modules/io/dart_time_io_mod.f90
===================================================================
--- DART/branches/coamps/assimilation_code/modules/io/dart_time_io_mod.f90	2017-11-08 22:12:59 UTC (rev 12066)
+++ DART/branches/coamps/assimilation_code/modules/io/dart_time_io_mod.f90	2017-11-08 22:57:02 UTC (rev 12067)
@@ -234,7 +234,7 @@
    endif
 
    !>@todo NF90_UNLIMITED
-   ios = nf90_def_var(ncid, name="time", xtype=nf90_int, varid=VarID)
+   ios = nf90_def_var(ncid, name="time", xtype=nf90_double, varid=VarID)
    call nc_check(ios, "write_model_time", "time def_var")
 
    ! define time attributes consistent with CF convention

Modified: DART/branches/coamps/assimilation_code/modules/io/direct_netcdf_mod.f90
===================================================================
--- DART/branches/coamps/assimilation_code/modules/io/direct_netcdf_mod.f90	2017-11-08 22:12:59 UTC (rev 12066)
+++ DART/branches/coamps/assimilation_code/modules/io/direct_netcdf_mod.f90	2017-11-08 22:57:02 UTC (rev 12067)
@@ -966,7 +966,7 @@
 istart = dart_index ! position in state_ens_handle%vars
 block_size = 0
 
-! need to read into a tempory array, then fill up copies
+! need to read into a temporary array, then fill up copies
 
 COPIES: do copy = 1, state_ens_handle%my_num_copies
 
@@ -994,7 +994,10 @@
          call get_ensemble_time(state_ens_handle, time_owner_index, dart_time)
          ncfile_out = create_and_open_state_output(name_handle, domain, copy, &
                                                    dart_time, write_single_precision)
-
+         !>@todo if multiple domains exist in the same file, only the variables
+         !>      from the first domain are created by create_and_open_state_output()
+         !>      and since the file exists, the variables for the additional domains
+         !>      never get defined in the netCDF file.