Merge branch 'dev/cefi' into bug/internal_heat

NOAA-CEFI-Regional-Ocean-Modeling · Jul 19, 2024 · de7901c · de7901c
2 parents 662d4dd + ace8956
commit de7901c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/generic_tracers/cobalt_param_doc.F90 b/generic_tracers/cobalt_param_doc.F90
@@ -80,6 +80,8 @@ subroutine get_COBALT_param_file(param_file)
         valid_param_files = valid_param_files + 1
      endif
    enddo
+   if (valid_param_files == 0) call MOM_error(FATAL, "There must be at "//&
+      "least 1 valid entry in parameter_filename in cobalt_input_nml in input.nml.")
 
 end subroutine get_COBALT_param_file
 

diff --git a/generic_tracers/generic_COBALT.F90 b/generic_tracers/generic_COBALT.F90
@@ -136,9 +136,6 @@ module generic_COBALT
   use data_override_mod, only: data_override
   use fms_mod,           only: write_version_number, FATAL, WARNING, stdout, stdlog,mpp_pe,mpp_root_pe
   use fms_mod,           only: check_nml_error
-#ifndef INTERNAL_FILE_NML
-  use fms_mod,           only: open_namelist_file, close_file
-#endif
   use MOM_EOS,           only: calculate_density, EOS_type
 
   use g_tracer_utils, only : g_tracer_type,g_tracer_start_param_list,g_tracer_end_param_list
@@ -247,15 +244,8 @@ subroutine generic_COBALT_register(tracer_list)
     !
     stdoutunit=stdout();stdlogunit=stdlog()
 
-#ifdef INTERNAL_FILE_NML
     read (input_nml_file, nml=generic_COBALT_nml, iostat=io_status)
     ierr = check_nml_error(io_status,'generic_COBALT_nml')
-#else
-    ioun = open_namelist_file()
-    read  (ioun, generic_COBALT_nml,iostat=io_status)
-    ierr = check_nml_error(io_status,'generic_COBALT_nml')
-    call close_file (ioun)
-#endif
 
     write (stdoutunit,'(/)')
     write (stdoutunit, generic_COBALT_nml)