code cleanup; fix bad comment

peverwhee · Oct 3, 2024 · 33b6ffb · 33b6ffb
1 parent 8abd7cf
commit 33b6ffb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/bld/namelist_files/use_cases/sd_waccm_sulfur.xml b/bld/namelist_files/use_cases/sd_waccm_sulfur.xml
@@ -133,7 +133,7 @@
 <met_data_path>atm/cam/met/GEOS5</met_data_path>
 <met_filenames_list>atm/cam/met/GEOS5_filenames_list_c120516.txt</met_filenames_list>
 
-<!-- bnd_topo --->
+<!-- bnd_topo -->
 <bnd_topo>atm/cam/met/USGS-gtopo30_1.9x2.5_phys_geos5_c100929.nc</bnd_topo>
 
 <!-- sim_year used for CLM datasets and SSTs forcings -->

diff --git a/src/control/cam_history.F90 b/src/control/cam_history.F90
@@ -2885,18 +2885,8 @@ subroutine fldlst ()
             tape(t)%hlist(ffld+1) = tmp
 
           else if (tape(t)%hlist(ffld)%field%name == tape(t)%hlist(ffld+1)%field%name) then
-            if (tape(t)%hlist(ffld)%avgflag == tape(t)%hlist(ffld+1)%avgflag) then
-              write(errormsg,'(2a,2(a,i3),2a)') &
-                   'FLDLST: Duplicate field with the same averaging flag. Check your fincl list: ', &
-                   trim(tape(t)%hlist(ffld)%field%name),', tape = ', t, ', ffld = ', ffld, &
-                   ', flag = ', trim(tape(t)%hlist(ffld)%avgflag)
-            else
-              write(errormsg,'(2a,2(a,i3),4a)') &
-                   'FLDLST: Duplicate field with different averaging flags. Place on separate tapes: ', &
-                   trim(tape(t)%hlist(ffld)%field%name),', tape = ', t, ', ffld = ', ffld, &
-                   ', flag1 = ', trim(tape(t)%hlist(ffld)%avgflag), ', flag2 = ', &
-                   trim(tape(t)%hlist(ffld+1)%avgflag)
-            end if
+            write(errormsg,'(2a,2(a,i3))') 'FLDLST: Duplicate field: ', &
+                 trim(tape(t)%hlist(ffld)%field%name),', tape = ', t, ', ffld = ', ffld
             call endrun(errormsg)
 
           end if