PG2 -> pg2

jgfouca · jgfouca · commit b70a663efcdb · 2025-04-04T12:34:52.000-06:00
diff --git a/components/eamxx/cime_config/eamxx_buildnml.py b/components/eamxx/cime_config/eamxx_buildnml.py
@@ -588,7 +588,7 @@ def _create_raw_xml_file_impl(case, xml, filepath=None):
     ...       </atm_proc_base>
     ...       <physics_proc_base inherit='atm_proc_base'>
     ...         <Grid>Physics gll</Grid>
-    ...         <Grid grid='ne4ne4'>Physics PG2</Grid>
+    ...         <Grid grid='ne4ne4'>Physics pg2</Grid>
     ...       </physics_proc_base>
     ...       <atm_proc_group inherit="atm_proc_base">
     ...         <atm_procs_list>NONE</atm_procs_list>
@@ -617,7 +617,7 @@ def _create_raw_xml_file_impl(case, xml, filepath=None):
                     ('enable_postcondition_checks', True),
                     (   'P1',
                         OrderedDict([   ('prop1', 'hi'),
-                                        ('Grid', 'Physics PG2'),
+                                        ('Grid', 'Physics pg2'),
                                         ('number_of_subcycles', 1),
                                         ('enable_precondition_checks', True),
                                         ('enable_postcondition_checks', True)])),
diff --git a/components/eamxx/cime_config/namelist_defaults_eamxx.xml b/components/eamxx/cime_config/namelist_defaults_eamxx.xml
@@ -590,7 +590,7 @@ be lost if SCREAM_HACK_XML is not enabled.
   <grids_manager>
     <type>Homme</type>
     <physics_grid_type>gll</physics_grid_type>
-    <physics_grid_type hgrid=".*pg2">PG2</physics_grid_type>
+    <physics_grid_type hgrid=".*pg2">pg2</physics_grid_type>
     <physics_grid_rebalance>None</physics_grid_rebalance>
     <dynamics_namelist_file_name>./data/namelist.nl</dynamics_namelist_file_name>
     <vertical_coordinate_filename type="file">UNSET</vertical_coordinate_filename>
diff --git a/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/mvkpert/yaml_outs/monthly_average_coarse.yaml b/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/mvkpert/yaml_outs/monthly_average_coarse.yaml
@@ -6,7 +6,7 @@ averaging_type: Average
 file_max_storage_type: one_month
 horiz_remap_file: ${DIN_LOC_ROOT}/atm/scream/maps/map_ne1024pg2_to_ne30pg2_mono.20230901.nc 
 Fields:
-  Physics PG2:
+  Physics pg2:
     Field Names:
     # 3D fields
     - T_mid
diff --git a/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/output/diags/shell_commands b/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/output/diags/shell_commands
@@ -12,7 +12,7 @@ YAML_FILE=$CASEROOT/eamxx_diags_output.yaml
 # Figure out the suffix for the physics grid
 ATM_GRID=$(./xmlquery --value ATM_GRID)
 if [[ $ATM_GRID == *"pg2"* ]]; then
-  PGTYPE="PG2"
+  PGTYPE="pg2"
 else
   PGTYPE="gll"
 fi
diff --git a/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/output/phys/shell_commands b/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/output/phys/shell_commands
@@ -12,7 +12,7 @@ YAML_FILE=$CASEROOT/eamxx_phys_output.yaml
 # Figure out the suffix for the physics grid
 ATM_GRID=$(./xmlquery --value ATM_GRID)
 if [[ $ATM_GRID == *"pg2"* ]]; then
-  PGTYPE="PG2"
+  PGTYPE="pg2"
 else
   PGTYPE="gll"
 fi
diff --git a/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/output/phys_dyn/shell_commands b/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/output/phys_dyn/shell_commands
@@ -12,7 +12,7 @@ YAML_FILE=$CASEROOT/eamxx_dyn_output.yaml
 # Figure out the suffix for the physics grid
 ATM_GRID=$(./xmlquery --value ATM_GRID)
 if [[ $ATM_GRID == *"pg2"* ]]; then
-  PGTYPE="PG2"
+  PGTYPE="pg2"
 else
   PGTYPE="gll"
 fi
diff --git a/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/prod/yaml_outs/eamxx_output.decadal.1dailyAVG_native.yaml b/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/prod/yaml_outs/eamxx_output.decadal.1dailyAVG_native.yaml
@@ -5,7 +5,7 @@ iotype: pnetcdf
 averaging_type: Average
 Max Snapshots Per File: 1
 Fields:
-  Physics PG2:
+  Physics pg2:
     Field Names:
     - snow_depth_land
 output_control:
