Now mark energy consistency variables in registry as initialized in dycore initialization

Author: jimmielin

src/data/registry.xml

@@ -210,47 +210,41 @@
               type="real" kind="kind_phys"
               allocatable="pointer">
       <dimensions>horizontal_dimension</dimensions>
-      <ic_file_input_names>te_ini_phys state_te_ini_phys</ic_file_input_names>
     </variable>
     <variable local_name="te_cur_phys"
               standard_name="vertically_integrated_total_energy_of_current_state_using_physics_energy_formula"
               units="J m-2"
               type="real" kind="kind_phys"
               allocatable="pointer">
       <dimensions>horizontal_dimension</dimensions>
-      <ic_file_input_names>te_cur_phys state_te_cur_phys</ic_file_input_names>
     </variable>
     <variable local_name="te_ini_dyn"
               standard_name="vertically_integrated_total_energy_of_initial_state_using_dycore_energy_formula"
               units="J m-2"
               type="real" kind="kind_phys"
               allocatable="pointer">
       <dimensions>horizontal_dimension</dimensions>
-      <ic_file_input_names>te_ini_dyn state_te_ini_dyn</ic_file_input_names>
     </variable>
     <variable local_name="te_cur_dyn"
               standard_name="vertically_integrated_total_energy_of_current_state_using_dycore_energy_formula"
               units="J m-2"
               type="real" kind="kind_phys"
               allocatable="pointer">
       <dimensions>horizontal_dimension</dimensions>
-      <ic_file_input_names>te_cur_dyn state_te_cur_dyn</ic_file_input_names>
     </variable>
     <variable local_name="tw_ini"
               standard_name="vertically_integrated_water_vapor_and_condensed_water_of_initial_state"
               units="kg m-2"
               type="real" kind="kind_phys"
               allocatable="pointer">
       <dimensions>horizontal_dimension</dimensions>
-      <ic_file_input_names>tw_ini state_tw_ini</ic_file_input_names>
     </variable>
     <variable local_name="tw_cur"
               standard_name="vertically_integrated_water_vapor_and_condensed_water_of_current_state"
               units="kg m-2"
               type="real" kind="kind_phys"
               allocatable="pointer">
       <dimensions>horizontal_dimension</dimensions>
-      <ic_file_input_names>tw_cur state_tw_cur</ic_file_input_names>
     </variable>
     <!-- Timestep properties -->
     <variable local_name="is_first_timestep"
@@ -428,7 +422,6 @@
               allocatable="allocatable">
       <long_name>Enthalpy or internal energy scaling factor for energy consistency</long_name>
       <dimensions>horizontal_dimension vertical_layer_dimension</dimensions>
-      <ic_file_input_names>cp_or_cv_dycore</ic_file_input_names>
     </variable>
     <!-- Constituent Variables -->
     <!-- These are only used to set possible IC file input names, as the constituents object handles allocation. -->

src/dynamics/mpas/dyn_comp.F90

@@ -184,7 +184,8 @@ end subroutine dyn_readnl
     !
     ! Called by `cam_init` in `src/control/cam_comp.F90`.
     subroutine dyn_init(cam_runtime_opts, dyn_in, dyn_out)
-        use cam_thermo_formula, only: energy_formula_dycore, ENERGY_FORMULA_DYCORE_MPAS
+        use cam_thermo_formula,   only: energy_formula_dycore, ENERGY_FORMULA_DYCORE_MPAS
+        use phys_vars_init_check, only: mark_as_initialized
 
         type(runtime_options), intent(in) :: cam_runtime_opts
         type(dyn_import_t), intent(in) :: dyn_in
@@ -204,6 +205,7 @@ subroutine dyn_init(cam_runtime_opts, dyn_in, dyn_out)
 
         ! Set dynamical core energy formula for use in cam_thermo.
         energy_formula_dycore = ENERGY_FORMULA_DYCORE_MPAS
+        mark_as_initialized("total_energy_formula_for_dycore")
 
         allocate(constituent_name(num_advected), stat=ierr)
         call check_allocate(ierr, subname, 'constituent_name(num_advected)', 'dyn_comp', __LINE__)

src/dynamics/se/dyn_comp.F90

@@ -567,6 +567,7 @@ subroutine dyn_init(cam_runtime_opts, dyn_in, dyn_out)
    !use cam_history,        only: addfld, add_default, horiz_only, register_vector_field
    use gravity_waves_sources, only: gws_init
    use cam_thermo_formula, only: energy_formula_dycore, ENERGY_FORMULA_DYCORE_SE
+   use phys_vars_init_check, only: mark_as_initialized
 
    !SE dycore:
    use prim_advance_mod,   only: prim_advance_init
@@ -645,6 +646,7 @@ subroutine dyn_init(cam_runtime_opts, dyn_in, dyn_out)
    !----------------------------------------------------------------------------
    ! Set dynamical core energy formula for use in cam_thermo.
    energy_formula_dycore = ENERGY_FORMULA_DYCORE_SE
+   mark_as_initialized("total_energy_formula_for_dycore")
 
    ! Now allocate and set condenstate vars
    allocate(cnst_name_gll(qsize), stat=iret) ! constituent names for gll tracers
@@ -1855,6 +1857,16 @@ subroutine read_inidat(dyn_in)
    call mark_as_initialized("tendency_of_air_temperature_due_to_model_physics")
    call mark_as_initialized("tendency_of_eastward_wind_due_to_model_physics")
    call mark_as_initialized("tendency_of_northward_wind_due_to_model_physics")
+   call mark_as_initialized("specific_heat_for_air_used_in_dycore")
+
+   ! These energy variables are calculated by check_energy_timestep_init
+   ! but need to be marked here
+   call mark_as_initialized("vertically_integrated_total_energy_of_initial_state_using_physics_energy_formula")
+   call mark_as_initialized("vertically_integrated_total_energy_of_current_state_using_physics_energy_formula")
+   call mark_as_initialized("vertically_integrated_total_energy_of_initial_state_using_dycore_energy_formula")
+   call mark_as_initialized("vertically_integrated_total_energy_of_current_state_using_dycore_energy_formula")
+   call mark_as_initialized("vertically_integrated_water_vapor_and_condensed_water_of_initial_state")
+   call mark_as_initialized("vertically_integrated_water_vapor_and_condensed_water_of_current_state")
 
 end subroutine read_inidat