[Dart-dev] DART/branches Revision: 12511

[dart at ucar.edu]

nancy at ucar.edu
2018-04-12 11:26:05 -0600 (Thu, 12 Apr 2018)
47
fold nsc_updates into all_nsc_changes branch.




Index: DART/branches/rma_trunk
===================================================================
--- DART/branches/rma_trunk	2018-04-12 17:21:30 UTC (rev 12510)
+++ DART/branches/rma_trunk	2018-04-12 17:26:05 UTC (rev 12511)

Property changes on: DART/branches/rma_trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -7,6 +7,7 ##
 /DART/branches/helen:5989-6155
 /DART/branches/mmc:12038-12269
 /DART/branches/model_mod_changes:11403-11604
+/DART/branches/nsc_updates:12474-12510
 /DART/branches/rma_array_nml:11814-11839
 /DART/branches/rma_cam_fv:9552-9728
 /DART/branches/rma_cf_conventions:9727-10086
Modified: DART/branches/rma_trunk/assimilation_code/modules/assimilation/quality_control_mod.f90
===================================================================
--- DART/branches/rma_trunk/assimilation_code/modules/assimilation/quality_control_mod.f90	2018-04-12 17:21:30 UTC (rev 12510)
+++ DART/branches/rma_trunk/assimilation_code/modules/assimilation/quality_control_mod.f90	2018-04-12 17:26:05 UTC (rev 12511)
@@ -133,7 +133,7 @@
 if(input_qc == 0 .and. (assimilate_this_ob .or. evaluate_this_ob)) then
    set_input_qc = 0.0_r8
 else
-   set_input_qc = 1000.0_r8
+   set_input_qc = 1000.0_r8 + input_qc
 endif
 
 end function set_input_qc

Modified: DART/branches/rma_trunk/assimilation_code/modules/utilities/netcdf_utilities_mod.f90
===================================================================
--- DART/branches/rma_trunk/assimilation_code/modules/utilities/netcdf_utilities_mod.f90	2018-04-12 17:21:30 UTC (rev 12510)
+++ DART/branches/rma_trunk/assimilation_code/modules/utilities/netcdf_utilities_mod.f90	2018-04-12 17:26:05 UTC (rev 12511)
@@ -37,6 +37,7 @@
           nc_add_attribute_to_variable,   &
           nc_get_attribute_from_variable, &
           nc_define_dimension,            &
+          nc_define_unlimited_dimension,  &
           nc_define_integer_variable,     &
           nc_define_real_variable,        &
           nc_define_double_variable,      &
@@ -64,8 +65,10 @@
 interface nc_add_global_attribute
    module procedure nc_add_global_char_att
    module procedure nc_add_global_int_att
-   module procedure nc_add_global_real_att
-   module procedure nc_add_global_real_array_att
+   module procedure nc_add_global_float_att
+   module procedure nc_add_global_double_att
+   module procedure nc_add_global_float_array_att
+   module procedure nc_add_global_double_array_att
 end interface
 
 interface nc_get_global_attribute
@@ -79,8 +82,10 @@
    module procedure nc_add_char_att_to_var
    module procedure nc_add_int_array_att_to_var
    module procedure nc_add_int_att_to_var
-   module procedure nc_add_real_att_to_var
-   module procedure nc_add_real_array_att_to_var
+   module procedure nc_add_float_att_to_var
+   module procedure nc_add_double_att_to_var
+   module procedure nc_add_float_array_att_to_var
+   module procedure nc_add_double_array_att_to_var
 end interface
 
 interface nc_get_attribute_from_variable
@@ -115,6 +120,8 @@
    module procedure nc_put_real_2d
    module procedure nc_put_int_3d
    module procedure nc_put_real_3d
+   module procedure nc_put_int_4d
+   module procedure nc_put_real_4d
 end interface
 
 interface nc_get_variable
@@ -129,6 +136,8 @@
    module procedure nc_get_short_3d
    module procedure nc_get_int_3d
    module procedure nc_get_real_3d
+   module procedure nc_get_int_4d
+   module procedure nc_get_real_4d
 end interface
 
 interface nc_get_variable_size
@@ -254,40 +263,76 @@
 
 !--------------------------------------------------------------------
 
-subroutine nc_add_global_real_att(ncid, attname, val, context, filename)
+subroutine nc_add_global_float_att(ncid, attname, val, context, filename)
 
 integer,          intent(in) :: ncid
 character(len=*), intent(in) :: attname
-real(r8),         intent(in) :: val
+real(r4),         intent(in) :: val
 character(len=*), intent(in), optional :: context
 character(len=*), intent(in), optional :: filename
 
-character(len=*), parameter :: routine = 'nc_add_global_real_att'