Update develop-ref after #2758 (#2789)

* Store change of sonar.login to sonar.token.

* Hotfix to develop, updating aclocal.m4 and config.h.in to what is created when running bootstrap inside the dtcenter/met-base:v3.1 Docker image. Updates autoconf 2.69 output to 2.71.

* Adding -lnetcdf to configure_lib_args for NetCDF-CXX compilation

* Added eckit and atlas loads and paths

* Added atlas and eckit loads and paths

* Changing -j to "-j 5" as the recommended value

* Update ensemble-stat.rst

Fixed incorrect path to obs error table

* Updated values for GRIB2CLIB_NAME and BUFRLIB_NAME

* Updated for proj, eckit, and atlas

* Feature #2761 develop seneca (#2762)

* Per #2761, define runtime python version for testing  rather than using the default version which no longer exists in /usr/local

* Per #2761, fix  setting ci-skip-all

* Per #2761, patching test_util.R to use the -C command line option for ncdiff. I did test running comp_dir.sh with this change and confirmed that it now runs to completion.

* #2652 Added find_var_by_standard_name and separated common codes to find_xy_vars

* #2757 Get the email list from the environment variable MET_CRON_EMAIL_LIST__MET (or MET_CRON_EMAIL_LIST_)

* #2757 THe SonarQube token and URL are replaced by ujsing the environment variable SONAR_TOKEN_VALUE and SONAR_SERVER_URL

* #2757 The SonarQube token and URL are replaced with the pre-defined strings, SONAR_TOKEN_VALUE and SONAR_SERVER_URL

* Bugfix #2670 develop --enable-python (#2768)

* Update install_met_env.acorn_py3.10

* Update install_met_env.wcoss2_py3.10

* Feature #2776 cleanup (#2777)

* Per #2776, delete stale prob_pair_info.h/.cc, wwmca_utils.h/.cc, and rmw_analysis_utils.h/.cc files that were not being compiled by their Makefiles.

* Per #2776, update Makefile to compile the test_read_rmw utility.

* Per #2776, add Makefile for the vx_python3_utils test utility directory.

* add rpath for atlas and eckit lib dirs so dynamic libraries can be found when running on seneca

* only set -L and -I arguments for atlas and eckit if the appropriate environment variable is set -- this matches how it is handled for other external library dependencies

* Per #2776, just whitespace and capitalization

---------

Co-authored-by: George McCabe <[email protected]>

* Bugfix #2782 develop MASSDEN (#2783)

* Per #2782, port over fixes from the bugfix_2782_main_v11.1_MASSDEN branch over to the bugfix branch for develop. Will also add new GRIB2 filtering options in this branch.

* Per #2782, add support for 4 new GRIB2 filtering options for GRIB2_aerosol_type, GRIB2_aerosol_interval_type, GRIB2_aerosol_size_lower, and GRIB2_aerosol_size_upper. These are useful in filtering the MASSDEN records in the RRFS smoke output files.

* Per #2782, fix aerosol_size_lower() and aersol_size_upper() inline definitions.

* Per #2782, add a unit test for GRIB2 table 4.48.

* Per #2782, switch from strict equality to using the is_eq() function when checking the GRIB2_aerosol_size_lower and upper values since they're doubles and not ints.

* Feature #2701 ismn (#2758)

* Add support for ISMN soil moisture data

* Per #2701, update ascii2nc.cc with the ismn file option.

* Per #2701, update ascii2nc docs

* Per #2701, store the depth for precip as 0.

* Per #2701, parse the ISMN observation value from the correct column.

* Per #2701, every time I run ascii2nc to I see a log message for 'DEBUG 1: Number of NDBC skipped files due to no lookup 0'. This is printed by the NdbcHandler destructor. Update the logic to only print a debug level 3 log message when the number of missing locations is greater than 0, 'DEBUG 3: Skipped 5 NDBC files whose locations are not defined in 'MET_BASE/table_files/ndbc_stations.xml'. Set the MET_NDBC_STATIONS environment variable to override this file.'

* Per #2701, as instructed by @anewman89, store the average of the depth values rather than the maximum value.

* Per #2701, add a test of processing the ISMN data through ascii2nc.

* Per #2701, fix parsing of year and month to subtract 1900 and 1, respectively.

* Per #2701, set use_var_id to true for ISMN inputs

* Per #2701, even though we're mapping obs data to GRIB code names and units, we want to encode them with use_var_id = true and so we need to keep track of those var_id values.

