[Dart-dev] DART/branches Revision: 12793

[dart at ucar.edu]

nancy at ucar.edu
2018-08-28 15:43:04 -0600 (Tue, 28 Aug 2018)
203
fix an uninitialized count in an obs_impact table construction
derived type.  should be migrated to the rma_trunk.

fix the developer_tests directory - many of the existing
tests were not being called.




Modified: DART/branches/recam/assimilation_code/modules/utilities/obs_impact_mod.f90
===================================================================
--- DART/branches/recam/assimilation_code/modules/utilities/obs_impact_mod.f90	2018-08-28 18:13:13 UTC (rev 12792)
+++ DART/branches/recam/assimilation_code/modules/utilities/obs_impact_mod.f90	2018-08-28 21:43:04 UTC (rev 12793)
@@ -492,6 +492,7 @@
 enddo
 
 allocate(toc%toc_entries(ntoc))
+toc%toc_count = 0
 
 call build_toc(qty_count, knownqtys, type_count, knowntypes, toc)
 

Modified: DART/branches/recam/developer_tests/io/test_diag_structure.f90
===================================================================
--- DART/branches/recam/developer_tests/io/test_diag_structure.f90	2018-08-28 18:13:13 UTC (rev 12792)
+++ DART/branches/recam/developer_tests/io/test_diag_structure.f90	2018-08-28 21:43:04 UTC (rev 12793)
@@ -21,6 +21,7 @@
 program test_diag_structure
 
 use types_mod,           only : i8
+use utilities_mod,       only : initialize_utilities, finalize_utilities
 use state_structure_mod, only : create_diagnostic_structure, end_diagnostic_structure, &
                                 add_domain, get_num_variables, get_num_dims, &
                                 get_num_domains, get_dim_name, get_variable_name, &
@@ -41,6 +42,9 @@
 
 model_size = 44
 
+! init library
+call initialize_utilities()
+
 ! Add domain
 domain_id = add_domain(model_size)
 
@@ -138,6 +142,7 @@
 ! This should die
 !print*, get_num_dims(diag_id, 1)
 
+call finalize_utilities()
 
 !-----------------------------------------------------------------------------
 

Copied: DART/branches/recam/developer_tests/io/work/broken.mkmf_test_cf_conventions (from rev 12792, DART/branches/recam/developer_tests/io/work/mkmf_test_cf_conventions)
===================================================================
--- DART/branches/recam/developer_tests/io/work/broken.mkmf_test_cf_conventions	                        (rev 0)
+++ DART/branches/recam/developer_tests/io/work/broken.mkmf_test_cf_conventions	2018-08-28 21:43:04 UTC (rev 12793)
@@ -0,0 +1,65 @@
+#!/bin/csh
+#
+# 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$
+#
+# usage: mkmf_test_cf_conventions [ -mpi | -nompi ]
+#
+# without any args, builds test_cf_conventions without mpi libraries, and it will run
+# as a normal executable. if -mpi is given, it will be compiled with the mpi
+# libraries and can run with multiple cooperating processes.
+
+if ( $#argv > 0 ) then
+  if ("$argv[1]" == "-mpi") then
+    setenv usingmpi 1
+  else if ("$argv[1]" == "-nompi") then
+    setenv usingmpi 0
+  else
+    echo "Unrecognized argument to mkmf_test_cf_conventions: $argv[1]"
+    echo "Usage: mkmf_test_cf_conventions [ -mpi | -nompi ]"
+    echo " default is to generate a Makefile without MPI support."
+    exit -1
+  endif
+else
+  setenv usingmpi 0
+endif
+
+
+# make a backup copy of the path_names file, and then use
+# sed to make sure it includes either the non-mpi subroutines,
+# or the subroutines which really call mpi.
+cp -f path_names_test_cf_conventions path_names_test_cf_conventions.back
+
+if ( $usingmpi ) then
+
+  echo "Making Makefile with MPI"
+  touch using_mpi_for_test_cf_conventions
+  sed -e 's;/null_mpi_util;/mpi_util;' path_names_test_cf_conventions.back >! path_names_test_cf_conventions
+
+  setenv wrapper_arg -w
+
+else
+
+  echo "Making Makefile without MPI"
+  rm -f using_mpi_for_test_cf_conventions
+  sed -e 's;/mpi_util;/null_mpi_util;' path_names_test_cf_conventions.back >! path_names_test_cf_conventions
+  setenv wrapper_arg ""
+
+endif
+