Merge branch 'feature_2285_read_point_data' of github.com:dtcenter/ME…

…T into feature_2285_read_point_data

internal/scripts/sonarqube/python.sonar-project.properties

@@ -1,4 +1,4 @@
-sonar.projectKey=org.sonarqube:MET_python_NB
+sonar.projectKey=MET_python_NB
 sonar.projectName=MET python Nightly Build
 sonar.projectVersion=1.0
 
@@ -13,5 +13,5 @@ sonar.sourceEncoding=UTF-8
 #sonar.host.url=http://localhost:9000
 sonar.host.url=http://mandan:9000
 
-sonar.login=met
-sonar.password=[email protected]
+sonar.login=squ_e965ad7d3c3abed1326573f25262212dc969798b
+sonar.branch.name=develop

internal/scripts/sonarqube/sonar-project.properties

@@ -1,4 +1,4 @@
-sonar.projectKey=org.sonarqube:MET_develop_NB
+sonar.projectKey=MET_develop_NB
 sonar.projectName=MET Nightly Build
 sonar.projectVersion=1.0
 
@@ -14,6 +14,5 @@ sonar.sourceEncoding=UTF-8
 #sonar.host.url=http://localhost:9000
 sonar.host.url=http://mandan:9000
 
-sonar.login=met
-sonar.password=[email protected]
+sonar.login=squ_e965ad7d3c3abed1326573f25262212dc969798b
 sonar.branch.name=develop

src/basic/enum_to_string/code.cc

@@ -80,7 +80,7 @@ char upper[256];
 char pound_define[256];
 char junk[256];
 int len, scope_len, max_len;
-char * len_name = (char *) NULL;
+char * len_name = (char *) nullptr;
 
 
 max_len = 0;
@@ -240,7 +240,7 @@ f << "\n\n"
 
 f.close();
 
-if ( len_name )  { delete [] len_name;  len_name = (char *) NULL; }
+if ( len_name )  { delete [] len_name;  len_name = (char *) nullptr; }
 
 return;
 
@@ -263,7 +263,7 @@ char upper[256];
 char pound_define[256];
 char junk[256];
 int len, scope_len, max_len;
-char * len_name = (char *) NULL;
+char * len_name = (char *) nullptr;
 
 max_len = 0;
 
@@ -407,7 +407,7 @@ f << "\n\n"
 
 f.close();
 
-if ( len_name )  { delete [] len_name;  len_name = (char *) NULL; }
+if ( len_name )  { delete [] len_name;  len_name = (char *) nullptr; }
 
 return;
 
@@ -962,7 +962,7 @@ void warning(ofstream & f)
 
 int j;
 
-const char * short_name = (const char *) NULL;
+const char * short_name = (const char *) nullptr;
 
    //
    //  strip the leading path from header_filename
@@ -1001,7 +1001,7 @@ void patch_name(char * len_name)
 
 int j, n;
 int pos;
-char * new_name = (char *) NULL;
+char * new_name = (char *) nullptr;
 char c;
 const char *method_name = "patch_name() -> ";
 
@@ -1042,7 +1042,7 @@ m_strcpy(len_name, new_name, method_name);
    //  done
    //
 
-if ( new_name )  { delete [] new_name;  new_name = (char *) NULL; }
+if ( new_name )  { delete [] new_name;  new_name = (char *) nullptr; }
 
 return;
 

src/basic/enum_to_string/enum_to_string.cc

@@ -137,7 +137,7 @@ header_filename = argv[1];
 
 yydebug = debug;
 
