Update call to read_input_nml and remove unnecessary code. #161

laurenchilutti · 2021-10-28T13:30:42Z

Description

When reviewing PR #136 Rusty and I determined that we should call read_input_nml with the specifier "alt_input_nml_path" and use the full filename when reading an input namelist. I removed a section of code that would define Atm(this_grid)%nml_filename as nest.## (e.g. nest.02). Lines 380 - 388 (see code snippet below) are sufficient at defining Atm%nml_filename with the full filename that I now pass to the FMS function read_input_nml

GFDL_atmos_cubed_sphere/model/fv_control.F90

Lines 380 to 388 in a3ac973

    
              if (n > 1) then 
        
                 Atm(n)%nml_filename = 'input_'//trim(pe_list_name)//'.nml' 
        
              else 
        
                 Atm(n)%nml_filename = 'input.nml' 
        
              endif 
        
              if (.not. file_exists(Atm(n)%nml_filename)) then 
        
                 call mpp_error(FATAL, "Could not find nested grid namelist "//Atm(n)%nml_filename) 
        
              endif 
        
           enddo

I also have removed an unused input argument in test_cases.F90 read_namelist_test_cases and removed any use of #ifdef INTERNAL_FILE_NML as all models need to use INTERNAL_FILE_NML and we no longer need a conditional statement for this.

Fixes # (issue)

How Has This Been Tested?

Tested with SHiELD with a C48n4, Regional 3KM and C48 no nests tests. Answers reproduced.

Checklist:

Please check all whether they apply or not

My code follows the style guidelines of this project
I have performed a self-review of my own code
I have commented my code, particularly in hard-to-understand areas
I have made corresponding changes to the documentation
My changes generate no new warnings
Any dependent changes have been merged and published in downstream modules

bensonr · 2021-10-28T13:59:11Z

@laurenchilutti - did you look throughout the code to see how Atm%nml_filename is being used in other places? In particular, fv_diagnostics.F90 still has the #ifdef in it.

bensonr · 2021-10-28T14:02:43Z

@laurenchilutti - I meant fv_diagnostics and have amended my original comment. Also, the code no longer needs to pass the Atm%nml_filename argument read_namelist_test_cases and it can be removed in the subroutine and the call.

…cases to remove unused argument

laurenchilutti · 2021-10-28T14:15:14Z

@bensonr I see what you are saying. I have done a review of the code for any use of #ifdef INTERNAL_FILE_NML and removed those instances as we have discussed that they should be removed. Now that I have done that, I have confirmed that Atm%nml_filename is only used in fv_control to read_input_nml.

bensonr · 2021-10-28T14:27:42Z

@laurenchilutti - have you rerun the tests cases with these latest updates?

bensonr · 2021-10-28T14:29:36Z

@linjiongzhou - can you look over the changes in namelist handling to gfdl_cloud_microphys.F90.

model/fv_control.F90

laurenchilutti · 2021-10-28T14:39:43Z

@laurenchilutti - have you rerun the tests cases with these latest updates?

Yes I have.

laurenchilutti · 2022-08-01T17:01:34Z

I have merged the main branch into this and this is now ready to be merged once reviewed. I have tested with some SHiELD test cases and answers reproduce.

model/fv_control.F90

laurenchilutti · 2022-09-16T14:53:29Z

@lharris4 @linjiongzhou I would like to merge this PR in prior to making our next release. Could you please review this? Thank you!

lharris4

This is a welcome update. Thanks.

linjiongzhou

They look good to me. Thank you!

* updated fv_regional_bc.F90 to read levsp from GFS_ctl file (#152) * Updating a continue statement in fv_nudge (#153) * update in fv_nudge to fix 666 label logic * fix logic errors (#138) * update to external_ic::remap_scale to skip remapping non-existent IC tracers (#159) * Fix nudge logic (#157) * fix logic errors * fix answer changes * adding back a line that was mistakenly deleted in a previous commit (#166) * Release 042022 (#184) * Merge of updates from GFDL Weather and Climate Dynamics Division (202204): *add license header to missing files and fix typo in header *updates needed for fv3_gfsphysics to have access to bounded_domain *remove obsoleted driver/SHiELD files *updating to fix bug where long_name and units attributes were not being captured in the RESTARTS *remove unused function fv_diagnostics::max_vorticity_hy1 *remove avec timer remnants *adding ability to specify prefix and directory when reading and writing restarts *remove old style namelist read in favor of read from internal character variable *Added option for a mean wind *The planetary radius and rotation rate are now re-scalable by a namelist parameter (small_earth_scale) instead of using exclusively the hard-coded FMS constant. *fv_mapz: Cleanup and added helpful annotations to avoid getting lost so easily * remove duplicate code and fix lstatus on all grids depending on gfs_data and gfs_data.tile1 * New idealized tests *Makes the non-hydrostatic restart variables optional for reads to allow hydrostatic ICs *Fix the hydrostatic TE remapping; Add GMAO cubic for TE remapping, which is used if kord_tm=0 and remap_te=.true. *Add a TE remapping option (kord_tm=0) *Addressing GNU Warnings *Add the L75 vertical config from HAFS * clean up fms_mp_mod and remove mp_bcst * cherry pick 5193c6b from dev/emc * Attempt at integrating fixes on top of dev/emc branch. (#173) * remove outdated GFDL_tools/fv_diag_column.F90 which exists as the result of an improper merge. The correct file is tools/fv_diag_column.F90 (#191) * various io fixes (#192) * fixes io performance issues by making everyone a reader when io_layout=1,1 adds capability to use FMS feature to ignore data integrity checksums in restarts * rename enforce_rst_cksum to ignore_rst_cksum and change the default value for compatibility * fix index error (#196) * New notebooks (#190) * Moving source files into source directory * Added advection notebook * Fixed subplot spacing * New 3D case notebooks * New idealized tests Updated mtn_wave_tests_1km to restore missing graphics. * first try at held-suarez * Updated H-S superrotation notebook * New level placement tool in an interactive note * Minor updates to notebooks; deleted fv_eta binary. * Regional decomposition test fix (when nrows_blend > 0) (#194) (#200) * Regional bc blend changes to extend into interior halos and overlap on corners. Still not working for u and v. dyn_core.F90 : Fix from Jun Wang to correct sync of u,v fv_regional_bc.F90 : add check for nrows_blend > tile size; fix error when nrows_blend=1 Conflicts (not taken during chery-pick): driver/SHiELD/atmosphere.F90 model/fv_sg.F90 Co-authored-by: Ted Mansell <[email protected]> * Implementing CI (#207) * CI Parallelworks update (#211) * Update call to read_input_nml and remove unnecessary code. (#161) * Removing use of INTERNAL_FILE_NML and cleaning up read_namelist_test_cases to remove unused argument * deleting duplicate call to read_namelist_test_case_nml in fv_control * removing commented code in fv_control Co-authored-by: Rusty Benson <[email protected]> Co-authored-by: menzel-gfdl <[email protected]> Co-authored-by: Rusty Benson <[email protected]> Co-authored-by: MatthewPyle-NOAA <[email protected]> Co-authored-by: lharris4 <[email protected]> Co-authored-by: Ted Mansell <[email protected]>

Update call to read_input_nml and remove unnecessary code.

2f8378c

laurenchilutti requested a review from bensonr October 28, 2021 13:30

Removing use of INTERNAL_FILE_NML and cleaning up read_namelist_test_…

2d7650a

…cases to remove unused argument

bensonr requested review from lharris4 and linjiongzhou October 28, 2021 14:28

bensonr reviewed Oct 28, 2021

View reviewed changes

model/fv_control.F90 Show resolved Hide resolved

bensonr self-requested a review November 16, 2021 14:40

Merge branch 'main' into nml_filename

ecd4b25

bensonr reviewed Aug 1, 2022

View reviewed changes

model/fv_control.F90 Outdated Show resolved Hide resolved

deleting duplicate call to read_namelist_test_case_nml in fv_control

73f949e

bensonr reviewed Aug 1, 2022

View reviewed changes

model/fv_control.F90 Outdated Show resolved Hide resolved

laurenchilutti and others added 2 commits August 1, 2022 15:12

removing commented code in fv_control

d18cf90

Merge remote-tracking branch 'noaa/main' into nml_filename

0308ead

laurenchilutti requested a review from bensonr September 16, 2022 14:53

lharris4 approved these changes Sep 16, 2022

View reviewed changes

linjiongzhou approved these changes Sep 16, 2022

View reviewed changes

bensonr approved these changes Sep 16, 2022

View reviewed changes

laurenchilutti merged commit c0747f2 into NOAA-GFDL:main Sep 16, 2022

laurenchilutti deleted the nml_filename branch December 23, 2024 14:32

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update call to read_input_nml and remove unnecessary code. #161

Update call to read_input_nml and remove unnecessary code. #161

laurenchilutti commented Oct 28, 2021 •

edited

Loading

bensonr commented Oct 28, 2021 •

edited

Loading

bensonr commented Oct 28, 2021

laurenchilutti commented Oct 28, 2021

bensonr commented Oct 28, 2021

bensonr commented Oct 28, 2021

laurenchilutti commented Oct 28, 2021

laurenchilutti commented Aug 1, 2022

laurenchilutti commented Sep 16, 2022

lharris4 left a comment

linjiongzhou left a comment

	if (n > 1) then
	Atm(n)%nml_filename = 'input_'//trim(pe_list_name)//'.nml'
	else
	Atm(n)%nml_filename = 'input.nml'
	endif
	if (.not. file_exists(Atm(n)%nml_filename)) then
	call mpp_error(FATAL, "Could not find nested grid namelist "//Atm(n)%nml_filename)
	endif
	enddo

Update call to read_input_nml and remove unnecessary code. #161

Update call to read_input_nml and remove unnecessary code. #161

Conversation

laurenchilutti commented Oct 28, 2021 • edited Loading

bensonr commented Oct 28, 2021 • edited Loading

bensonr commented Oct 28, 2021

laurenchilutti commented Oct 28, 2021

bensonr commented Oct 28, 2021

bensonr commented Oct 28, 2021

laurenchilutti commented Oct 28, 2021

laurenchilutti commented Aug 1, 2022

laurenchilutti commented Sep 16, 2022

lharris4 left a comment

Choose a reason for hiding this comment

linjiongzhou left a comment

Choose a reason for hiding this comment

laurenchilutti commented Oct 28, 2021 •

edited

Loading

bensonr commented Oct 28, 2021 •

edited

Loading