From 2f8378c25c07842c29942562288f1e81492fa2d8 Mon Sep 17 00:00:00 2001 From: Lauren Chilutti Date: Thu, 28 Oct 2021 09:19:01 -0400 Subject: [PATCH 1/4] Update call to read_input_nml and remove unnecessary code. --- model/fv_control.F90 | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/model/fv_control.F90 b/model/fv_control.F90 index 9fed20fcc..439b642ea 100644 --- a/model/fv_control.F90 +++ b/model/fv_control.F90 @@ -439,17 +439,7 @@ subroutine fv_control_init(Atm, dt_atmos, this_grid, grids_on_this_pe, p_split) call set_namelist_pointers(Atm(this_grid)) call fv_diag_init_gn(Atm(this_grid)) -#ifdef INTERNAL_FILE_NML - if (this_grid .gt. 1) then - write(Atm(this_grid)%nml_filename,'(A4, I2.2)') 'nest', this_grid - if (.not. file_exists('input_'//trim(Atm(this_grid)%nml_filename)//'.nml')) then - call mpp_error(FATAL, "Could not find nested grid namelist "//'input_'//trim(Atm(this_grid)%nml_filename)//'.nml') - endif - else - Atm(this_grid)%nml_filename = '' - endif - call read_input_nml(Atm(this_grid)%nml_filename) !re-reads into internal namelist -#endif + call read_input_nml(alt_input_nml_path=Atm(this_grid)%nml_filename) !re-reads into internal namelist call read_namelist_fv_grid_nml call read_namelist_fv_core_nml(Atm(this_grid)) ! do options processing here too? call read_namelist_test_case_nml(Atm(this_grid)%nml_filename) From 2d7650a0e66045ae00da2a6b9820074d621b63e3 Mon Sep 17 00:00:00 2001 From: Lauren Chilutti Date: Thu, 28 Oct 2021 10:14:58 -0400 Subject: [PATCH 2/4] Removing use of INTERNAL_FILE_NML and cleaning up read_namelist_test_cases to remove unused argument --- driver/SHiELD/cloud_diagnosis.F90 | 13 ------------- driver/SHiELD/gfdl_cloud_microphys.F90 | 13 ------------- model/fv_control.F90 | 2 +- model/gfdl_mp.F90 | 13 ------------- tools/fv_diagnostics.F90 | 13 ------------- tools/test_cases.F90 | 3 +-- 6 files changed, 2 insertions(+), 55 deletions(-) diff --git a/driver/SHiELD/cloud_diagnosis.F90 b/driver/SHiELD/cloud_diagnosis.F90 index 5b284f87e..6c8943cfe 100644 --- a/driver/SHiELD/cloud_diagnosis.F90 +++ b/driver/SHiELD/cloud_diagnosis.F90 @@ -518,20 +518,7 @@ subroutine cloud_diagnosis_init (nlunit, input_nml_file, logunit, fn_nml) integer :: ios logical :: exists -#ifdef INTERNAL_FILE_NML read (input_nml_file, nml = cloud_diagnosis_nml, iostat = ios) -#else - inquire (file = trim (fn_nml), exist = exists) - if (.not. exists) then - write (6, *) 'cloud_diagnosis :: namelist file: ', trim (fn_nml), ' does not exist' - stop - else - open (unit = nlunit, file = fn_nml, readonly, status = 'old', iostat = ios) - endif - rewind (nlunit) - read (nlunit, nml = cloud_diagnosis_nml) - close (nlunit) -#endif end subroutine cloud_diagnosis_init diff --git a/driver/SHiELD/gfdl_cloud_microphys.F90 b/driver/SHiELD/gfdl_cloud_microphys.F90 index 3dd6c40cd..85d967af3 100644 --- a/driver/SHiELD/gfdl_cloud_microphys.F90 +++ b/driver/SHiELD/gfdl_cloud_microphys.F90 @@ -3366,20 +3366,7 @@ subroutine gfdl_cloud_microphys_init (me, master, nlunit, input_nml_file, loguni ! master = (mpp_pe () .eq.mpp_root_pe ()) -#ifdef INTERNAL_FILE_NML read (input_nml_file, nml = gfdl_cloud_microphysics_nml, iostat = ios) -#else - inquire (file = trim (fn_nml), exist = exists) - if (.not. exists) then - write (6, *) 'gfdl - mp :: namelist file: ', trim (fn_nml), ' does not exist' - call mpp_error (fatal, 'gfdl - mp :: namelist file: ' // trim (fn_nml) // ' does not exist') - else - open (unit = nlunit, file = fn_nml, readonly, status = 'old', iostat = ios) - endif - rewind (nlunit) - read (nlunit, nml = gfdl_cloud_microphysics_nml, iostat = ios) - close (nlunit) -#endif ! write version number and namelist to log file if (me == master) then diff --git a/model/fv_control.F90 b/model/fv_control.F90 index 439b642ea..db9b165e2 100644 --- a/model/fv_control.F90 +++ b/model/fv_control.F90 @@ -442,7 +442,7 @@ subroutine fv_control_init(Atm, dt_atmos, this_grid, grids_on_this_pe, p_split) call read_input_nml(alt_input_nml_path=Atm(this_grid)%nml_filename) !re-reads into internal namelist call read_namelist_fv_grid_nml call read_namelist_fv_core_nml(Atm(this_grid)) ! do options processing here too? - call read_namelist_test_case_nml(Atm(this_grid)%nml_filename) + call read_namelist_test_case_nml !TODO test_case_nml moved to test_cases call mpp_get_current_pelist(Atm(this_grid)%pelist, commID=commID) ! for commID call mp_start(commID,halo_update_type) diff --git a/model/gfdl_mp.F90 b/model/gfdl_mp.F90 index 7c22f1321..363f7e4d1 100644 --- a/model/gfdl_mp.F90 +++ b/model/gfdl_mp.F90 @@ -3090,20 +3090,7 @@ subroutine gfdl_mp_init (me, master, nlunit, input_nml_file, logunit, fn_nml) ! call write_version_number ('gfdl_mp_mod', version) ! logunit = stdlog () -#ifdef INTERNAL_FILE_NML read (input_nml_file, nml = gfdl_mp_nml) -#else - inquire (file = trim (fn_nml), exist = exists) - if (.not. exists) then - write (6, *) 'gfdl - mp :: namelist file: ', trim (fn_nml), ' does not exist' - stop - else - open (unit = nlunit, file = fn_nml, readonly, status = 'old', iostat = ios) - endif - rewind (nlunit) - read (nlunit, nml = gfdl_mp_nml) - close (nlunit) -#endif ! write version number and namelist to log file diff --git a/tools/fv_diagnostics.F90 b/tools/fv_diagnostics.F90 index 26abc1a75..d6c532340 100644 --- a/tools/fv_diagnostics.F90 +++ b/tools/fv_diagnostics.F90 @@ -332,20 +332,7 @@ subroutine fv_diag_init(Atm, axes, Time, npx, npy, npz, p_ref) #endif levs_ave = 0 levs_ave(1:4) = (/50,400,850,1000/) -#ifdef INTERNAL_FILE_NML read(input_nml_file, nml=fv_diag_plevs_nml,iostat=ios) -#else - inquire (file=trim(Atm(n)%nml_filename), exist=exists) - if (.not. exists) then - write(errmsg,*) 'fv_diag_plevs_nml: namelist file ',trim(Atm(n)%nml_filename),' does not exist' - call mpp_error(FATAL, errmsg) - else - open (unit=nlunit, file=Atm(n)%nml_filename, READONLY, status='OLD', iostat=ios) - endif - rewind(nlunit) - read (nlunit, nml=fv_diag_plevs_nml, iostat=ios) - close (nlunit) -#endif if (nplev > MAX_PLEVS) then if (is_master()) then print*, ' fv_diagnostics: nplev = ', nplev, ' is too large' diff --git a/tools/test_cases.F90 b/tools/test_cases.F90 index d61d558e1..21dc24154 100644 --- a/tools/test_cases.F90 +++ b/tools/test_cases.F90 @@ -5219,9 +5219,8 @@ subroutine init_double_periodic(u,v,w,pt,delp,q,phis, ps,pe,peln,pk,pkz, uc,vc, end subroutine init_double_periodic - subroutine read_namelist_test_case_nml(nml_filename) + subroutine read_namelist_test_case_nml() - character(*), intent(IN) :: nml_filename integer :: ierr, f_unit, unit, ios namelist /test_case_nml/test_case, bubble_do, alpha, nsolitons, soliton_Umax, soliton_size From 73f949e00eb92c52661befdfc11bfd38d00619de Mon Sep 17 00:00:00 2001 From: Lauren Chilutti Date: Mon, 1 Aug 2022 13:11:11 -0400 Subject: [PATCH 3/4] deleting duplicate call to read_namelist_test_case_nml in fv_control --- model/fv_control.F90 | 1 - 1 file changed, 1 deletion(-) diff --git a/model/fv_control.F90 b/model/fv_control.F90 index 8f1d91cc6..0c2f7ee8e 100644 --- a/model/fv_control.F90 +++ b/model/fv_control.F90 @@ -448,7 +448,6 @@ subroutine fv_control_init(Atm, dt_atmos, this_grid, grids_on_this_pe, p_split) call read_input_nml(alt_input_nml_path=Atm(this_grid)%nml_filename) !re-reads into internal namelist call read_namelist_fv_grid_nml call read_namelist_fv_core_nml(Atm(this_grid)) ! do options processing here too? - call read_namelist_test_case_nml !TODO test_case_nml moved to test_cases call read_namelist_test_case_nml call mpp_get_current_pelist(Atm(this_grid)%pelist, commID=commID) ! for commID From d18cf90e7125956da17c8bc45057fb741fa7597b Mon Sep 17 00:00:00 2001 From: Lauren Chilutti Date: Mon, 1 Aug 2022 15:12:27 -0400 Subject: [PATCH 4/4] removing commented code in fv_control --- model/fv_control.F90 | 3 --- 1 file changed, 3 deletions(-) diff --git a/model/fv_control.F90 b/model/fv_control.F90 index 0c2f7ee8e..2f2563226 100644 --- a/model/fv_control.F90 +++ b/model/fv_control.F90 @@ -54,7 +54,6 @@ module fv_control_mod use fv_mp_mod, only: mp_start, domain_decomp, mp_assign_gid, global_nest_domain use fv_mp_mod, only: broadcast_domains, mp_barrier, is_master, setup_master, grids_master_procs, tile_fine use fv_mp_mod, only: MAX_NNEST, MAX_NTILE - !use test_cases_mod, only: test_case, bubble_do, alpha, nsolitons, soliton_Umax, soliton_size use test_cases_mod, only: read_namelist_test_case_nml use fv_timing_mod, only: timing_on, timing_off, timing_init, timing_prt use mpp_domains_mod, only: domain2D @@ -448,7 +447,6 @@ subroutine fv_control_init(Atm, dt_atmos, this_grid, grids_on_this_pe, p_split) call read_input_nml(alt_input_nml_path=Atm(this_grid)%nml_filename) !re-reads into internal namelist call read_namelist_fv_grid_nml call read_namelist_fv_core_nml(Atm(this_grid)) ! do options processing here too? - !TODO test_case_nml moved to test_cases call read_namelist_test_case_nml call mpp_get_current_pelist(Atm(this_grid)%pelist, commID=commID) ! for commID call mp_start(commID,halo_update_type) @@ -1039,7 +1037,6 @@ subroutine read_namelist_fv_core_nml(Atm) 198 format(A,i2.2,A,i4.4,'x',i4.4,'x',i1.1,'-',f9.3) 199 format(A,i3.3) - !if (.not. (nested .or. regional)) alpha = alpha*pi !TODO for test_case_nml !allocate(Atm%neststruct%child_grids(size(Atm))) !TODO want to remove !Atm(N)%neststruct%child_grids = .false.