[Dart-dev] svn:mergeinfo/ Revision: 10852

[dart at ucar.edu]

thoar at ucar.edu
2016-12-29 12:07:59 -0700 (Thu, 29 Dec 2016)
136
Bringing up-to-date with respect to rma_trunk r10851 in preparation 
for merging back onto the rma_trunk and deprecating the branch.  




Index: DART/branches/rma_cice
===================================================================
--- DART/branches/rma_cice	2016-12-29 18:37:00 UTC (rev 10851)
+++ DART/branches/rma_cice	2016-12-29 19:07:59 UTC (rev 10852)

Property changes on: DART/branches/rma_cice
___________________________________________________________________
Modified: svn:mergeinfo
## -25,6 +25,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:10655-10851
 /DART/branches/rma_trunk_clamping:8792-8807
 /DART/branches/rma_trunk_filename:8017-8163
 /DART/branches/rma_trunk_get_state_fun:8574-8602
\ No newline at end of property
Modified: DART/branches/rma_cice/diagnostics/oned/obs_diag.f90
===================================================================
--- DART/branches/rma_cice/diagnostics/oned/obs_diag.f90	2016-12-29 18:37:00 UTC (rev 10851)
+++ DART/branches/rma_cice/diagnostics/oned/obs_diag.f90	2016-12-29 19:07:59 UTC (rev 10852)
@@ -361,7 +361,7 @@
 ! Open file for histogram of innovations, as a function of standard deviation.
 !----------------------------------------------------------------------
 
-nsigmaUnit = open_file('LargeInnov.txt',form='formatted',action='rewind')
+nsigmaUnit = open_file('LargeInnov.txt',form='formatted',action='write')
 write(nsigmaUnit,'(a)')'Any observations flagged as bad are dumped into the last bin.'
 write(nsigmaUnit,'(a)') '   day   secs    loc            obs         prior   zscore   key   kind'
 

Modified: DART/branches/rma_cice/diagnostics/threed_cartesian/obs_diag.f90
===================================================================
--- DART/branches/rma_cice/diagnostics/threed_cartesian/obs_diag.f90	2016-12-29 18:37:00 UTC (rev 10851)
+++ DART/branches/rma_cice/diagnostics/threed_cartesian/obs_diag.f90	2016-12-29 19:07:59 UTC (rev 10852)
@@ -398,7 +398,7 @@
 ! Open file for histogram of innovations, as a function of standard deviation.
 !----------------------------------------------------------------------
 
-nsigmaUnit = open_file('LargeInnov.txt',form='formatted',action='rewind')
+nsigmaUnit = open_file('LargeInnov.txt',form='formatted',action='write')
 write(nsigmaUnit,'(a)')'Any observations flagged as bad are dumped into the last bin.'
 write(nsigmaUnit,'(a)')'   day   secs            x              y            level&
                        &         obs           prior  zscore     key    kind'

Modified: DART/branches/rma_cice/io/copies_on_off_mod.f90
===================================================================
--- DART/branches/rma_cice/io/copies_on_off_mod.f90	2016-12-29 18:37:00 UTC (rev 10851)
+++ DART/branches/rma_cice/io/copies_on_off_mod.f90	2016-12-29 19:07:59 UTC (rev 10852)
@@ -85,7 +85,7 @@
           SPARE_PRIOR_MEAN, SPARE_PRIOR_SPREAD, &
           SPARE_PRIOR_INF_MEAN, SPARE_PRIOR_INF_SPREAD, &
           SPARE_POST_INF_MEAN, SPARE_POST_INF_SPREAD, &
-          query_copy_present
+          query_copy_present, COPY_NOT_PRESENT
 
 ! Used to test if a copy is not in use, e.g. the spare copies may not be in use.
 integer, parameter :: COPY_NOT_PRESENT = -1

Modified: DART/branches/rma_cice/io/direct_netcdf_mod.f90
===================================================================
--- DART/branches/rma_cice/io/direct_netcdf_mod.f90	2016-12-29 18:37:00 UTC (rev 10851)
+++ DART/branches/rma_cice/io/direct_netcdf_mod.f90	2016-12-29 19:07:59 UTC (rev 10852)
@@ -93,7 +93,8 @@
 
 implicit none
 private
-public :: read_transpose, transpose_write
+public :: read_transpose, transpose_write, &
+          read_variables
 
 ! version controlled file description for error handling, do not edit
 character(len=256), parameter :: source   = &

Index: DART/branches/rma_cice/models/POP
===================================================================
--- DART/branches/rma_cice/models/POP	2016-12-29 18:37:00 UTC (rev 10851)
+++ DART/branches/rma_cice/models/POP	2016-12-29 19:07:59 UTC (rev 10852)

Property changes on: DART/branches/rma_cice/models/POP
___________________________________________________________________
Added: svn:mergeinfo
## -0,0 +1,40 ##
+/DART/branches/CM1/models/POP:8575-10322
+/DART/branches/bgrid_sprint/models/POP:8194-8243
+/DART/branches/bgrid_sprint_state_reorder/models/POP:8214-8256
+/DART/branches/development/models/POP:4680-6255
+/DART/branches/gitm/models/POP:5143-6215
+/DART/branches/gitm_lanai/models/POP:6571-6652
+/DART/branches/helen/models/POP:5995-6161
+/DART/branches/rma_cam_fv/models/POP:9558-9734
+/DART/branches/rma_cf_conventions/models/POP:9733-10092
+/DART/branches/rma_clm/models/POP:8911-9132
+/DART/branches/rma_diag/models/POP:9629-9743
+/DART/branches/rma_kinds_to_state_structure/models/POP:8958-9437
+/DART/branches/rma_kinds_to_state_strucutre/models/POP:8909-8957
+/DART/branches/rma_model_mod_check/models/POP:8965-9178
+/DART/branches/rma_mpas_fold_mean_fwd/models/POP:9348-9458
+/DART/branches/rma_mpas_get_state_meta_data/models/POP:8871-8890
+/DART/branches/rma_obs_defs/models/POP:8923-9067
+/DART/branches/rma_par_msg/models/POP:9472-9511