Code cleanup

components/cam/bld/namelist_files/namelist_definition.xml

@@ -5033,19 +5033,6 @@ by <varname>prescribed_cloud_datapath</varname>.
 Default: None, do not prescribe clouds by default.
 </entry>
 
-<entry id="prescribed_cloud_name" type="char*16" category="cam_chem"
-       group="prescribed_cloud_nl" valid_values="" >
-Name of variable containing cloud data in the prescribed cloud datasets.
-Default: 'cloud'
-</entry>
-
-<entry id="prescribed_cloud_rmfile" type="logical" category="cam_chem"
-       group="prescribed_cloud_nl" valid_values="" >
-Remove the file containing prescribed cloud concentrations from local disk when
-no longer needed.
-Default: FALSE
-</entry>
-
 <entry id="prescribed_cloud_type" type="char*32" category="cam_chem"
        group="prescribed_cloud_nl"
        valid_values="CYCLICAL,SERIAL,INTERP_MISSING_MONTHS,FIXED" >
@@ -5054,30 +5041,6 @@ Can be set to 'CYCLICAL', 'SERIAL', 'INTERP_MISSING_MONTHS', or 'FIXED'.
 Default: 'SERIAL'
 </entry>
 
-<entry id="prescribed_cloud_cycle_yr" type="integer" category="cam_chem"
-       group="prescribed_cloud_nl" valid_values="" >
-The cycle year of the prescribed cloud data
-if <varname>prescribed_cloud_type</varname>  is 'CYCLICAL'.
-Format: YYYY
-Default: 0
-</entry>
-
-<entry id="prescribed_cloud_fixed_ymd" type="integer" category="cam_chem"
-       group="prescribed_cloud_nl" valid_values="" >
-The date at which the prescribed cloud data is fixed
-if <varname>prescribed_cloud_type</varname> is 'FIXED'.
-Format: YYYYMMDD
-Default: 0
-</entry>
-
-<entry id="prescribed_cloud_fixed_tod" type="integer" category="cam_chem"
-       group="prescribed_cloud_nl" valid_values="" >
-The time of day (seconds) corresponding to <varname>prescribed_cloud_fixed_ymd</varname>
-at which the prescribed cloud data is fixed
-if <varname>prescribed_cloud_type</varname> is 'FIXED'.
-Default: 0 seconds
-</entry>
-
 <entry id="prescribed_cloud_num_file_years" type="real" category="cam_chem"
        group="prescribed_cloud_nl" valid_values="" >
 The number of years in the prescribed cloud data file
@@ -5101,15 +5064,6 @@ Filename of dataset for prescribed surface fluxes.
 Default: None, do not prescribe surface fluxes by default.
 </entry>
 
-<entry id="presc_sfc_flux_filelist" type="char*256"
-       input_pathname="rel:presc_sfc_flux_datapath" category="cam_chem"
-       group="presc_sfc_flux_nl" valid_values="" >
-Filename of file that contains a sequence of filenames for prescribed
-surface fluxes.  The filenames in this file are relative to the directory 
-specified by <varname>presc_sfc_flux_datapath</varname>.
-Default: None, do not prescribe surface fluxes by default.
-</entry>
-
 <entry id="presc_sfc_flux_type" type="char*32" category="cam_chem"
        group="presc_sfc_flux_nl"
        valid_values="CYCLICAL,SERIAL,INTERP_MISSING_MONTHS,FIXED" >
@@ -5118,30 +5072,6 @@ Can be set to 'CYCLICAL', 'SERIAL', 'INTERP_MISSING_MONTHS', or 'FIXED'.
 Default: 'SERIAL'
 </entry>
 
-<entry id="presc_sfc_flux_cycle_yr" type="integer" category="cam_chem"
-       group="presc_sfc_flux_nl" valid_values="" >
-The cycle year of the prescribed sfc flux data
-if <varname>presc_sfc_flux_type</varname>  is 'CYCLICAL'.
-Format: YYYY
-Default: 0
-</entry>
-
-<entry id="presc_sfc_flux_fixed_ymd" type="integer" category="cam_chem"
-       group="presc_sfc_flux_nl" valid_values="" >
-The date at which the prescribed sfc flux data is fixed
-if <varname>presc_sfc_flux_type</varname> is 'FIXED'.
-Format: YYYYMMDD
-Default: 0
-</entry>
-
-<entry id="presc_sfc_flux_fixed_tod" type="integer" category="cam_chem"
-       group="presc_sfc_flux_nl" valid_values="" >
-The time of day (seconds) corresponding to <varname>presc_sfc_flux_fixed_ymd</varname>
-at which the prescribed sfc flux data is fixed
-if <varname>presc_sfc_flux_type</varname> is 'FIXED'.
-Default: 0 seconds
-</entry>
-
 <entry id="presc_sfc_flux_num_file_years" type="real" category="cam_chem"
        group="presc_sfc_flux_nl" valid_values="" >
 The number of years in the prescribed surface flux data file

components/cam/src/chemistry/utils/input_data_utils.F90

@@ -520,13 +520,9 @@ subroutine set_wghts_indices_cyclical(obj)
        else
           if (i .ge. obj%ntimes) then
              !BEH: we don't want to error out, but we want to break the loop.
-!BEH             errmsg = 'input_data_utils::set_wghts_indices cannot not find model time in: '&
-!BEH                    // trim(obj%filename)
-!BEH             write(iulog,*) trim(errmsg)
-!BEH             call endrun(trim(errmsg))
              index        = obj%ntimes
              obj%indxs(1) = obj%ntimes
-             obj%indxs(2) = 1            !BEH IS THIS CORRECT????
+             obj%indxs(2) = 1         
              exit findtimes
           endif
           datatm = obj%times(i)
@@ -586,12 +582,14 @@ subroutine set_wghts_indices_cyclical(obj)
        obj%wghts(1) = 1._r8
        obj%wghts(2) = 0._r8       
     endif
-    if (masterproc) then
-       write(iulog,*) 'The weights, and times, and indexes are '
-       write(iulog,*) obj%wghts(1), obj%wghts(2), model_time, &
-            obj%times(obj%indxs(1)), obj%times(obj%indxs(2)), &
-            obj%indxs(1), obj%indxs(2), model_time_temp, offset_time
-    endif
+    !++BEH -- uncomment for debugging this routine
+    !if (masterproc) then
+    !   write(iulog,*) 'The weights, and times, and indexes are '
+    !   write(iulog,*) obj%wghts(1), obj%wghts(2), model_time, &
+    !        obj%times(obj%indxs(1)), obj%times(obj%indxs(2)), &
+    !        obj%indxs(1), obj%indxs(2), model_time_temp, offset_time
+    !endif
+    !--BEH
   end subroutine set_wghts_indices_cyclical
 !--BEH