Skip to content

Bug fix for reading namelist section atmos_model_nml for nests #263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
junwang-noaa merged 7 commits into from
Apr 12, 2021
Merged

Bug fix for reading namelist section atmos_model_nml for nests #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6470343
Update .gitmodules and submodule pointer for GFDL_atmos_cubed_sphere …
climbfuji Mar 27, 2021
91d5a20
atmos_model.F90: move reading of namelist section atmos_model_nml to …
climbfuji Mar 27, 2021
67549b0
Update submodule pointer for GFDL_atmos_cubed_sphere
climbfuji Mar 29, 2021
5930832
Revert ccpp-framework change in .gitmodules, update submodule pointer…
climbfuji Mar 31, 2021
1401beb
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into bug…
climbfuji Mar 31, 2021
c678d4a
Update submodule pointer for GFDL_atmos_cubed_sphere and revert chang…
climbfuji Apr 9, 2021
8f42953
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into bug…
climbfuji Apr 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion atmos_cubed_sphere
Open in desktop
Submodule atmos_cubed_sphere updated 1 files
+37 −0 driver/fvGFS/atmosphere.F90
37 changes: 19 additions & 18 deletions atmos_model.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,24 +416,6 @@ subroutine atmos_model_init (Atmos, Time_init, Time, Time_step)

logunit = stdlog()

!-----------------------------------------------------------------------
! initialize atmospheric model -----

IF ( file_exist('input.nml')) THEN
#ifdef INTERNAL_FILE_NML
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

!---------- initialize atmospheric dynamics after reading the namelist -------
!---------- (need name of CCPP suite definition file from input.nml) ---------
call atmosphere_init (Atmos%Time_init, Atmos%Time, Atmos%Time_step,&
Expand All @@ -453,6 +435,25 @@ subroutine atmos_model_init (Atmos, Time_init, Time, Time_step)

Atmos%mlon = mlon
Atmos%mlat = mlat

!----------------------------------------------------------------------------------------------
! initialize atmospheric model - must happen AFTER atmosphere_init so that nests work correctly

IF ( file_exist('input.nml')) THEN
#ifdef INTERNAL_FILE_NML
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

!-----------------------------------------------------------------------
!--- before going any further check definitions for 'blocks'
!-----------------------------------------------------------------------
Expand Down