Merge pull request #2089 from dtcenter/feature_1824_pb2nc_MLCAPE3

Feature 1824 pb2nc log message for mlcape
dtcenter · Mar 8, 2022 · 1b9784e · 1b9784e
2 parents 04510c3 + 182f461
commit 1b9784e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/met/src/libcode/vx_grid/grid_base.cc b/met/src/libcode/vx_grid/grid_base.cc
@@ -299,6 +299,7 @@ rll = (const RotatedLatLonData *) 0;
 m   = (const MercatorData *)      0;
 g   = (const GaussianData *)      0;
 gi  = (const GoesImagerData *)    0;
+tc  = (const TcrmwData *)         0;
 
 clear();
 
@@ -321,6 +322,7 @@ if ( rll )  { delete rll;  rll = (const RotatedLatLonData *) 0; };
 if ( m   )  { delete m;    m   = (const MercatorData *)      0; };
 if ( g   )  { delete g;    g   = (const GaussianData *)      0; };
 if ( gi  )  { delete gi;   gi  = (const GoesImagerData *)    0; };
+if ( tc  )  { delete tc;   tc  = (const TcrmwData *)         0; };
 
 return;
 

diff --git a/met/src/libcode/vx_nc_obs/met_point_data.cc b/met/src/libcode/vx_nc_obs/met_point_data.cc
@@ -38,6 +38,7 @@ using namespace std;
 
 MetPointData::MetPointData() {
    // Derived class should set obs_data
+   obs_data = (MetPointObsData *)0;
    init_from_scratch();
 }
 

diff --git a/met/src/libcode/vx_nc_obs/met_point_data.h b/met/src/libcode/vx_nc_obs/met_point_data.h
@@ -93,7 +93,7 @@ class MetPointData {
       bool use_arr_vars;
 
       MetPointHeader header_data;
-      MetPointObsData *obs_data = 0;
+      MetPointObsData *obs_data;
 
       void init_from_scratch();
 

diff --git a/met/src/tools/other/pb2nc/pb2nc.cc b/met/src/tools/other/pb2nc/pb2nc.cc
@@ -1997,13 +1997,22 @@ void process_pbfile(int i_pb) {
         << "Total observations retained or derived\t= "
         << (n_file_obs + n_derived_obs) << "\n";
 
-   if (cal_cape || cal_mlcape) {
-      mlog << Debug(3) << "\nDerived CAPE = " << (cape_count + mlcape_count)
-           << "\tZero = " << (cape_cnt_zero_values + mlcape_cnt_zero_values)
+   if (cal_cape) {
+      mlog << Debug(3) << "\nDerived CAPE = " << cape_count
+           << "\tZero = " << cape_cnt_zero_values
            << "\n\tnot derived: No cape inputs = " << (cape_cnt_no_levels)
-           << "\tNo vertical levels = " << (cape_cnt_surface_msgs)
-           << "\n\tfiltered: " << (cape_cnt_missing_values + mlcape_cnt_missing_values) << ", "
-           << (cape_cnt_too_big + mlcape_cnt_too_big)
+           << "\tNo vertical levels = " << cape_cnt_surface_msgs
+           << "\n\tfiltered: " << cape_cnt_missing_values << ", "
+           << cape_cnt_too_big
+           << "\n";
+   }
+   if (cal_mlcape) {
+      mlog << Debug(3) << "\nDerived MLCAPE = " << mlcape_count
+           << "\tZero = " << mlcape_cnt_zero_values
+           << "\n\tnot derived: No cape inputs = " << cape_cnt_no_levels
+           << "\tNo vertical levels = " << cape_cnt_surface_msgs
+           << "\n\tfiltered: " << mlcape_cnt_missing_values << ", "
+           << mlcape_cnt_too_big
            << "\n";
    }