diff --git a/.gitmodules b/.gitmodules
index 5e5f8d221..233fef932 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -8,8 +8,10 @@
   branch = develop
 [submodule "ccpp/physics"]
   path = ccpp/physics
-  url = https://github.com/ufs-community/ccpp-physics
-  branch = ufs/dev
+  #url = https://github.com/ufs-community/ccpp-physics
+  #branch = ufs/dev
+  url = https://github.com/grantfirl/ccpp-physics
+  branch = NCAR-main-sync-20260401
 [submodule "upp"]
   path = upp
   url = https://github.com/NOAA-EMC/UPP
diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90
index c719a8f04..ee8a222be 100644
--- a/ccpp/data/GFS_typedefs.F90
+++ b/ccpp/data/GFS_typedefs.F90
@@ -980,6 +980,10 @@ module GFS_typedefs
     logical              :: top_at_1                !< Vertical ordering flag.
     integer              :: iSFC                    !< Vertical index for surface
     integer              :: iTOA                    !< Vertical index for TOA
+    logical              :: is_init_lw_gas_optics   = .false.
+    logical              :: is_init_sw_gas_optics   = .false.
+    logical              :: is_init_lw_cloud_optics = .false.
+    logical              :: is_init_sw_cloud_optics = .false.
 
 !--- microphysical switch
     logical              :: convert_dry_rho = .true.       !< flag for converting mass/number concentrations from moist to dry
diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta
index b97f25aff..4d884219c 100644
--- a/ccpp/data/GFS_typedefs.meta
+++ b/ccpp/data/GFS_typedefs.meta
@@ -4578,6 +4578,30 @@
   units = flag
   dimensions = ()
   type = integer
+[is_init_sw_gas_optics]
+  standard_name = flag_for_rrmtgp_sw_gas_optics_initialization
+  long_name = flag carrying scheme initialization status
+  units = flag
+  dimensions = ()
+  type = logical
+[is_init_sw_cloud_optics]
+  standard_name = flag_for_rrmtgp_sw_cloud_optics_initialization
+  long_name = flag carrying scheme initialization status
+  units = flag
+  dimensions = ()
+  type = logical
+[is_init_lw_gas_optics]
+  standard_name = flag_for_rrmtgp_lw_gas_optics_initialization
+  long_name = flag carrying scheme initialization status
+  units = flag
+  dimensions = ()
+  type = logical
+[is_init_lw_cloud_optics]
+  standard_name = flag_for_rrmtgp_lw_cloud_optics_initialization
+  long_name = flag carrying scheme initialization status
+  units = flag
+  dimensions = ()
+  type = logical
 [convert_dry_rho]
   standard_name = flag_for_converting_hydrometeors_from_moist_to_dry_air
   long_name = flag for converting hydrometeors from moist to dry air
@@ -7591,7 +7615,7 @@
   dimensions = ()
   type = integer
 [oz_coeff]
-  standard_name = number_of_coefficients_in_ozone_data
+  standard_name = number_of_coefficients_in_ozone_forcing_data
   long_name = number of coefficients in ozone forcing data
   units = count
   dimensions = ()
@@ -8397,7 +8421,7 @@
   standard_name = ozone_forcing
   long_name = ozone forcing data
   units = mixed
-  dimensions = (horizontal_dimension,vertical_dimension_of_ozone_forcing_data,number_of_coefficients_in_ozone_data)
+  dimensions = (horizontal_dimension,vertical_dimension_of_ozone_forcing_data,number_of_coefficients_in_ozone_forcing_data)
   type = real
   kind = kind_phys
 [h2opl]
@@ -11057,7 +11081,7 @@
   type = real
   kind = kind_phys
 [con_avgd]
-  standard_name = avogadro_consant
+  standard_name = avogadro_constant
   long_name = Avogadro constant
   units = mol-1
   dimensions = ()
diff --git a/ccpp/physics b/ccpp/physics
index 6904ad4b5..37ad15780 160000
--- a/ccpp/physics
+++ b/ccpp/physics
@@ -1 +1 @@
-Subproject commit 6904ad4b5563ca1a63203993b35fa68de794340f
+Subproject commit 37ad15780e142a295e1d80deca9083c91506f408
diff --git a/fv3/atmos_model.F90 b/fv3/atmos_model.F90
index 513cd038c..3edb0b63f 100644
--- a/fv3/atmos_model.F90
+++ b/fv3/atmos_model.F90
@@ -632,7 +632,7 @@ subroutine atmos_model_init (Atmos, Time_init, Time, Time_step)
    call get_atmos_tracer_types(tracer_types)
 !--- setup Init_parm
    Init_parm%me              =  mpp_pe()
-   Init_parm%master          =  mpp_root_pe()
+   Init_parm%master          =  0
    Init_parm%fcst_mpi_comm   =  fcst_mpi_comm
    Init_parm%fcst_ntasks     =  fcst_ntasks
    Init_parm%tile_num        =  tile_num