Merge branch 'kaizhangpnl/atm/ieflx_cleanup2' (PR #2730)

remove l_ieflx_fix

removed l_ieflx_fix in

- components/cam/bld/namelist_files/namelist_definition.xml
- components/cam/src/physics/cam/phys_control.F90
- use_cases namelist files (under components/cam/bld/...
...namelist_files/use_cases)

[BFB]

Fixes #2731

* kaizhangpnl/atm/ieflx_cleanup2:
  delete l_ieflx_fix in use_cases namelist files
  remove l_ieflx_fix

components/cam/bld/namelist_files/namelist_definition.xml

@@ -1128,13 +1128,6 @@ IEFLX fixer options
 Default: 0
 </entry>
 
-<entry id="l_ieflx_fix" type="logical"  category="fixers"
-       group="phys_ctl_nl" valid_values="">
-Whether or not to turn on IEFLX fixer
-Default: false
-</entry>
-
-
 <!-- Gravity Wave Drag -->
 
 <entry id="use_gw_oro" type="logical" category="gw_drag"

components/cam/bld/namelist_files/use_cases/1850_cam5_CMIP6.xml

@@ -98,7 +98,6 @@
 <rrtmg_temp_fix          > .true.    </rrtmg_temp_fix>
 
 <!-- Energy fixer options -->
-<l_ieflx_fix> .true.</l_ieflx_fix>
 <ieflx_opt  > 2     </ieflx_opt>
 
 

components/cam/bld/namelist_files/use_cases/1850_cam5_CMIP6_bgc.xml

@@ -98,7 +98,6 @@
 <rrtmg_temp_fix          > .true.    </rrtmg_temp_fix>
 
 <!-- Energy fixer options -->
-<l_ieflx_fix> .true.</l_ieflx_fix>
 <ieflx_opt  > 2     </ieflx_opt>
 
 

components/cam/bld/namelist_files/use_cases/1950_cam5_CMIP6-HR.xml

@@ -106,7 +106,6 @@
 <cld_macmic_num_steps>3</cld_macmic_num_steps>
 
 <!-- Energy fixer options -->
-<l_ieflx_fix> .true.</l_ieflx_fix>
 <ieflx_opt  > 2     </ieflx_opt>
 
 <!-- External forcing for BAM or MAM.  CMIP6 input4mips data -->

components/cam/bld/namelist_files/use_cases/1950_cam5_CMIP6-LR.xml

@@ -98,7 +98,6 @@
 <rrtmg_temp_fix          > .true.    </rrtmg_temp_fix>
 
 <!-- Energy fixer options -->
-<l_ieflx_fix> .true.</l_ieflx_fix>
 <ieflx_opt  > 2     </ieflx_opt>
 
 <!-- External forcing for BAM or MAM.  CMIP6 input4mips data -->

components/cam/bld/namelist_files/use_cases/1950_cam5_CMIP6-LRtunedHR.xml

@@ -102,7 +102,6 @@
 <clubb_C14           >1.75D0</clubb_C14>
 
 <!-- Energy fixer options -->
-<l_ieflx_fix> .true.</l_ieflx_fix>
 <ieflx_opt  > 2     </ieflx_opt>
 
 <!-- External forcing for BAM or MAM.  CMIP6 input4mips data -->

components/cam/bld/namelist_files/use_cases/20TR_cam5_CMIP6.xml

@@ -94,7 +94,6 @@
 <rrtmg_temp_fix>.true.</rrtmg_temp_fix>
 
 <!-- Energy fixer options -->
-<l_ieflx_fix> .true.</l_ieflx_fix>
 <ieflx_opt  > 2     </ieflx_opt>
 
 <!-- External forcing for BAM or MAM.  CMIP6 input4mips data -->

components/cam/bld/namelist_files/use_cases/20TR_cam5_CMIP6_bgc.xml

@@ -95,7 +95,6 @@
 <rrtmg_temp_fix          > .true.    </rrtmg_temp_fix>
 
 <!-- Energy fixer options -->
-<l_ieflx_fix> .true.</l_ieflx_fix>
 <ieflx_opt  > 2     </ieflx_opt>
 
 <!-- External forcing for BAM or MAM.  CMIP6 input4mips data -->

components/cam/src/physics/cam/phys_control.F90

@@ -110,7 +110,6 @@ module phys_control
 logical, public, protected :: print_fixer_message  = .false.     ! switch on error message printout in log file
 
 integer, public, protected :: ieflx_opt = 0
-logical, public, protected :: l_ieflx_fix = .false.
 
 ! Macro/micro-physics co-substeps
 integer           :: cld_macmic_num_steps = 1
@@ -179,7 +178,6 @@ subroutine phys_ctl_readnl(nlfile)
       history_eddy, history_budget,  history_budget_histfile_num, history_waccm, &
       conv_water_in_rad, history_clubb, do_clubb_sgs, do_tms, state_debug_checks, &
       use_mass_borrower, do_aerocom_ind3, &
-      l_ieflx_fix, &
       ieflx_opt, &
       use_qqflx_fixer, & 
       print_fixer_message, & 
@@ -236,7 +234,6 @@ subroutine phys_ctl_readnl(nlfile)
    call mpibcast(conv_water_in_rad,               1 , mpiint,  0, mpicom)
    call mpibcast(do_tms,                          1 , mpilog,  0, mpicom)
    call mpibcast(use_mass_borrower,               1 , mpilog,  0, mpicom)
-   call mpibcast(l_ieflx_fix,             1 , mpilog,  0, mpicom)
    call mpibcast(ieflx_opt,               1 , mpiint,  0, mpicom)
    call mpibcast(use_qqflx_fixer,                 1 , mpilog,  0, mpicom)
    call mpibcast(print_fixer_message,             1 , mpilog,  0, mpicom)
@@ -413,7 +410,6 @@ subroutine phys_getopts(deep_scheme_out, shallow_scheme_out, eddy_scheme_out, &
                         do_clubb_sgs_out, do_tms_out, state_debug_checks_out, &
                         do_aerocom_ind3_out,  &
                         use_mass_borrower_out, & 
-                        l_ieflx_fix_out, & 
                         use_qqflx_fixer_out, & 
                         print_fixer_message_out, & 
                         cld_macmic_num_steps_out, micro_do_icesupersat_out, &
@@ -460,7 +456,6 @@ subroutine phys_getopts(deep_scheme_out, shallow_scheme_out, eddy_scheme_out, &
    logical,           intent(out), optional :: prog_modal_aero_out
    logical,           intent(out), optional :: do_tms_out
    logical,           intent(out), optional :: use_mass_borrower_out
-   logical,           intent(out), optional :: l_ieflx_fix_out
    logical,           intent(out), optional :: use_qqflx_fixer_out
    logical,           intent(out), optional :: print_fixer_message_out
    logical,           intent(out), optional :: state_debug_checks_out
@@ -526,7 +521,6 @@ subroutine phys_getopts(deep_scheme_out, shallow_scheme_out, eddy_scheme_out, &
    if ( present(prog_modal_aero_out     ) ) prog_modal_aero_out      = prog_modal_aero
    if ( present(do_tms_out              ) ) do_tms_out               = do_tms
    if ( present(use_mass_borrower_out   ) ) use_mass_borrower_out    = use_mass_borrower
-   if ( present(l_ieflx_fix_out   ) ) l_ieflx_fix_out    = l_ieflx_fix
    if ( present(use_qqflx_fixer_out     ) ) use_qqflx_fixer_out      = use_qqflx_fixer
    if ( present(print_fixer_message_out ) ) print_fixer_message_out  = print_fixer_message
    if ( present(state_debug_checks_out  ) ) state_debug_checks_out   = state_debug_checks