-if ( (yyin = met_fopen(header_filename, "r")) == NULL )  {
+if ( (yyin = met_fopen(header_filename, "r")) == nullptr )  {
 
    cerr << "\n\n  unable to open input file \"" << header_filename << "\"\n\n";
 
@@ -386,8 +386,6 @@ if ( debug )  {
 
 exit ( 1 );
 
-return;
-
 }
 
 

src/basic/enum_to_string/info.cc

@@ -94,17 +94,17 @@ void EnumInfo::init_from_scratch()
 
 {
 
-s = (char **) NULL;
+s = (char **) nullptr;
 
-Name = (char *) NULL;
+Name = (char *) nullptr;
 
-LowerCaseName = (char *) NULL;
+LowerCaseName = (char *) nullptr;
 
-Scope = (char *) NULL;
+Scope = (char *) nullptr;
 
-U_Scope = (char *) NULL;
+U_Scope = (char *) nullptr;
 
-Header = (char *) NULL;
+Header = (char *) nullptr;
 
 Nalloc = Nids = 0;
 
@@ -127,21 +127,21 @@ int j;
 
 for (j=0; j<Nids; ++j)  {
 
-   if ( s[j] )  { delete [] s[j];  s[j] = (char *) NULL; }
+   if ( s[j] )  { delete [] s[j];  s[j] = (char *) nullptr; }
 
 }
 
-delete [] s;   s = (char **) NULL;
+delete [] s;   s = (char **) nullptr;
 
-if ( Name )  { delete [] Name;  Name = (char *) NULL; }
+if ( Name )  { delete [] Name;  Name = (char *) nullptr; }
 
-if ( LowerCaseName )  { delete [] LowerCaseName;  LowerCaseName = (char *) NULL; }
+if ( LowerCaseName )  { delete [] LowerCaseName;  LowerCaseName = (char *) nullptr; }
 
-if ( Scope )  { delete [] Scope;  Scope = (char *) NULL; }
+if ( Scope )  { delete [] Scope;  Scope = (char *) nullptr; }
 
-if ( U_Scope )  { delete [] U_Scope;  U_Scope = (char *) NULL; }
+if ( U_Scope )  { delete [] U_Scope;  U_Scope = (char *) nullptr; }
 
-if ( Header )  { delete [] Header;  Header = (char *) NULL; }
+if ( Header )  { delete [] Header;  Header = (char *) nullptr; }
 
 Nalloc = Nids = 0;
 
@@ -199,7 +199,7 @@ n = (n + enuminfo_alloc_increment - 1)/enuminfo_alloc_increment;
 n *= enuminfo_alloc_increment;
 
 int j;
-char ** u = (char **) NULL;
+char ** u = (char **) nullptr;
 
 u = s;
 
@@ -213,7 +213,7 @@ if ( !s )  {
 
 }
 
-for (j=0; j<n; ++j)  s[j] = (char *) NULL;
+for (j=0; j<n; ++j)  s[j] = (char *) nullptr;
 
 if ( u )  {
 
@@ -315,9 +315,9 @@ void EnumInfo::set_name(const char * text)
 {
 const char *method_name = "EnumInfo::set_name() -> ";
 
-if ( Name )  { delete [] Name;  Name = (char *) NULL; }
+if ( Name )  { delete [] Name;  Name = (char *) nullptr; }
 
-if ( LowerCaseName )  { delete [] LowerCaseName;  LowerCaseName = (char *) NULL; }
+if ( LowerCaseName )  { delete [] LowerCaseName;  LowerCaseName = (char *) nullptr; }
 
 if ( !text )  return;
 
@@ -355,9 +355,9 @@ void EnumInfo::set_scope(const char * text)
 {
 const char *method_name = "EnumInfo::set_scope() -> ";
 
-if ( Scope )  { delete [] Scope;  Scope = (char *) NULL; }
+if ( Scope )  { delete [] Scope;  Scope = (char *) nullptr; }
 
-if ( U_Scope )  { delete [] U_Scope;  U_Scope = (char *) NULL; }
+if ( U_Scope )  { delete [] U_Scope;  U_Scope = (char *) nullptr; }
 
 if ( !text )  return;
 
@@ -404,7 +404,7 @@ void EnumInfo::set_header(const char * text)
 {
 const char *method_name = "EnumInfo::set_header() -> ";
 
-if ( Header )  { delete [] Header;  Header = (char *) NULL; }
+if ( Header )  { delete [] Header;  Header = (char *) nullptr; }
 
 int k;
 

src/basic/vx_cal/time_array.cc

@@ -122,7 +122,7 @@ void TimeArray::init_from_scratch()
 
 {
 
-e = (unixtime*) NULL;
+e = (unixtime*) nullptr;
 
 clear();
 
@@ -138,7 +138,7 @@ void TimeArray::clear()
 
 {
 
-if ( e )  { delete [] e;  e = (unixtime *) NULL; }
+if ( e )  { delete [] e;  e = (unixtime *) nullptr; }
 
 Nelements = Nalloc = 0;
 
@@ -218,7 +218,7 @@ if ( ! exact )  {
 
 }
 
-unixtime * u = (unixtime *) NULL;
+unixtime * u = (unixtime *) nullptr;
 
 u = new unixtime [n];
 
@@ -243,11 +243,11 @@ if ( e )  {
 
    }
 
-   delete [] e;  e = (unixtime *) NULL;
+   delete [] e;  e = (unixtime *) nullptr;
 
 }
 
-e = u; u = (unixtime *) NULL;
+e = u; u = (unixtime *) nullptr;
 
 Nalloc = n;
 

src/basic/vx_config/config.tab.cc

@@ -262,15 +262,15 @@ static void do_user_function_def();
 
 
 #line 265 "config.tab.cc" /* yacc.c:337  */
-# ifndef YY_NULLPTR
+# ifndef YY_nullptrPTR
 #  if defined __cplusplus
 #   if 201103L <= __cplusplus
-#    define YY_NULLPTR nullptr
+#    define YY_nullptrPTR nullptr
 #   else
-#    define YY_NULLPTR 0
+#    define YY_nullptrPTR 0
 #   endif
 #  else
-#   define YY_NULLPTR ((void*)0)
+#   define YY_nullptrPTR ((void*)0)
 #  endif
 # endif
 
@@ -694,7 +694,7 @@ static const char *const yytname[] =
   "dictionary_list", "string_list", "threshold_list", "threshold",
   "thresh_node", "simple_thresh", "number", "boolean_list", "opt_semi",
   "opt_comma", "expression", "$@2", "$@3", "expression_list",
-  "piecewise_linear", "point_list", "point", YY_NULLPTR
+  "piecewise_linear", "point_list", "point", YY_nullptrPTR
 };
 #endif
 
@@ -1173,11 +1173,11 @@ static int
 yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
                 yytype_int16 *yyssp, int yytoken)
 {
-  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
+  YYSIZE_T yysize0 = yytnamerr (YY_nullptrPTR, yytname[yytoken]);
   YYSIZE_T yysize = yysize0;
   enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
   /* Internationalized format string. */
-  const char *yyformat = YY_NULLPTR;
+  const char *yyformat = YY_nullptrPTR;
   /* Arguments of yyformat. */
   char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
   /* Number of reported tokens (one for the "unexpected", one per
@@ -1234,7 +1234,7 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
                   }
                 yyarg[yycount++] = yytname[yyx];
                 {
-                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_nullptrPTR, yytname[yyx]);
                   if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
                     yysize = yysize1;
                   else
@@ -2268,8 +2268,6 @@ mlog << Error
 
 exit ( 1 );
 
-return;
-
 }
 
 
@@ -2320,8 +2318,6 @@ switch ( op )  {
    default:
       cerr << "\n\n  do_op() -> unrecognized op ... \"" << op << "\"\n\n";
       exit ( 1 );
-      break;
-
 
 }   //  switch
 
@@ -2371,7 +2367,6 @@ switch ( op )  {
       mlog << Error << "\ndo_integer_op() -> "
            << "bad operator ... \"" << op << "\"\n\n";
       exit ( 1 );
-      break;
 
 }
 

src/basic/vx_config/config.tab.yy

@@ -476,8 +476,6 @@ mlog << Error
 
 exit ( 1 );
 
-return;
-
 }
 
 
@@ -528,8 +526,6 @@ switch ( op )  {
    default:
       cerr << "\n\n  do_op() -> unrecognized op ... \"" << op << "\"\n\n";
       exit ( 1 );
-      break;
-
 
 }   //  switch
 
@@ -579,7 +575,6 @@ switch ( op )  {
       mlog << Error << "\ndo_integer_op() -> "
            << "bad operator ... \"" << op << "\"\n\n";
       exit ( 1 );
-      break;
 
 }
 

src/basic/vx_config/config_file.cc

@@ -332,7 +332,7 @@ Filename.add(bison_input_filename);
 
 configdebug = (Debug ? 1 : 0);
 
-if ( (configin = met_fopen(bison_input_filename, "r")) == NULL )  {
+if ( (configin = met_fopen(bison_input_filename, "r")) == nullptr )  {
 
    mlog << Error << "\nMetConfig::read(const char *) -> "
         << "unable to open input file \"" << bison_input_filename << "\"\n\n";

src/basic/vx_config/config_util.cc

@@ -2031,7 +2031,7 @@ int parse_conf_percentile(Dictionary *dict) {
 ///////////////////////////////////////////////////////////////////////////////
 
 ConcatString parse_conf_tmp_dir(Dictionary *dict) {
-   DIR* odir = NULL;
+   DIR* odir = nullptr;
    ConcatString tmp_dir_path;
 
    if(!get_env("MET_TMP_DIR", tmp_dir_path)) {
@@ -2045,7 +2045,7 @@ ConcatString parse_conf_tmp_dir(Dictionary *dict) {
    }
 
    // Make sure that it exists
-   if((odir = met_opendir(tmp_dir_path.c_str())) == NULL) {
+   if((odir = met_opendir(tmp_dir_path.c_str())) == nullptr) {
       mlog << Error << "\nparse_conf_tmp_dir() -> "
            << "Cannot access the \"" << conf_key_tmp_dir << "\" directory: "
            << tmp_dir_path << "\n\n";