diff --git a/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/prod/yaml_outs/eamxx_output.decadal.1dailyMAX_native.yaml b/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/prod/yaml_outs/eamxx_output.decadal.1dailyMAX_native.yaml
@@ -5,7 +5,7 @@ iotype: pnetcdf
 averaging_type: Max
 Max Snapshots Per File: 1
 Fields:
-  Physics PG2:
+  Physics pg2:
     Field Names:
     - T_2m
     - precip_total_surf_mass_flux
diff --git a/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/prod/yaml_outs/eamxx_output.decadal.1dailyMIN_native.yaml b/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/prod/yaml_outs/eamxx_output.decadal.1dailyMIN_native.yaml
@@ -5,7 +5,7 @@ iotype: pnetcdf
 averaging_type: Min
 Max Snapshots Per File: 1
 Fields:
-  Physics PG2:
+  Physics pg2:
     Field Names:
     - T_2m
 output_control:
diff --git a/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/prod/yaml_outs/eamxx_output.decadal.1hourlyINST_arm.yaml b/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/prod/yaml_outs/eamxx_output.decadal.1hourlyINST_arm.yaml
@@ -6,7 +6,7 @@ averaging_type: Instant
 Max Snapshots Per File: 24  # one file per day
 horiz_remap_file: ${DIN_LOC_ROOT}/atm/scream/maps/map_ne1024pg2_to_DecadalSites_c20240130.nc
 Fields:
-  Physics PG2:
+  Physics pg2:
     Field Names:
     # 3D
     - T_mid
diff --git a/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/prod/yaml_outs/eamxx_output.decadal.1hourlyINST_native.yaml b/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/prod/yaml_outs/eamxx_output.decadal.1hourlyINST_native.yaml
@@ -5,7 +5,7 @@ iotype: pnetcdf
 averaging_type: Instant
 Max Snapshots Per File: 24
 Fields:
-  Physics PG2:
+  Physics pg2:
     Field Names:
     # For cloud morphology
     - SW_flux_up_at_model_top
diff --git a/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/prod/yaml_outs/eamxx_output.decadal.3hourlyAVG_coarse.yaml b/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/prod/yaml_outs/eamxx_output.decadal.3hourlyAVG_coarse.yaml
@@ -6,7 +6,7 @@ averaging_type: Average
 Max Snapshots Per File: 8 # one file per day
 horiz_remap_file: ${DIN_LOC_ROOT}/atm/scream/maps/map_ne1024pg2_to_ne30pg2_mono.20230901.nc
 Fields:
-  Physics PG2:
+  Physics pg2:
     Field Names:
     # 3D fields
     - T_mid
diff --git a/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/prod/yaml_outs/eamxx_output.decadal.3hourlyINST_coarse.yaml b/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/prod/yaml_outs/eamxx_output.decadal.3hourlyINST_coarse.yaml
@@ -6,7 +6,7 @@ averaging_type: Instant
 Max Snapshots Per File: 8  # one file per day
 horiz_remap_file: ${DIN_LOC_ROOT}/atm/scream/maps/map_ne1024pg2_to_ne30pg2_mono.20230901.nc
 Fields:
-  Physics PG2:
+  Physics pg2:
     Field Names:
     # 2D vars for storm analysis
     - SeaLevelPressure
diff --git a/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/prod/yaml_outs/eamxx_output.decadal.6hourlyAVG_coarse.yaml b/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/prod/yaml_outs/eamxx_output.decadal.6hourlyAVG_coarse.yaml
@@ -6,7 +6,7 @@ averaging_type: Average
 Max Snapshots Per File: 4  # one file per day
 horiz_remap_file: ${DIN_LOC_ROOT}/atm/scream/maps/map_ne1024pg2_to_ne30pg2_mono.20230901.nc 
 Fields:
-  Physics PG2:
+  Physics pg2:
     Field Names:
     # Full 3D Profile
     - p3_T_mid_tend
diff --git a/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/prod/yaml_outs/eamxx_output.decadal.6hourlyINST_coarse.yaml b/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/prod/yaml_outs/eamxx_output.decadal.6hourlyINST_coarse.yaml
@@ -6,7 +6,7 @@ averaging_type: Instant
 Max Snapshots Per File: 4  # one file per day
 horiz_remap_file: ${DIN_LOC_ROOT}/atm/scream/maps/map_ne1024pg2_to_ne30pg2_mono.20230901.nc
 Fields:
-  Physics PG2:
+  Physics pg2:
     Field Names:
     # 3D fields on model levels
     - T_mid
diff --git a/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/prod/yaml_outs/eamxx_output.decadal.6hourlyINST_native.yaml b/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/prod/yaml_outs/eamxx_output.decadal.6hourlyINST_native.yaml
@@ -5,7 +5,7 @@ iotype: pnetcdf
 averaging_type: Instant
 Max Snapshots Per File: 4  # one file per day
 Fields:
-  Physics PG2:
+  Physics pg2:
     Field Names:
     # For storm analysis
     - SeaLevelPressure
diff --git a/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/prod/yaml_outs/eamxx_output.decadal.dailyAVG_coarse.yaml b/components/eamxx/cime_config/testdefs/testmods_dirs/eamxx/prod/yaml_outs/eamxx_output.decadal.dailyAVG_coarse.yaml
@@ -6,7 +6,7 @@ averaging_type: Average
 Max Snapshots Per File: 1
 horiz_remap_file: ${DIN_LOC_ROOT}/atm/scream/maps/map_ne1024pg2_to_ne30pg2_mono.20230901.nc 
 Fields:
-  Physics PG2:
+  Physics pg2:
     Field Names:
     # 3D fields
     - T_mid
diff --git a/components/eamxx/docs/_presentations_srcs/eamxx-tutorial-2025-part1.md b/components/eamxx/docs/_presentations_srcs/eamxx-tutorial-2025-part1.md
@@ -271,7 +271,7 @@ EOF
 ```yaml
 averaging_type: Average
 Fields:
-  Physics PG2:
+  Physics pg2:
     Field Names:
       - Q
       - CLDLIQ
diff --git a/components/eamxx/docs/user/clean_clear_sky.md b/components/eamxx/docs/user/clean_clear_sky.md
@@ -24,7 +24,7 @@ filename_prefix: monthly.outputs
 averaging_type: Average
 Max Snapshots Per File: 1
 Fields:
-  Physics PG2:
+  Physics pg2:
     Field Names:
     - SW_clnclrsky_flux_up_at_model_top
     - LW_clnclrsky_flux_up_at_model_top
diff --git a/components/eamxx/docs/user/cosp.md b/components/eamxx/docs/user/cosp.md
@@ -49,7 +49,7 @@ A minimal example:
 cat << EOF > eamxx_cosp_daily_output.yaml
 averaging_type: Average
 Fields:
-  Physics PG2:
+  Physics pg2:
     Field Names:
     - isccp_cldtot
     - isccp_ctptau
diff --git a/components/eamxx/docs/user/model_configuration.md b/components/eamxx/docs/user/model_configuration.md
@@ -143,7 +143,7 @@ $ ./atmquery --listall
     namelist_defaults
         grids_manager
             type: Homme
-            physics_grid_type: PG2
+            physics_grid_type: pg2
             physics_grid_rebalance: None
             dynamics_namelist_file_name: ./data/namelist.nl
             vertical_coordinate_filename: /some/path/to/coords/file.nc
diff --git a/components/eamxx/src/control/atmosphere_driver.cpp b/components/eamxx/src/control/atmosphere_driver.cpp
@@ -1071,7 +1071,7 @@ void AtmosphereDriver::set_initial_conditions ()
         // For GLL points, phis corresponds to "PHIS_d" in the
         // topography file. On PG2 grid, dynamics will take care
         // of computing phis, so do not add to initialized fields.
-        if (grid_name == "Physics PG2") {
+        if (grid_name == "Physics pg2") {
           // Skip
         } else if (grid_name == "Physics gll" ||
                    grid_name == "Point Grid") {
@@ -1084,14 +1084,14 @@ void AtmosphereDriver::set_initial_conditions ()
       } else if (fname == "sgh30") {
         // The eamxx field "sgh30" is called "SGH30" in the
         // topography file and is only available on the PG2 grid.
-        EKAT_ASSERT_MSG(grid_name == "Physics PG2",
+        EKAT_ASSERT_MSG(grid_name == "Physics pg2",
                         "Error! Requesting sgh30 field on " + grid_name +
-                        " topo file only has sgh30 for Physics PG2.\n");
+                        " topo file only has sgh30 for Physics pg2.\n");
         topography_file_fields_names[grid_name].push_back("SGH30");
         topography_eamxx_fields_names[grid_name].push_back(fname);
         m_fields_inited[grid_name].push_back(fname);
       }
-    } else if (not (fvphyshack and grid_name == "Physics PG2")) {
+    } else if (not (fvphyshack and grid_name == "Physics pg2")) {
       // The IC file is written for the GLL grid, so we only load
       // fields from there. Any other input fields on the PG2 grid
       // will be properly computed in the dynamics interface.
diff --git a/components/eamxx/src/dynamics/homme/homme_grids_manager.cpp b/components/eamxx/src/dynamics/homme/homme_grids_manager.cpp
@@ -203,7 +203,7 @@ build_physics_grid (const ci_string& type, const ci_string& rebalance) {
     return;
   }
 
-  if (type=="PG2") {
+  if (type=="pg2") {
     fvphyshack = true;
   }
 
@@ -392,8 +392,8 @@ build_pg_codes () {
 
   m_pg_codes["gll"]["None"] =  0;
   m_pg_codes["gll"]["Twin"] = 10;
-  m_pg_codes["PG2"]["None"] =  2;
-  m_pg_codes["PG2"]["Twin"] = 12;
+  m_pg_codes["pg2"]["None"] =  2;
+  m_pg_codes["pg2"]["Twin"] = 12;
 }
 
 } // namespace scream
diff --git a/components/eamxx/src/physics/tms/eamxx_tms_process_interface.cpp b/components/eamxx/src/physics/tms/eamxx_tms_process_interface.cpp
@@ -32,8 +32,8 @@ void TurbulentMountainStress::set_grids(const std::shared_ptr<const GridsManager
   // Initialize grid from grids manager
   m_grid = grids_manager->get_grid("Physics");
   const auto& grid_name = m_grid->name();
-  EKAT_REQUIRE_MSG(grid_name=="Physics PG2",
-                   "Error! TMS process can only be used with \"Physics PG2\" physics grid. "
+  EKAT_REQUIRE_MSG(grid_name=="Physics pg2",
+                   "Error! TMS process can only be used with \"Physics pg2\" physics grid. "
                    "Current physics grid is "+grid_name+".\n");
 
   m_ncols = m_grid->get_num_local_dofs(); // Number of columns on this rank
diff --git a/components/eamxx/src/share/io/eamxx_output_manager.cpp b/components/eamxx/src/share/io/eamxx_output_manager.cpp
@@ -67,7 +67,7 @@ setup (const std::shared_ptr<fm_type>& field_mgr,
   bool pg2_grid_in_io_streams = false;
   const auto& fields_pl = m_params.sublist("Fields");
   for (auto it=fields_pl.sublists_names_cbegin(); it!=fields_pl.sublists_names_cend(); ++it) {
-    if (*it == "Physics PG2") pg2_grid_in_io_streams = true;
+    if (*it == "Physics pg2") pg2_grid_in_io_streams = true;
   }
 
   if (m_params.isParameter("Field Names")) {
diff --git a/components/eamxx/src/share/io/scorpio_output.cpp b/components/eamxx/src/share/io/scorpio_output.cpp
@@ -805,7 +805,7 @@ void AtmosphereOutput::register_dimensions(const std::string& name)
       "Error! Dimension " + tag_name + " on field " + name + " has conflicting lengths.\n"
       "  - old length: " + std::to_string(m_dims[tag_name]) + "\n"
       "  - new length: " + std::to_string(dim_len) + "\n"
-      "If same name applies to different dims (e.g. PhysicsGLL and PhysicsPG2 define "
+      "If same name applies to different dims (e.g. Physics gll and Physics pg2 define "
       "\"ncol\" at different lengths), reset tag name for one of the grids.\n");
   }
 } // register_dimensions
diff --git a/components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_p3_rrtmgp_pg2/input.yaml b/components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_p3_rrtmgp_pg2/input.yaml
@@ -71,7 +71,7 @@ atmosphere_processes:
 
 grids_manager:
   type: Homme
-  physics_grid_type: PG2
+  physics_grid_type: pg2
   dynamics_namelist_file_name: namelist.nl
   vertical_coordinate_filename: IC_FILE
 
diff --git a/components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_p3_rrtmgp_pg2/output.yaml b/components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_p3_rrtmgp_pg2/output.yaml
@@ -4,7 +4,7 @@ filename_prefix: homme_shoc_cld_p3_rrtmgp_pg2_output
 averaging_type: Instant
 Max Snapshots Per File: 1
 Fields:
-  Physics PG2:
+  Physics pg2:
     Field Names:
       # HOMME
       - ps
diff --git a/components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_spa_p3_rrtmgp_pg2_dp/input.yaml b/components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_spa_p3_rrtmgp_pg2_dp/input.yaml
@@ -81,7 +81,7 @@ atmosphere_processes:
 
 grids_manager:
   type: Homme
-  physics_grid_type: PG2
+  physics_grid_type: pg2
   dynamics_namelist_file_name: namelist.nl
   vertical_coordinate_filename: IC_FILE
 
diff --git a/components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_spa_p3_rrtmgp_pg2_dp/output.yaml b/components/eamxx/tests/multi-process/dynamics_physics/homme_shoc_cld_spa_p3_rrtmgp_pg2_dp/output.yaml
@@ -4,7 +4,7 @@ filename_prefix: homme_shoc_cld_spa_p3_rrtmgp_pg2_dp_output
 averaging_type: Instant
 Max Snapshots Per File: 1
 Fields:
-  Physics PG2:
+  Physics pg2:
     Field Names:
       # HOMME
       - ps