* Per #2701, fix typo in the name of the ascii2nc netcdf output file.

---------

Co-authored-by: MET Tools Test Account <[email protected]>

---------

Co-authored-by: MET Tools Test Account <[email protected]>
Co-authored-by: root <root@83062d57c5dd>
Co-authored-by: Julie Prestopnik <[email protected]>
Co-authored-by: Christina Kalb <[email protected]>
Co-authored-by: John Halley Gotway <[email protected]>
Co-authored-by: Howard Soh <[email protected]>
Co-authored-by: Howard Soh <[email protected]>
Co-authored-by: George McCabe <[email protected]>
Co-authored-by: metplus-bot <[email protected]>

docs/Users_Guide/reformat_point.rst

@@ -456,6 +456,8 @@ While initial versions of the ASCII2NC tool only supported a simple 11 column AS
 
 • `National Data Buoy (NDBC) Standard Meteorlogical Data format <https://www.ndbc.noaa.gov/measdes.shtml>`_. See the :ref:`MET_NDBC_STATIONS` environment variable.
 
+• `International Soil Moisture Network (ISMN) Data format <https://ismn.bafg.de/en/>`_.
+
 • `AErosol RObotic NEtwork (AERONET) versions 2 and 3 format <http://aeronet.gsfc.nasa.gov/>`_
 
 • Python embedding of point observations, as described in :numref:`pyembed-point-obs-data`. See example below in :numref:`ascii2nc-pyembed`.
@@ -539,7 +541,7 @@ Required Arguments for ascii2nc
 Optional Arguments for ascii2nc
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-3. The **-format ASCII_format** option may be set to "met_point", "little_r", "surfrad", "wwsis", "airnowhourlyaqobs", "airnowhourly", "airnowdaily_v2", "ndbc_standard", "aeronet", "aeronetv2", "aeronetv3", or "python". If passing in ISIS data, use the "surfrad" format flag.
+3. The **-format ASCII_format** option may be set to "met_point", "little_r", "surfrad", "wwsis", "airnowhourlyaqobs", "airnowhourly", "airnowdaily_v2", "ndbc_standard", "ismn", "aeronet", "aeronetv2", "aeronetv3", or "python". If passing in ISIS data, use the "surfrad" format flag.
 
 4. The **-config file** option is the configuration file for generating time summaries.
 

internal/test_unit/xml/unit_ascii2nc.xml

@@ -199,7 +199,16 @@
     </output>
   </test>
 
