From 143967761e63af780df7eab4ae8a8480c5c13e3f Mon Sep 17 00:00:00 2001
From: Haipeng Lin <hplin+github@ucar.edu>
Date: Mon, 20 Jul 2026 13:05:27 -0400
Subject: [PATCH 1/4] Populate diagnostic_volume_mixing_ratio_of_co2_to_coupler
 instead of co2diag_tbd to land model.

Provenance: FIX-31 octopus
Assisted-by: claude-fable:5
---
 src/data/registry.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/data/registry.xml b/src/data/registry.xml
index 6bb13233..254aa4c5 100644
--- a/src/data/registry.xml
+++ b/src/data/registry.xml
@@ -1046,8 +1046,8 @@
       <ic_file_input_names>bcphodry cam_out_bcphodry</ic_file_input_names>
     </variable>
     <variable local_name="co2diag"
-              standard_name="co2diag_tbd"
-              units="tbd" type="real" kind="kind_phys"
+              standard_name="diagnostic_volume_mixing_ratio_of_co2_to_coupler"
+              units="ppmv" type="real" kind="kind_phys"
               allocatable="allocatable">
       <dimensions>horizontal_dimension</dimensions>
       <initial_value>0.0_kind_phys</initial_value>
@@ -1391,7 +1391,7 @@
        <data>dry_deposition_flux_of_hydrophilic_black_carbon_at_surface_to_coupler</data>
        <data>wet_deposition_flux_of_hydrophilic_black_carbon_at_surface_to_coupler</data>
        <data>dry_deposition_flux_of_hydrophobic_black_carbon_at_surface_to_coupler</data>
-       <data>co2diag_tbd</data>
+       <data>diagnostic_volume_mixing_ratio_of_co2_to_coupler</data>
        <data>co2prog_tbd</data>
        <data>dry_deposition_of_dust_bin1_at_surface_to_coupler</data>
        <data>dry_deposition_of_dust_bin2_at_surface_to_coupler</data>

From c67275932d4d624f1c5696f30a9d2c2726b39804 Mon Sep 17 00:00:00 2001
From: Haipeng Lin <hplin+github@ucar.edu>
Date: Wed, 29 Jul 2026 17:56:50 -0400
Subject: [PATCH 2/4] add co2prog standard name too

---
 src/data/registry.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/data/registry.xml b/src/data/registry.xml
index 254aa4c5..1cd8ebc6 100644
--- a/src/data/registry.xml
+++ b/src/data/registry.xml
@@ -1054,8 +1054,8 @@
       <ic_file_input_names>co2diag cam_out_co2diag</ic_file_input_names>
     </variable>
     <variable local_name="co2prog"
-              standard_name="co2prog_tbd"
-              units="tbd" type="real" kind="kind_phys"
+              standard_name="prognostic_volume_mixing_ratio_of_co2_to_coupler"
+              units="ppmv" type="real" kind="kind_phys"
               allocatable="allocatable">
       <dimensions>horizontal_dimension</dimensions>
       <initial_value>0.0_kind_phys</initial_value>
@@ -1392,7 +1392,7 @@
        <data>wet_deposition_flux_of_hydrophilic_black_carbon_at_surface_to_coupler</data>
        <data>dry_deposition_flux_of_hydrophobic_black_carbon_at_surface_to_coupler</data>
        <data>diagnostic_volume_mixing_ratio_of_co2_to_coupler</data>
-       <data>co2prog_tbd</data>
+       <data>prognostic_volume_mixing_ratio_of_co2_to_coupler</data>
        <data>dry_deposition_of_dust_bin1_at_surface_to_coupler</data>
        <data>dry_deposition_of_dust_bin2_at_surface_to_coupler</data>
        <data>dry_deposition_of_dust_bin3_at_surface_to_coupler</data>

From 829d603a296e4aaafe82694abb7029479dd12f76 Mon Sep 17 00:00:00 2001
From: Haipeng Lin <hplin@ucar.edu>
Date: Thu, 30 Jul 2026 18:30:12 -0400
Subject: [PATCH 3/4] Fix bitrot throwing error when calling
 generate_registry_data

---
 src/data/generate_registry_data.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/data/generate_registry_data.py b/src/data/generate_registry_data.py
index a738fc78..a45d0b86 100755
--- a/src/data/generate_registry_data.py
+++ b/src/data/generate_registry_data.py
@@ -1950,5 +1950,5 @@ def main():
 
 ###############################################################################
 if __name__ == "__main__":
-    __RETCODE, _FILES, _IC_NAMES = main()
+    __RETCODE, *_ = main()
     sys.exit(__RETCODE)

From 0cf6af47cb68d4c0c84a9d3551a83a270af6e877 Mon Sep 17 00:00:00 2001
From: Haipeng Lin <hplin@ucar.edu>
Date: Thu, 30 Jul 2026 18:32:19 -0400
Subject: [PATCH 4/4] Update atmos_phys to latest hash

---
 .gitmodules           | 2 +-
 src/physics/ncar_ccpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 605b3f5a..86816841 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -20,7 +20,7 @@
 [submodule "ncar-physics"]
         path          = src/physics/ncar_ccpp
 	url           = https://github.com/ESCOMP/atmospheric_physics
-	fxtag         = 9865ef6a9384030233abe23e77acdc208abecdc3
+	fxtag         = d3dcffa8239e84bf6c251c7158d0246caf2caa6d
         fxrequired    = AlwaysRequired
         fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics
 [submodule "rrtmgp-data"]
diff --git a/src/physics/ncar_ccpp b/src/physics/ncar_ccpp
index 9865ef6a..d3dcffa8 160000
--- a/src/physics/ncar_ccpp
+++ b/src/physics/ncar_ccpp
@@ -1 +1 @@
-Subproject commit 9865ef6a9384030233abe23e77acdc208abecdc3
+Subproject commit d3dcffa8239e84bf6c251c7158d0246caf2caa6d