revert key order; partial logic fix

Author: WeirAE

docs/shared/chgres_cube.yaml

@@ -8,23 +8,23 @@ chgres_cube:
   namelist:
     update_values:
       config:
+        atm_files_input_grid: atm.t{{cycle.strftime('%H') }}z.nc
+        convert_atm: true
+        convert_nst: false
+        convert_sfc: true
+        cycle_day: !int "{{ cycle.strftime('%d') }}"
+        cycle_hour: !int "{{ cycle.strftime('%H') }}"
+        cycle_mon: !int "{{ cycle.strftime('%m') }}"
+        data_dir_input_grid: /path/to/data/{{ cycle.strftime('%Y%M%d%H') }}
         fix_dir_target_grid: /path/to/fix_lam
+        grib2_file_input_grid: a.file.gb2
         mosaic_file_target_grid: C432.mosaic.halo4.nc
         orog_dir_target_grid: /path/to/fix_lam
         orog_files_target_grid: C432.oro_data.tile7.halo4.nc
-        vcoord_file_target_grid: /path/to/global_hyblev.l65.txt
-        varmap_file: /path/to/varmap_table
-        data_dir_input_grid: /path/to/data/{{ cycle.strftime('%Y%M%d%H') }}
-        grib2_file_input_grid: a.file.gb2
-        atm_files_input_grid: atm.t{{cycle.strftime('%H') }}z.nc
         sfc_files_input_grid: sfc.t{{cycle.strftime('%H') }}z.nc
-        cycle_day: !int "{{ cycle.strftime('%d') }}"
-        cycle_hour: !int "{{ cycle.strftime('%H') }}"
-        cycle_mon: !int "{{ cycle.strftime('%m') }}"
-        convert_atm: true
-        convert_nst: false
-        convert_sfc: true
-        validate: true
+        varmap_file: /path/to/varmap_table
+        vcoord_file_target_grid: /path/to/global_hyblev.l65.txt
+    validate: true
   rundir: /path/to/dir
 platform:
   account: me

src/uwtools/drivers/chgres_cube.py

@@ -35,24 +35,23 @@ def namelist_file(self):
             input_files.append(base_file)
         if update_values := namelist.get(STR.updatevalues):
             config_files = update_values["config"]
-            file_keys = ["mosaic_file_target_grid", "orog_files_target_grid"]
-            dir_keys = ["fix_dir_target_grid", "orog_dir_target_grid"]
+            file_keys = ["mosaic_file_target_grid","orog_files_input_grid", "orog_files_target_grid"]
+            dir_keys = ["fix_dir_target_grid", "orog_dir_input_grid", "orog_dir_target_grid"]
             for file_key, dir_key in zip(file_keys, dir_keys):
                 full_path = Path(config_files[dir_key]) / config_files[file_key]
                 input_files.append(full_path)
             for k in [
                 "atm_files_input_grid",
                 "grib2_file_input_grid",
+                "nst_files_input_grid",
                 "sfc_files_input_grid",
             ]:
                 full_path = Path(config_files[k]) / config_files["data_dir_input_grid"]
                 input_files.append(full_path)
             for k in [
                 "atm_core_files_input_grid",
                 "atm_tracer_files_input_grid",
-                "nst_files_input_grid",
                 "orog_files_input_grid",
-                "orog_files_target_grid",
                 "varmap_file",
                 "vcoord_file_target_grid",
             ]:

src/uwtools/resources/jsonschema/chgres-cube.jsonschema

@@ -84,14 +84,6 @@
                       "type": "string"
                     },
                     "external_model": {
-                      "enum": [
-                        "FV3GFS",
-                        "GFS",
-                        "HRRR",
-                        "NAM",
-                        "RAP",
-                        "UKMET"
-                      ],
                       "type": "string"
                     },
                     "fix_dir_target_grid": {

src/uwtools/tests/drivers/test_chgres_cube.py

@@ -47,22 +47,22 @@ def config(tmp_path):
             "namelist": {
                 "update_values": {
                     "config": {
-                        "fix_dir_target_grid": "/path/to/dir",
-                        "mosaic_file_target_grid": str(afile),
-                        "orog_dir_target_grid": "/path/to/dir",
-                        "orog_files_target_grid": str(afile),
-                        "vcoord_file_target_grid": str(afile),
-                        "varmap_file": str(afile),
-                        "data_dir_input_grid": str(afile),
+                        "atm_core_files_input_grid": [str(afile), str(afile)],
                         "atm_files_input_grid": str(afile),
-                        "sfc_files_input_grid": str(afile),
-                        "grib2_file_input_grid": str(afile),
-                        "tracers_input": [str(afile), str(afile)],
-                        "tracers": [str(afile), str(afile)],
+                        "atm_tracer_files_input_grid": str(afile),
+                        "atm_weight_file": str(afile),
                         "convert_atm": True,
-                        "input_type": "gaussian_nemsio",
+                        "data_dir_input_grid": str(afile),
                         "external_model": "GFS",
+                        "fix_dir_target_grid": "/path/to/dir",
                         "geogrid_file_input_grid": str(afile),
+                        "grib2_file_input_grid": str(afile),
+                        "mosaic_file_input_grid": str(afile),
+                        "mosaic_file_target_grid": str(afile),
+                        "orog_dir_target_file": "/path/to/dir"
+                        "sfc_files_input_grid": str(afile),
+                        "varmap_file": str(afile),
+                        "vcoord_file_target_grid": str(afile),
                     }
                 },
                 "validate": True,