-
-
+  <test name="ascii2nc_ismn_SNOTEL">
+    <exec>&MET_BIN;/ascii2nc</exec>
+    <param> \
+    -format ismn  \
+    &DATA_DIR_OBS;/ismn/SNOTEL/*/*.stm \
+    &OUTPUT_DIR;/ascii2nc/ismn_SNOTEL_20220924_20220927.nc
+    </param>
+    <output>
+      <point_nc>&OUTPUT_DIR;/ascii2nc/ismn_SNOTEL_20220924_20220927.nc</point_nc>
+    </output>
+  </test>
 
 </met_test>

src/tools/other/ascii2nc/Makefile.am

@@ -28,7 +28,9 @@ ascii2nc_SOURCES = ascii2nc.cc \
 	ndbc_handler.cc ndbc_handler.h \
 	ndbc_locations.cc ndbc_locations.h \
 	airnow_locations.cc airnow_locations.h \
-	aeronet_handler.cc aeronet_handler.h $(OPT_PYTHON_SOURCES)
+	aeronet_handler.cc aeronet_handler.h \
+	ismn_handler.cc ismn_handler.h \
+	$(OPT_PYTHON_SOURCES)
 
 ascii2nc_CPPFLAGS = ${MET_CPPFLAGS} -I../../../basic/vx_log
 ascii2nc_LDFLAGS = ${MET_LDFLAGS}

src/tools/other/ascii2nc/Makefile.in

@@ -110,7 +110,8 @@ am__ascii2nc_SOURCES_DIST = ascii2nc.cc ascii2nc_conf_info.cc \
 	airnow_handler.h ndbc_handler.cc ndbc_handler.h \
 	ndbc_locations.cc ndbc_locations.h airnow_locations.cc \
 	airnow_locations.h aeronet_handler.cc aeronet_handler.h \
-	python_handler.h python_handler.cc
+	ismn_handler.cc ismn_handler.h python_handler.h \
+	python_handler.cc
 @ENABLE_PYTHON_TRUE@am__objects_1 = ascii2nc-python_handler.$(OBJEXT)
 am__objects_2 = $(am__objects_1)
 am_ascii2nc_OBJECTS = ascii2nc-ascii2nc.$(OBJEXT) \
@@ -124,7 +125,8 @@ am_ascii2nc_OBJECTS = ascii2nc-ascii2nc.$(OBJEXT) \
 	ascii2nc-ndbc_handler.$(OBJEXT) \
 	ascii2nc-ndbc_locations.$(OBJEXT) \
 	ascii2nc-airnow_locations.$(OBJEXT) \
-	ascii2nc-aeronet_handler.$(OBJEXT) $(am__objects_2)
+	ascii2nc-aeronet_handler.$(OBJEXT) \
+	ascii2nc-ismn_handler.$(OBJEXT) $(am__objects_2)
 ascii2nc_OBJECTS = $(am_ascii2nc_OBJECTS)
 am__DEPENDENCIES_1 =
 ascii2nc_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -153,6 +155,7 @@ am__depfiles_remade = ./$(DEPDIR)/ascii2nc-aeronet_handler.Po \
 	./$(DEPDIR)/ascii2nc-ascii2nc.Po \
 	./$(DEPDIR)/ascii2nc-ascii2nc_conf_info.Po \
 	./$(DEPDIR)/ascii2nc-file_handler.Po \
+	./$(DEPDIR)/ascii2nc-ismn_handler.Po \
 	./$(DEPDIR)/ascii2nc-little_r_handler.Po \
 	./$(DEPDIR)/ascii2nc-met_handler.Po \
 	./$(DEPDIR)/ascii2nc-ndbc_handler.Po \
@@ -387,7 +390,9 @@ ascii2nc_SOURCES = ascii2nc.cc \
 	ndbc_handler.cc ndbc_handler.h \
 	ndbc_locations.cc ndbc_locations.h \
 	airnow_locations.cc airnow_locations.h \
-	aeronet_handler.cc aeronet_handler.h $(OPT_PYTHON_SOURCES)
+	aeronet_handler.cc aeronet_handler.h \
+	ismn_handler.cc ismn_handler.h \
+	$(OPT_PYTHON_SOURCES)
 
 ascii2nc_CPPFLAGS = ${MET_CPPFLAGS} -I../../../basic/vx_log
 ascii2nc_LDFLAGS = ${MET_LDFLAGS}
@@ -514,6 +519,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ascii2nc-ascii2nc.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ascii2nc-ascii2nc_conf_info.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ascii2nc-file_handler.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ascii2nc-ismn_handler.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ascii2nc-little_r_handler.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ascii2nc-met_handler.Po@am__quote@ # am--include-marker
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ascii2nc-ndbc_handler.Po@am__quote@ # am--include-marker
@@ -710,6 +716,20 @@ ascii2nc-aeronet_handler.obj: aeronet_handler.cc
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ascii2nc_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ascii2nc-aeronet_handler.obj `if test -f 'aeronet_handler.cc'; then $(CYGPATH_W) 'aeronet_handler.cc'; else $(CYGPATH_W) '$(srcdir)/aeronet_handler.cc'; fi`
 
+ascii2nc-ismn_handler.o: ismn_handler.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ascii2nc_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ascii2nc-ismn_handler.o -MD -MP -MF $(DEPDIR)/ascii2nc-ismn_handler.Tpo -c -o ascii2nc-ismn_handler.o `test -f 'ismn_handler.cc' || echo '$(srcdir)/'`ismn_handler.cc
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ascii2nc-ismn_handler.Tpo $(DEPDIR)/ascii2nc-ismn_handler.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='ismn_handler.cc' object='ascii2nc-ismn_handler.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ascii2nc_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ascii2nc-ismn_handler.o `test -f 'ismn_handler.cc' || echo '$(srcdir)/'`ismn_handler.cc
+
+ascii2nc-ismn_handler.obj: ismn_handler.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ascii2nc_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ascii2nc-ismn_handler.obj -MD -MP -MF $(DEPDIR)/ascii2nc-ismn_handler.Tpo -c -o ascii2nc-ismn_handler.obj `if test -f 'ismn_handler.cc'; then $(CYGPATH_W) 'ismn_handler.cc'; else $(CYGPATH_W) '$(srcdir)/ismn_handler.cc'; fi`
+@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ascii2nc-ismn_handler.Tpo $(DEPDIR)/ascii2nc-ismn_handler.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='ismn_handler.cc' object='ascii2nc-ismn_handler.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ascii2nc_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ascii2nc-ismn_handler.obj `if test -f 'ismn_handler.cc'; then $(CYGPATH_W) 'ismn_handler.cc'; else $(CYGPATH_W) '$(srcdir)/ismn_handler.cc'; fi`
+
 ascii2nc-python_handler.o: python_handler.cc
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ascii2nc_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ascii2nc-python_handler.o -MD -MP -MF $(DEPDIR)/ascii2nc-python_handler.Tpo -c -o ascii2nc-python_handler.o `test -f 'python_handler.cc' || echo '$(srcdir)/'`python_handler.cc
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ascii2nc-python_handler.Tpo $(DEPDIR)/ascii2nc-python_handler.Po
@@ -857,6 +877,7 @@ distclean: distclean-am
 	-rm -f ./$(DEPDIR)/ascii2nc-ascii2nc.Po
 	-rm -f ./$(DEPDIR)/ascii2nc-ascii2nc_conf_info.Po
 	-rm -f ./$(DEPDIR)/ascii2nc-file_handler.Po
+	-rm -f ./$(DEPDIR)/ascii2nc-ismn_handler.Po
 	-rm -f ./$(DEPDIR)/ascii2nc-little_r_handler.Po
 	-rm -f ./$(DEPDIR)/ascii2nc-met_handler.Po
 	-rm -f ./$(DEPDIR)/ascii2nc-ndbc_handler.Po
@@ -915,6 +936,7 @@ maintainer-clean: maintainer-clean-am
 	-rm -f ./$(DEPDIR)/ascii2nc-ascii2nc.Po
 	-rm -f ./$(DEPDIR)/ascii2nc-ascii2nc_conf_info.Po
 	-rm -f ./$(DEPDIR)/ascii2nc-file_handler.Po
+	-rm -f ./$(DEPDIR)/ascii2nc-ismn_handler.Po
 	-rm -f ./$(DEPDIR)/ascii2nc-little_r_handler.Po
 	-rm -f ./$(DEPDIR)/ascii2nc-met_handler.Po
 	-rm -f ./$(DEPDIR)/ascii2nc-ndbc_handler.Po

src/tools/other/ascii2nc/aeronet_handler.h

@@ -10,8 +10,8 @@
 ////////////////////////////////////////////////////////////////////////
 
 
-#ifndef  __AERONETHANDLER_H__
-#define  __AERONETHANDLER_H__
+#ifndef  __AERONET_HANDLER_H__
+#define  __AERONET_HANDLER_H__
 
 
 ////////////////////////////////////////////////////////////////////////
@@ -125,7 +125,7 @@ class AeronetHandler : public FileHandler
 ////////////////////////////////////////////////////////////////////////
 
 
-#endif   /*  __AERONETHANDLER_H__  */
+#endif   /*  __AERONET_HANDLER_H__  */
 
 
 ////////////////////////////////////////////////////////////////////////

