NorESMhub · mvertens · Jun 14, 2025 · Jun 15, 2025 · Jun 17, 2025 · Jun 18, 2025
diff --git a/.gitmodules b/.gitmodules
@@ -32,8 +32,8 @@
 
 [submodule "atmos_phys"]
     path = src/atmos_phys
-    url = https://github.com/NorESMhub/atmospheric_physics
-    fxtag = atmos_phys0_14_001_noresm_v0
+    url = https://github.com/mvertens/atmospheric_physics
+    fxtag = 339524f
     fxrequired = AlwaysRequired
     fxDONOTUSEurl = https://github.com/NorESMhub/atmospheric_physics
 
@@ -76,8 +76,8 @@
 
 [submodule "oslo_aero"]
     path = src/chemistry/oslo_aero
-    url = https://github.com/NorESMhub/OSLO_AERO
-    fxtag = oslo_aero_3_0a007
+    url = https://github.com/mvertens/OSLO_AERO
+    fxtag = 55cd786
     fxrequired = AlwaysRequired
     fxDONOTUSEurl = https://github.com/NorESMhub/OSLO_AERO.git
 

diff --git a/bld/build-namelist b/bld/build-namelist
@@ -455,8 +455,7 @@ if ($print>=2) {
 # Composition of air
 add_default($nl, 'dry_air_species');
 add_default($nl, 'water_species_in_air');
-# Enthalpy flux
-add_default($nl, 'compute_enthalpy_flux');
+
 # Spectral Element dycore
 my $dyn = $cfg->get('dyn');
 
@@ -4553,6 +4552,7 @@ add_default($nl, 'history_gas');
 add_default($nl, 'history_aerosol_forcing');
 add_default($nl, 'history_aerosol_radiation');
 add_default($nl, 'history_aerosol_debug_output');
+add_default($nl, 'history_enthalpy_flux');
 
 # The history output for the AMWG variability diagnostics assumes that auxilliary history
 # files h1, h2, and h3 contain daily, 6-hrly, and 3-hrly output respectively.  If this output

diff --git a/bld/namelist_files/namelist_defaults_cam.xml b/bld/namelist_files/namelist_defaults_cam.xml
@@ -2787,6 +2787,14 @@ See https://github.com/NorESMhub/noresm3_dev_simulations/discussions/78
 
 <zmconv_parcel_pbl                                                    > .false. </zmconv_parcel_pbl>
 <zmconv_parcel_hscale                                                 >  0.5    </zmconv_parcel_hscale>
+<!-- +tht zm parameters-->
+<zmconv_tiedke_lnd>    1.0  </zmconv_tiedke_lnd>
+<zmconv_tht_thermo> .false. </zmconv_tht_thermo>
+<zmconv_retrigger>  .false. </zmconv_retrigger>
+<zmconv_entrmn>       2e-4  </zmconv_entrmn>
+<zmconv_alfadet>       0.1  </zmconv_alfadet>
+<zmconv_plclmin>      6.e2  </zmconv_plclmin>
+<!-- -tht zm parameters-->
 
 <!-- CAMNOR thermo begin -->
 <zmconv_tiedke_lnd             > 1.0     </zmconv_tiedke_lnd>
@@ -2993,6 +3001,7 @@ See https://github.com/NorESMhub/noresm3_dev_simulations/discussions/78
 <history_aerosol_forcing>      .false.  </history_aerosol_forcing>
 <history_aerosol_radiation>    .false.  </history_aerosol_radiation>
 <history_aerosol_debug_output> .false.  </history_aerosol_debug_output>
+<history_enthalpy_flux>        .false.  </history_enthalpy_flux>
 
 <cam_snapshot_before_num>  -1 </cam_snapshot_before_num>
 <cam_snapshot_after_num>   -1 </cam_snapshot_after_num>
@@ -3012,9 +3021,6 @@ See https://github.com/NorESMhub/noresm3_dev_simulations/discussions/78
 <water_species_in_air microphys="mg2"                    >'Q','CLDLIQ','CLDICE','RAINQM','SNOWQM'         </water_species_in_air>
 <water_species_in_air microphys="mg3"                    >'Q','CLDLIQ','CLDICE','RAINQM','SNOWQM','GRAUQM'</water_species_in_air>
 
-<!-- Enthalpy flux -->
-<compute_enthalpy_flux> .false. </compute_enthalpy_flux>
-
 <!-- ================================================================== -->
 <!-- Defaults for FV3                                                   -->
 <!-- ================================================================== -->

diff --git a/bld/namelist_files/namelist_definition.xml b/bld/namelist_files/namelist_definition.xml
@@ -2275,7 +2275,7 @@ Default: 0,-24,-24,-24,-24,-24,-24,-24,-24,-24
     group="cam_history_nl" valid_values="">
 If interpolate_output(k) = .true., then the k'th history file will be
 interpolated to a lat/lon grid before output.
-Default: .false.,.false.,.false.,.false.,.false.,.false.,.false.,.false.,.false.,.false.
+Default: .false.
 </entry>
 
 <entry id="interpolate_nlat" type="integer(10)" category="history"
@@ -5815,6 +5815,12 @@ summation fields.
 Default: .false.
 </entry>
 
+<entry id="history_enthalpy_flux" type="logical" category="diagnostics"
+       group="phys_ctl_nl" valid_values="" >
+Output enthalpy flux diagnostics if CAM computes enthalpy fluxes
+Default: .false.
+</entry>
+
 <entry id="offline_driver" type="logical" category="offline_unit_driver"
        group="phys_ctl_nl" valid_values="" >
 True when model is configured to use an offline driver.
@@ -8282,15 +8288,6 @@ Switch to apply lunar tidal tendencies to neutral winds.
 Default: FALSE
 </entry>
 
-<!-- Enthalpy flux -->
-
-<entry id="compute_enthalpy_flux" type="logical"  category="physconst"
-       group="air_composition_nl" valid_values="" >
-Enthalpy flux terms explicitly computed and added in the atmosphere and
-passed to an active ocean component.
-Default: FALSE
-</entry>
-
 <!-- Dry air major species -->
 
 <entry id="dry_air_species" type="char*6(20)"  category="physconst"

diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml
@@ -53,6 +53,15 @@
     </options>
   </test>
 
+  <test compset="NF1850fates-sp" grid="ne16pg3_ne16pg3_mtn14" name="ERP_Ln9" testmods="cam/outfrq9s_enthalpy_from_cam">
+    <machines>
+      <machine name="betzy" compiler="intel" category="aux_cam_noresm"/>
+    </machines>
+    <options>
+      <option name="wallclock">00:20:00</option>
+    </options>
+  </test>
+
   <test compset="NF1850" grid="ne30pg3_ne30pg3_mtn14" name="ERP_Ln9" testmods="cam/outfrq9s">
     <machines>
       <machine name="betzy" compiler="intel" category="aux_cam_noresm"/>

diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_enthalpy_from_cam/shell_commands b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_enthalpy_from_cam/shell_commands
@@ -0,0 +1,2 @@
+./xmlchange ROF_NCPL=\$ATM_NCPL
+./xmlchange GLC_NCPL=\$ATM_NCPL
diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_enthalpy_from_cam/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_enthalpy_from_cam/user_nl_cam
@@ -0,0 +1,5 @@
+mfilt=1,1,1,1,1,1
+ndens=1,1,1,1,1,1
+nhtfrq=9,9,9,9,9,9
+write_nstep0=.true.
+inithist='ENDOFRUN'
diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq9s_enthalpy_from_cam/user_nl_cpl b/cime_config/testdefs/testmods_dirs/cam/outfrq9s_enthalpy_from_cam/user_nl_cpl
@@ -0,0 +1 @@
+component_computes_enthalpy_flux = 'atm'
diff --git a/src/atmos_phys b/src/atmos_phys
diff --git a/src/chemistry/oslo_aero b/src/chemistry/oslo_aero
diff --git a/src/control/cam_comp.F90 b/src/control/cam_comp.F90
@@ -28,6 +28,7 @@ module cam_comp
 use perf_mod
 use cam_logfile,       only: iulog
 use cam_abortutils,    only: endrun
+use air_composition,   only: air_composition_register
 
 implicit none
 private
@@ -56,7 +57,8 @@ module cam_comp
 subroutine cam_init(                                             &
    caseid, ctitle, model_doi_url,                                &
    initial_run_in, restart_run_in, branch_run_in, post_assim_in, &
-   calendar, brnch_retain_casename, aqua_planet, dms_from_ocn, &
+   calendar, brnch_retain_casename, aqua_planet, dms_from_ocn,   &
+   compute_enthalpy_flux,                                        &
    single_column, scmlat, scmlon,                                &
    eccen, obliqr, lambm0, mvelpp,                                &
    perpetual_run, perpetual_ymd,                                 &
@@ -103,6 +105,7 @@ subroutine cam_init(                                             &
 
    logical,           intent(in) :: single_column
    logical,           intent(in) :: dms_from_ocn
+   logical,           intent(in) :: compute_enthalpy_flux
    real(r8),          intent(in) :: scmlat
    real(r8),          intent(in) :: scmlon
 
@@ -168,14 +171,19 @@ subroutine cam_init(                                             &
    ! Register zonal average grid for phys TEM diagnostics
    call phys_grid_ctem_reg()
 
+   ! Need to call this before phys_register - sets module variable
+   ! compute_enthalpy_flux in air_composition_register
+   call air_composition_register(compute_enthalpy_flux)
+
    ! Register advected tracers and physics buffer fields
-   call phys_register ()
+   call phys_register()
 
    ! Initialize ghg surface values before default initial distributions
    ! are set in dyn_init
    call chem_surfvals_init()
 
    call air_composition_init()
+
    ! initialize ionosphere
    call ionosphere_init()
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		./xmlchange ROF_NCPL=\$ATM_NCPL
		./xmlchange GLC_NCPL=\$ATM_NCPL