[Dart-dev] DART/branches Revision: 13090

[dart at ucar.edu]

thoar at ucar.edu
2019-03-29 13:54:25 -0600 (Fri, 29 Mar 2019)
202
Bringing up-to-date with the rma_trunk.

Some of the matlab diagnostics are basically reverted to working copies
of the rma_trunk - the prototypes are not ready to be committed and have
been stashed.





Index: DART/branches/qc8diags
===================================================================
--- DART/branches/qc8diags	2019-03-29 15:46:47 UTC (rev 13089)
+++ DART/branches/qc8diags	2019-03-29 19:54:25 UTC (rev 13090)

Property changes on: DART/branches/qc8diags
___________________________________________________________________
Modified: svn:mergeinfo
## -43,7 +43,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:13002
+/DART/branches/rma_trunk:13002-13089
 /DART/branches/rma_trunk_clamping:8786-8801
 /DART/branches/rma_trunk_filename:8011-8157
 /DART/branches/rma_trunk_get_state_fun:8568-8596
Index: DART/branches/qc8diags/assimilation_code/modules/assimilation/assim_tools_mod.f90
===================================================================
--- DART/branches/qc8diags/assimilation_code/modules/assimilation/assim_tools_mod.f90	2019-03-29 15:46:47 UTC (rev 13089)
+++ DART/branches/qc8diags/assimilation_code/modules/assimilation/assim_tools_mod.f90	2019-03-29 19:54:25 UTC (rev 13090)

Property changes on: DART/branches/qc8diags/assimilation_code/modules/assimilation/assim_tools_mod.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -17,7 +17,7 ##
 /DART/branches/mmc/assimilation_code/modules/assimilation/assim_tools_mod.f90:12038-12269
 /DART/branches/model_mod_changes/assimilation_code/modules/assimilation/assim_tools_mod.f90:11403-11604
 /DART/branches/pertirb_tool/assimilation_code/modules/assimilation/assim_tools_mod.f90:12695-12764
-/DART/branches/recam/assimilation_code/modules/assimilation/assim_tools_mod.f90:12028-13012
+/DART/branches/recam/assimilation_code/modules/assimilation/assim_tools_mod.f90:12028-13073
 /DART/branches/rma_array_nml/assimilation_code/modules/assimilation/assim_tools_mod.f90:11814-11839
 /DART/branches/rma_cam_fv/assim_tools/assim_tools_mod.f90:9552-9728
 /DART/branches/rma_cam_fv/assimilation_code/modules/assimilation/assim_tools_mod.f90:9552-9728
## -67,7 +67,7 ##
 /DART/branches/rma_state_structure_test_dir/assimilation_code/modules/assimilation/assim_tools_mod.f90:9472-9676
 /DART/branches/rma_state_structure_unit_test/assim_tools/assim_tools_mod.f90:9691-10268
 /DART/branches/rma_state_structure_unit_test/assimilation_code/modules/assimilation/assim_tools_mod.f90:9691-10268
-/DART/branches/rma_trunk/assimilation_code/modules/assimilation/assim_tools_mod.f90:9634-9728,13002
+/DART/branches/rma_trunk/assimilation_code/modules/assimilation/assim_tools_mod.f90:9634-9728,13002-13089
 /DART/branches/rma_trunk_clamping/assimilation_code/modules/assimilation/assim_tools_mod.f90:8786-8801
 /DART/branches/rma_trunk_filename/assim_tools/assim_tools_mod.f90:8011-8157
 /DART/branches/rma_trunk_filename/assimilation_code/modules/assimilation/assim_tools_mod.f90:8011-8157
Index: DART/branches/qc8diags/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90
===================================================================
--- DART/branches/qc8diags/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90	2019-03-29 15:46:47 UTC (rev 13089)
+++ DART/branches/qc8diags/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90	2019-03-29 19:54:25 UTC (rev 13090)