src/tools/other/ascii2nc/airnow_handler.cc

@@ -648,7 +648,7 @@ time_t AirnowHandler::_getValidTime(const string &dateStr, const string &timeStr
   struct tm time_struct;
   memset(&time_struct, 0, sizeof(time_struct));
 
-  time_struct.tm_year = atoi(year.c_str()) -1900;
+  time_struct.tm_year = atoi(year.c_str()) - 1900;
   time_struct.tm_mon = atoi(mon.c_str()) - 1;
   time_struct.tm_mday = atoi(mday.c_str());
   time_struct.tm_hour = atoi(hour.c_str());

src/tools/other/ascii2nc/airnow_handler.h

@@ -10,8 +10,8 @@
 ////////////////////////////////////////////////////////////////////////
 
 
-#ifndef  __AIRNOWHANDLER_H__
-#define  __AIRNOWHANDLER_H__
+#ifndef  __AIRNOW_HANDLER_H__
+#define  __AIRNOW_HANDLER_H__
 
 
 ////////////////////////////////////////////////////////////////////////
@@ -198,7 +198,7 @@ class AirnowHandler : public FileHandler
 ////////////////////////////////////////////////////////////////////////
 
 
-#endif   /*  __AERONETHANDLER_H__  */
+#endif   /*  __AERONET_HANDLER_H__  */
 
 
 ////////////////////////////////////////////////////////////////////////

src/tools/other/ascii2nc/ascii2nc.cc

@@ -48,7 +48,8 @@
 //   019    07/06/22  Howard Soh     METplus-Internal #19 Rename main to met_main
 //   020    08/26/22  Dave Albo      MET #2142 Add AirNow observations
 //   021    10/03/22  Prestopnik     MET #2227 Remove using namespace std from header files
-//   022    10/07/22  Dave Albo      MET #2276 Add NDBC Buoy data
+//   022    10/07/22  Dave Albo      MET #2276 Add NDBC buoy data
+//   023    11/28/23  Halley Gotway  MET #2701 Add ISMN soil moisture data
 //
 ////////////////////////////////////////////////////////////////////////
 
@@ -86,6 +87,7 @@ using namespace std;
 #include "aeronet_handler.h"
 #include "airnow_handler.h"
 #include "ndbc_handler.h"
+#include "ismn_handler.h"
 
 #ifdef ENABLE_PYTHON
 #include "global_python.h"
@@ -113,6 +115,7 @@ enum ASCIIFormat {
    ASCIIFormat_Airnow_hourlyaqobs,
    ASCIIFormat_Airnow_hourly,
    ASCIIFormat_NDBC_standard,
+   ASCIIFormat_ISMN,
    ASCIIFormat_Aeronet_v2,
    ASCIIFormat_Aeronet_v3, 
    ASCIIFormat_Python, 
@@ -322,6 +325,10 @@ FileHandler *create_file_handler(const ASCIIFormat format, const ConcatString &a
          return((FileHandler *) handler);
       }
 
+      case ASCIIFormat_ISMN: {
+         return((FileHandler *) new IsmnHandler(program_name));
+      }
+
       case ASCIIFormat_Aeronet_v2: {
          AeronetHandler *handler = new AeronetHandler(program_name);
          handler->setFormatVersion(2);
@@ -459,9 +466,21 @@ FileHandler *determine_ascii_format(const ConcatString &ascii_filename) {
    delete ndbc_file;
 
    //
-   // If we get here, we didn't recognize the file contents.
+   // See if this is an ISMN file.
    //
+   f_in.rewind();
+   IsmnHandler *ismn_file = new IsmnHandler(program_name);
+
+   if(ismn_file->isFileType(f_in)) {
+     f_in.close();
+     return((FileHandler *) ismn_file);
+   }
+
+   delete ismn_file;
 
+   //
+   // If we get here, we didn't recognize the file contents.
+   //
    mlog << Error << "\ndetermine_ascii_format() -> "
         << "could not determine file format based on file contents\n\n";
 
@@ -503,6 +522,7 @@ void usage() {
         << AirnowHandler::getFormatStringHourlyAqObs() << "\", \""
         << AirnowHandler::getFormatStringHourly() << "\", \""
         << NdbcHandler::getFormatStringStandard() << "\", \""
+        << IsmnHandler::getFormatString() << "\", \""
         << AeronetHandler::getFormatString() << "\", \""
         << AeronetHandler::getFormatString_v2() << "\", \""
         << AeronetHandler::getFormatString_v3() << "\"";
@@ -585,6 +605,9 @@ void set_format(const StringArray & a) {
    else if(NdbcHandler::getFormatStringStandard() == a[0]) {
      ascii_format = ASCIIFormat_NDBC_standard;
    }
+   else if(IsmnHandler::getFormatString() == a[0]) {
+     ascii_format = ASCIIFormat_ISMN;
+   }
    else if(AeronetHandler::getFormatString() == a[0]
      || AeronetHandler::getFormatString_v2() == a[0]) {
      ascii_format = ASCIIFormat_Aeronet_v2;

src/tools/other/ascii2nc/file_handler.h

@@ -10,8 +10,8 @@
 ////////////////////////////////////////////////////////////////////////
 
 
-#ifndef  __FILEHANDLER_H__
-#define  __FILEHANDLER_H__
+#ifndef  __FILE_HANDLER_H__
+#define  __FILE_HANDLER_H__
 
 
 ////////////////////////////////////////////////////////////////////////
@@ -158,7 +158,7 @@ inline void FileHandler::setMessageTypeMap(map<ConcatString, ConcatString> m) {
 ////////////////////////////////////////////////////////////////////////
 
 
-#endif   /*  __FILEHANDLER_H__  */
+#endif   /*  __FILE_HANDLER_H__  */
 
 
 ////////////////////////////////////////////////////////////////////////