Merge branch 'fv3_fmsupdate' of https://github.com/junwang-noaa/fv3atm …

…into ccpp_metadata_bugfixes_gfs_typedefs
NOAA-EMC · Sep 2, 2021 · e6ca387 · e6ca387
2 parents 02db64b + cd49ce3
commit e6ca387
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 25 deletions.
diff --git a/atmos_model.F90 b/atmos_model.F90
@@ -47,12 +47,8 @@ module atmos_model_mod
 use mpp_mod,            only: FATAL, mpp_min, mpp_max, mpp_error, mpp_chksum
 use mpp_domains_mod,    only: domain2d
 use mpp_mod,            only: mpp_get_current_pelist_name
-#ifdef INTERNAL_FILE_NML
 use mpp_mod,            only: input_nml_file
-#else
-use fms_mod,            only: open_namelist_file
-#endif
-use fms_mod,            only: file_exist, error_mesg
+use fms2_io_mod,        only: file_exists
 use fms_mod,            only: close_file, write_version_number, stdlog, stdout
 use fms_mod,            only: clock_flag_default
 use fms_mod,            only: check_nml_error
@@ -551,19 +547,9 @@ subroutine atmos_model_init (Atmos, Time_init, Time, Time_step)
 !----------------------------------------------------------------------------------------------
 ! initialize atmospheric model - must happen AFTER atmosphere_init so that nests work correctly
 
-   IF ( file_exist('input.nml')) THEN
-#ifdef INTERNAL_FILE_NML
+   IF ( file_exists('input.nml')) THEN
       read(input_nml_file, nml=atmos_model_nml, iostat=io)
       ierr = check_nml_error(io, 'atmos_model_nml')
-#else
-      unit = open_namelist_file ( )
-      ierr=1
-      do while (ierr /= 0)
-         read  (unit, nml=atmos_model_nml, iostat=io, end=10)
-         ierr = check_nml_error(io,'atmos_model_nml')
-      enddo
- 10     call close_file (unit)
-#endif
    endif
 
 !-----------------------------------------------------------------------

diff --git a/module_fcst_grid_comp.F90 b/module_fcst_grid_comp.F90
@@ -24,7 +24,7 @@ module module_fcst_grid_comp
   use esmf
 
   use time_manager_mod,   only: time_type, set_calendar_type, set_time,    &
-                                set_date, days_in_month, month_name,       &
+                                set_date, month_name,                      &
                                 operator(+), operator(-), operator (<),    &
                                 operator (>), operator (/=), operator (/), &
                                 operator (==), operator (*),               &
@@ -43,22 +43,20 @@ module module_fcst_grid_comp
                                 addLsmask2grid
 
   use constants_mod,      only: constants_init
-  use fms_mod,            only: open_namelist_file, file_exist, check_nml_error, &
-                                error_mesg, fms_init, fms_end, close_file,       &
+  use fms_mod,            only: error_mesg, fms_init, fms_end,             &
                                 write_version_number, uppercase
 
   use mpp_mod,            only: mpp_init, mpp_pe, mpp_root_pe,  &
                                 mpp_error, FATAL, WARNING
-  use mpp_mod,            only: mpp_clock_id, mpp_clock_begin, mpp_clock_end
+  use mpp_mod,            only: mpp_clock_id, mpp_clock_begin
 
-  use mpp_io_mod,         only: mpp_open, mpp_close, MPP_NATIVE, MPP_RDONLY, MPP_DELETE
+  use mpp_io_mod,         only: mpp_open, mpp_close, MPP_DELETE
 
   use mpp_domains_mod,    only: mpp_get_compute_domains, domain2D 
-  use memutils_mod,       only: print_memuse_stats
   use sat_vapor_pres_mod, only: sat_vapor_pres_init
 
   use diag_manager_mod,   only: diag_manager_init, diag_manager_end, &
-                                get_base_date, diag_manager_set_time_end
+                                diag_manager_set_time_end
 
   use data_override_mod,  only: data_override_init
   use fv_nggps_diags_mod, only: fv_dyn_bundle_setup
@@ -873,8 +871,6 @@ subroutine fcst_run_phase_2(fcst_comp, importState, exportState,clock,rc)
           endif
         endif
       endif
-!
-      call print_memuse_stats('after full step')
 !
 !-----------------------------------------------------------------------
 !