apps/ingest/src/Era5Nc2Mdv - work in progress

NCAR · Nov 1, 2023 · 7723a36 · 7723a36
1 parent 31a2b06
commit 7723a36
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 29 deletions.
diff --git a/codebase/apps/ingest/src/Era5Nc2Mdv/Era5Nc2Mdv.test b/codebase/apps/ingest/src/Era5Nc2Mdv/Era5Nc2Mdv.test
@@ -195,14 +195,6 @@ output_fields = {
     encoding = OUTPUT_ENCODING_FLOAT32
   }
   ,
-  {
-    input_field_name = "U",
-    output_field_name = "u",
-    standard_name = "eastward_wind",
-    output_units = "m/s",
-    encoding = OUTPUT_ENCODING_FLOAT32
-  }
-  ,
   {
     input_field_name = "W",
     output_field_name = "w",

diff --git a/codebase/apps/ingest/src/Era5Nc2Mdv/Params.cc b/codebase/apps/ingest/src/Era5Nc2Mdv/Params.cc
@@ -704,7 +704,7 @@
     tt->is_array = TRUE;
     tt->array_len_fixed = FALSE;
     tt->array_elem_size = sizeof(output_field_t);
-    tt->array_n = 9;
+    tt->array_n = 8;
     tt->struct_def.name = tdrpStrDup("output_field_t");
     tt->struct_def.nfields = 5;
     tt->struct_def.fields = (struct_field_t *)
@@ -744,7 +744,7 @@
         tt->struct_def.fields[4].enum_def.fields[1].val = OUTPUT_ENCODING_INT16;
         tt->struct_def.fields[4].enum_def.fields[2].name = tdrpStrDup("OUTPUT_ENCODING_INT08");
         tt->struct_def.fields[4].enum_def.fields[2].val = OUTPUT_ENCODING_INT08;
-    tt->n_struct_vals = 45;
+    tt->n_struct_vals = 40;
     tt->struct_vals = (tdrpVal_t *)
         tdrpMalloc(tt->n_struct_vals * sizeof(tdrpVal_t));
       tt->struct_vals[0].s = tdrpStrDup("D");
@@ -777,21 +777,16 @@
       tt->struct_vals[27].s = tdrpStrDup("northward_wind");
       tt->struct_vals[28].s = tdrpStrDup("m/s");
       tt->struct_vals[29].e = OUTPUT_ENCODING_FLOAT32;
-      tt->struct_vals[30].s = tdrpStrDup("U");
-      tt->struct_vals[31].s = tdrpStrDup("u");
-      tt->struct_vals[32].s = tdrpStrDup("eastward_wind");
+      tt->struct_vals[30].s = tdrpStrDup("W");
+      tt->struct_vals[31].s = tdrpStrDup("w");
+      tt->struct_vals[32].s = tdrpStrDup("vertical_velocity");
       tt->struct_vals[33].s = tdrpStrDup("m/s");
       tt->struct_vals[34].e = OUTPUT_ENCODING_FLOAT32;
-      tt->struct_vals[35].s = tdrpStrDup("W");
-      tt->struct_vals[36].s = tdrpStrDup("w");
-      tt->struct_vals[37].s = tdrpStrDup("vertical_velocity");
-      tt->struct_vals[38].s = tdrpStrDup("m/s");
+      tt->struct_vals[35].s = tdrpStrDup("Z");
+      tt->struct_vals[36].s = tdrpStrDup("z");
+      tt->struct_vals[37].s = tdrpStrDup("geopotential_height");
+      tt->struct_vals[38].s = tdrpStrDup("m");
       tt->struct_vals[39].e = OUTPUT_ENCODING_FLOAT32;
-      tt->struct_vals[40].s = tdrpStrDup("Z");
-      tt->struct_vals[41].s = tdrpStrDup("z");
-      tt->struct_vals[42].s = tdrpStrDup("geopotential_height");
-      tt->struct_vals[43].s = tdrpStrDup("m");
-      tt->struct_vals[44].e = OUTPUT_ENCODING_FLOAT32;
     tt++;
 
     // Parameter 'convert_temperature_to_celcius'

diff --git a/codebase/apps/ingest/src/Era5Nc2Mdv/paramdef.Era5Nc2Mdv b/codebase/apps/ingest/src/Era5Nc2Mdv/paramdef.Era5Nc2Mdv
@@ -182,13 +182,6 @@ paramdef struct output_field_t {
       OUTPUT_ENCODING_FLOAT32
     }
     ,
-    { "U",
-      "u",
-      "eastward_wind",
-      "m/s",
-      OUTPUT_ENCODING_FLOAT32
-    }
-    ,
     { "W",
       "w",
       "vertical_velocity",