Property changes on: DART/branches/qc8diags/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90
___________________________________________________________________
Modified: svn:mergeinfo
## -17,7 +17,7 ##
 /DART/branches/mmc/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90:12038-12269
 /DART/branches/model_mod_changes/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90:11403-11604
 /DART/branches/mpas/obs_kind/DEFAULT_obs_kind_mod.F90:5177-5666
-/DART/branches/recam/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90:12028-13012
+/DART/branches/recam/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90:12028-13073
 /DART/branches/rma_array_nml/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90:11814-11839
 /DART/branches/rma_cam_fv/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90:9552-9728
 /DART/branches/rma_cam_fv/obs_kind/DEFAULT_obs_kind_mod.F90:9552-9728
## -64,7 +64,7 ##
 /DART/branches/rma_state_structure_test_dir/obs_kind/DEFAULT_obs_kind_mod.F90:9472-9676
 /DART/branches/rma_state_structure_unit_test/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90:9691-10268
 /DART/branches/rma_state_structure_unit_test/obs_kind/DEFAULT_obs_kind_mod.F90:9691-10268
-/DART/branches/rma_trunk/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90:9634-9728,13002
+/DART/branches/rma_trunk/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90:9634-9728,13002-13089
 /DART/branches/rma_trunk_clamping/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90:8786-8801
 /DART/branches/rma_trunk_filename/assimilation_code/modules/observations/DEFAULT_obs_kind_mod.F90:8011-8157
 /DART/branches/rma_trunk_filename/obs_kind/DEFAULT_obs_kind_mod.F90:8011-8157
Index: DART/branches/qc8diags/assimilation_code/programs/closest_member_tool/closest_member_tool.f90
===================================================================
--- DART/branches/qc8diags/assimilation_code/programs/closest_member_tool/closest_member_tool.f90	2019-03-29 15:46:47 UTC (rev 13089)
+++ DART/branches/qc8diags/assimilation_code/programs/closest_member_tool/closest_member_tool.f90	2019-03-29 19:54:25 UTC (rev 13090)

Property changes on: DART/branches/qc8diags/assimilation_code/programs/closest_member_tool/closest_member_tool.f90
___________________________________________________________________
Modified: svn:mergeinfo
## -66,7 +66,7 ##
 /DART/branches/rma_state_structure_test_dir/utilities/closest_member_tool.f90:9472-9676
 /DART/branches/rma_state_structure_unit_test/assimilation_code/programs/closest_member_tool/closest_member_tool.f90:9691-10268
 /DART/branches/rma_state_structure_unit_test/utilities/closest_member_tool.f90:9691-10268
-/DART/branches/rma_trunk/assimilation_code/programs/closest_member_tool/closest_member_tool.f90:9634-9728,13002
+/DART/branches/rma_trunk/assimilation_code/programs/closest_member_tool/closest_member_tool.f90:9634-9728,13002-13089
 /DART/branches/rma_trunk_clamping/assimilation_code/programs/closest_member_tool/closest_member_tool.f90:8786-8801
 /DART/branches/rma_trunk_filename/assimilation_code/programs/closest_member_tool/closest_member_tool.f90:8011-8157
 /DART/branches/rma_trunk_filename/utilities/closest_member_tool.f90:8011-8157
Deleted: DART/branches/qc8diags/build_templates/mkmf.template.nag.linux
===================================================================
--- DART/branches/qc8diags/build_templates/mkmf.template.nag.linux	2019-03-29 15:46:47 UTC (rev 13089)
+++ DART/branches/qc8diags/build_templates/mkmf.template.nag.linux	2019-03-29 19:54:25 UTC (rev 13090)
@@ -1,82 +0,0 @@
-# Template for NAG Fortran Compiler on Linux clusters and workstations.
-#
-# DART software - Copyright UCAR. This open source software is provided
-# by UCAR, "as is", without charge, subject to all terms of use at
-# http://www.image.ucar.edu/DAReS/DART/DART_download
-#
-# DART $Id$
-
-# typical use with mkmf
-# mkmf -t mkmf.template.xxxx ...