Per #1954, update all the application code to remove the creation of …

…lat_dim and lon_dim prior to calling write_netcdf_proj().
dtcenter · Aug 31, 2022 · aec6c45 · aec6c45
1 parent f544c1e
commit aec6c45
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 92 deletions.
diff --git a/src/tools/core/ensemble_stat/ensemble_stat.cc b/src/tools/core/ensemble_stat/ensemble_stat.cc
@@ -2105,11 +2105,7 @@ void setup_nc_file(unixtime valid_ut, const char *suffix) {
                        conf_info.model.c_str(), conf_info.obtype.c_str());
 
    // Add the projection information
-   write_netcdf_proj(nc_out, grid);
-
-   // Define Dimensions
-   lat_dim = add_dim(nc_out, "lat", (long) grid.ny());
-   lon_dim = add_dim(nc_out, "lon", (long) grid.nx());
+   write_netcdf_proj(nc_out, grid, lat_dim, lon_dim);
 
    // Add the lat/lon variables
    if(conf_info.nc_info.do_latlon) {
@@ -3042,7 +3038,6 @@ void write_ens_var_float(EnsVarInfo * ens_info, float *ens_data, const DataPlane
 
    // Otherwise, add to the list of previously defined variables
    nc_ens_var_sa.add(ens_var_name);
-
    ens_var = add_var(nc_out, (string)ens_var_name, ncFloat, lat_dim, lon_dim);
 
    //

diff --git a/src/tools/core/grid_stat/grid_stat.cc b/src/tools/core/grid_stat/grid_stat.cc
@@ -545,11 +545,7 @@ void setup_nc_file(const GridStatNcOutInfo & nc_info,
    }
 
    // Add the projection information
-   write_netcdf_proj(nc_out, grid);
-
-   // Define Dimensions
-   lat_dim = add_dim(nc_out,"lat", (long) grid.ny());
-   lon_dim = add_dim(nc_out,"lon", (long) grid.nx());
+   write_netcdf_proj(nc_out, grid, lat_dim, lon_dim);
 
    // Add the lat/lon variables
    if(nc_info.do_latlon) {

diff --git a/src/tools/core/mode/mode_exec.cc b/src/tools/core/mode/mode_exec.cc
@@ -891,11 +891,7 @@ if ( info.all_false() )  return;
                        engine.conf_info.desc.c_str());
 
    // Add the projection information
-   write_netcdf_proj(f_out, grid);
-
-   // Define Dimensions
-   lat_dim = add_dim(f_out, "lat", (long) grid.ny());
-   lon_dim = add_dim(f_out, "lon", (long) grid.nx());
+   write_netcdf_proj(f_out, grid, lat_dim, lon_dim);
 
    fcst_thresh_dim = add_dim(f_out, "fcst_thresh_length", fcst_thresh.length());
     obs_thresh_dim = add_dim(f_out,  "obs_thresh_length",  obs_thresh.length());

diff --git a/src/tools/core/mode/multivar_frontend.cc b/src/tools/core/mode/multivar_frontend.cc
@@ -525,13 +525,17 @@ for (x=0; x<nx; ++x)  {
 
 }   //  for x
 
-
    //
-   //  dimensions
+   //  add global attributes and projection information
    //
 
-lat_dim = nc.addDim(string("lat"), ny);
-lon_dim = nc.addDim(string("lon"), nx);
+write_netcdf_global(&nc, path, program_name);
+
+   //
+   //  add dimensions and write projection info
+   //
+
+write_netcdf_proj(&nc, grid, lat_dim, lon_dim);
 
    //
    //  variable
@@ -544,14 +548,6 @@ var = nc.addVar(string(super_object_var_name), ncFloat, vdim);
 
 var.putVar(data);
 
-   //
-   //  atrributes
-   //
-
-nc.putAtt(string("MET_version"), string(met_version));
-
-grid_output(grid.info(), &nc);
-
    //
    //  done
    //

diff --git a/src/tools/core/pcp_combine/pcp_combine.cc b/src/tools/core/pcp_combine/pcp_combine.cc
@@ -1296,11 +1296,7 @@ void open_nc(const Grid &grid) {
    add_att(nc_out, "RunCommand", command_str.c_str());
 
    // Add the projection information.
-   write_netcdf_proj(nc_out, grid);
-
-   // Define Dimensions.
-   lat_dim = add_dim(nc_out, "lat", (long) grid.ny());
-   lon_dim = add_dim(nc_out, "lon", (long) grid.nx());
+   write_netcdf_proj(nc_out, grid, lat_dim, lon_dim);
 
    // Add the lat/lon variables.
    write_netcdf_latlon(nc_out, &lat_dim, &lon_dim, grid);

diff --git a/src/tools/core/series_analysis/series_analysis.cc b/src/tools/core/series_analysis/series_analysis.cc
@@ -2089,11 +2089,7 @@ void setup_nc_file(const VarInfo *fcst_info, const VarInfo *obs_info) {
    add_att(nc_out, "obs_units",  (string)obs_info->units_attr());
 
    // Add the projection information
-   write_netcdf_proj(nc_out, grid);
-
-   // Define Dimensions
-   lat_dim = add_dim(nc_out, "lat", (long) grid.ny());
-   lon_dim = add_dim(nc_out, "lon", (long) grid.nx());
+   write_netcdf_proj(nc_out, grid, lat_dim, lon_dim);
 
    // Add the lat/lon variables
    write_netcdf_latlon(nc_out, &lat_dim, &lon_dim, grid);

diff --git a/src/tools/dev_utils/gen_climo_bin.cc b/src/tools/dev_utils/gen_climo_bin.cc
@@ -251,11 +251,9 @@ void setup_nc_file() {
    write_netcdf_global(nc_out, out_file.text(), program_name.c_str(), "Climatology", "NA");
 
    // Add the projection information
-   write_netcdf_proj(nc_out, grid);
+   write_netcdf_proj(nc_out, grid, lat_dim, lon_dim);
 
-   // Add dimensions
-   lat_dim = add_dim(nc_out, "lat", (long) grid.ny());
-   lon_dim = add_dim(nc_out, "lon", (long) grid.nx());
+   // Add the lat/lon variables
    write_netcdf_latlon(nc_out, &lat_dim, &lon_dim, grid);
 
    // The number of CDF values is one less than the number of bins

diff --git a/src/tools/other/gen_ens_prod/gen_ens_prod.cc b/src/tools/other/gen_ens_prod/gen_ens_prod.cc
@@ -788,11 +788,7 @@ void setup_nc_file() {
                        conf_info.model.c_str());
 
    // Add the projection information
-   write_netcdf_proj(nc_out, grid);
-
-   // Define Dimensions
-   lat_dim = add_dim(nc_out, "lat", (long) grid.ny());
-   lon_dim = add_dim(nc_out, "lon", (long) grid.nx());
+   write_netcdf_proj(nc_out, grid, lat_dim, lon_dim);
 
    // Add the lat/lon variables
    if(conf_info.ens_input[0]->nc_info.do_latlon) {

diff --git a/src/tools/other/gen_vx_mask/gen_vx_mask.cc b/src/tools/other/gen_vx_mask/gen_vx_mask.cc
@@ -1259,11 +1259,7 @@ void write_netcdf(const DataPlane &dp) {
    write_netcdf_global(f_out, out_filename.c_str(), program_name);
 
    // Add the projection information
-   write_netcdf_proj(f_out, grid);
-
-   // Define Dimensions
-   lat_dim = add_dim(f_out, "lat", (long) grid.ny());
-   lon_dim = add_dim(f_out, "lon", (long) grid.nx());
+   write_netcdf_proj(f_out, grid, lat_dim, lon_dim);
 
    // Add the lat/lon variables
    write_netcdf_latlon(f_out, &lat_dim, &lon_dim, grid);

diff --git a/src/tools/other/modis_regrid/data_plane_to_netcdf.cc b/src/tools/other/modis_regrid/data_plane_to_netcdf.cc
@@ -94,12 +94,8 @@ void write_grid_to_netcdf(const DataPlane & plane, const Grid & grid, const char
   write_netcdf_global(f_out, out_filename, program_name);
 
   // Add the projection information
-  write_netcdf_proj(f_out, grid);
-
-  // Define Dimensions
-  lat_dim = add_dim(f_out, "lat", (long) grid.ny());
-  lon_dim = add_dim(f_out, "lon", (long) grid.nx());
-
+  write_netcdf_proj(f_out, grid, lat_dim, lon_dim);
+
   // Add the lat/lon variables
   write_netcdf_latlon(f_out, &lat_dim, &lon_dim, grid);
 

diff --git a/src/tools/other/point2grid/point2grid.cc b/src/tools/other/point2grid/point2grid.cc
@@ -1550,11 +1550,7 @@ void open_nc(const Grid &grid, ConcatString run_cs) {
    add_att(nc_out, "RunCommand", run_cs);
 
    // Add the projection information
-   write_netcdf_proj(nc_out, grid);
-
-   // Define Dimensions
-   lat_dim = add_dim(nc_out, "lat", (long) grid.ny());
-   lon_dim = add_dim(nc_out, "lon", (long) grid.nx());
+   write_netcdf_proj(nc_out, grid, lat_dim, lon_dim);
 
    // Add the lat/lon variables
    write_netcdf_latlon(nc_out, &lat_dim, &lon_dim, grid);

diff --git a/src/tools/other/regrid_data_plane/regrid_data_plane.cc b/src/tools/other/regrid_data_plane/regrid_data_plane.cc
@@ -374,11 +374,7 @@ void open_nc(const Grid &grid, ConcatString run_cs) {
    add_att(nc_out, "RunCommand", run_cs);
 
    // Add the projection information
-   write_netcdf_proj(nc_out, grid);
-
-   // Define Dimensions
-   lat_dim = add_dim(nc_out, "lat", (long) grid.ny());
-   lon_dim = add_dim(nc_out, "lon", (long) grid.nx());
+   write_netcdf_proj(nc_out, grid, lat_dim, lon_dim);
 
    // Add the lat/lon variables
    write_netcdf_latlon(nc_out, &lat_dim, &lon_dim, grid);

diff --git a/src/tools/other/shift_data_plane/shift_data_plane.cc b/src/tools/other/shift_data_plane/shift_data_plane.cc
@@ -279,6 +279,7 @@ void process_data_file() {
 void write_netcdf(const DataPlane &dp, const Grid &grid,
                   const VarInfo *vinfo, const GrdFileType &ftype) {
    ConcatString cs;
+   NcDim lat_dim, lon_dim;
 
    // Create a new NetCDF file and open it
    NcFile *f_out = open_ncfile(OutputFilename.c_str(), true);
@@ -297,11 +298,7 @@ void write_netcdf(const DataPlane &dp, const Grid &grid,
    add_att(f_out, "RunCommand", shift_cs);
 
    // Add the projection information
-   write_netcdf_proj(f_out, grid);
-
-   // Define Dimensions
-   NcDim lat_dim = add_dim(f_out, "lat", (long) grid.ny());
-   NcDim lon_dim = add_dim(f_out, "lon", (long) grid.nx());
+   write_netcdf_proj(f_out, grid, lat_dim, lon_dim);
 
    // Add the lat/lon variables
    write_netcdf_latlon(f_out, &lat_dim, &lon_dim, grid);

diff --git a/src/tools/other/wwmca_tool/nc_output.cc b/src/tools/other/wwmca_tool/nc_output.cc
@@ -74,11 +74,10 @@ void WwmcaRegridder::do_output(const char * output_filename)
    write_netcdf_global(ncfile, output_filename, "wwmca_regrid");
 
    //
-   //  dimensions
+   // Add the projection information
    //
 
-   lat_dim = add_dim(ncfile, "lat", ToGrid->ny());
-   lon_dim = add_dim(ncfile, "lon", ToGrid->nx());
+   write_netcdf_proj(ncfile, *ToGrid, lat_dim, lon_dim);
 
    //
    //  lat/lon variables
@@ -185,12 +184,6 @@ void WwmcaRegridder::do_output(const char * output_filename)
 
    write_netcdf_var_times(&data_var, init_time, valid_time, accum_time);
 
-   //
-   //  global attributes
-   //
-
-   grid_output(ToGrid->info(), ncfile);
-
    //
    //  fill in data values
    //

diff --git a/src/tools/tc_utils/tc_dland/tc_dland.cc b/src/tools/tc_utils/tc_dland/tc_dland.cc
@@ -223,12 +223,8 @@ void process_distances() {
 
    // Add the projection information
    mlog << Debug(3) << "Writing NetCDF map projection.\n";
-   write_netcdf_proj(f_out, grid);
+   write_netcdf_proj(f_out, grid, lat_dim, lon_dim);
 
-   // Define Dimensions
-   lat_dim = add_dim(f_out, "lat", (long) grid.ny());
-   lon_dim = add_dim(f_out, "lon", (long) grid.nx());
-
    // Add the lat/lon variables
    if(latlon_flag) {
       mlog << Debug(3) << "Writing NetCDF lat/lon variables.\n";

diff --git a/src/tools/tc_utils/tc_gen/tc_gen.cc b/src/tools/tc_utils/tc_gen/tc_gen.cc
@@ -1913,11 +1913,7 @@ void setup_nc_file() {
 
    // Add the projection information
    Grid grid = conf_info.NcOutGrid;
-   write_netcdf_proj(nc_out, grid);
-
-   // Define Dimensions
-   lat_dim = add_dim(nc_out, "lat", (long) grid.ny());
-   lon_dim = add_dim(nc_out, "lon", (long) grid.nx());
+   write_netcdf_proj(nc_out, grid, lat_dim, lon_dim);
 
    // Add the lat/lon variables
    if(conf_info.NcInfo.do_latlon) {