Skip to content
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

Bug fixes and data_override logic updates #16

Merged
merged 3 commits into from
Mar 31, 2022
Merged

Bug fixes and data_override logic updates #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38b56cc
fix variable initialization bug in SHiELD version
bensonr Mar 10, 2022
60426ef
update fortan modules, add call to data_override_init, set calendar d…
bensonr Mar 10, 2022
f89775c
revert data_override add by commenting it out
bensonr Mar 10, 2022
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 SHiELD/atmos_model.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,13 +621,13 @@ subroutine update_atmos_model_state (Atmos)
call get_time (Atmos%Time - diag_time, isec)
call get_time (Atmos%Time - Atmos%Time_init, seconds)

time_int = real(isec)
if (ANY(nint(fdiag(:)*3600.0) == seconds) .or. (fdiag_fix .and. mod(seconds, nint(fdiag(1)*3600.0)) .eq. 0) .or. (IPD_Control%kdt == 1 .and. first_time_step) ) then
if (mpp_pe() == mpp_root_pe()) write(6,*) "---isec,seconds",isec,seconds
if (mpp_pe() == mpp_root_pe()) write(6,*) ' gfs diags time since last bucket empty: ',time_int/3600.,'hrs'
call atmosphere_nggps_diag(Atmos%Time)
endif
if (ANY(nint(fdiag(:)*3600.0) == seconds) .or. (fdiag_fix .and. mod(seconds, nint(fdiag(1)*3600.0)) .eq. 0) .or. first_time_step) then
time_int = real(isec)
if(Atmos%iau_offset > zero) then
if( time_int - Atmos%iau_offset*3600. > zero ) then
time_int = time_int - Atmos%iau_offset*3600.
Expand Down
68 changes: 25 additions & 43 deletions solo/atmos_model.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,31 +25,12 @@ program atmos_model
!
!-----------------------------------------------------------------------

use fms_affinity_mod, only: fms_affinity_set
use mpp_mod, only: input_nml_file
use atmosphere_mod, only: atmosphere_init, atmosphere_end, atmosphere, atmosphere_domain
use time_manager_mod, only: time_type, set_time, get_time, &
operator(+), operator (<), operator (>), &
operator (/=), operator (/), operator (*), &
set_calendar_type, set_date, get_date, days_in_year, days_in_month, &
NO_CALENDAR, THIRTY_DAY_MONTHS, NOLEAP, JULIAN, GREGORIAN, INVALID_CALENDAR
use fms_mod, only: check_nml_error, &
error_mesg, FATAL, WARNING, &
mpp_pe, mpp_root_pe, fms_init, fms_end, &
stdlog, stdout, write_version_number, &
lowercase, &
mpp_clock_id, mpp_clock_begin, &
mpp_clock_end, CLOCK_COMPONENT
use fms_io_mod, only: fms_io_exit
use fms2_io_mod, only: file_exists, ascii_read
use mpp_mod, only: mpp_set_current_pelist
use mpp_domains_mod, only: domain2d
use diag_manager_mod, only: diag_manager_init, diag_manager_end, get_base_date

use field_manager_mod, only: MODEL_ATMOS
use tracer_manager_mod, only: register_tracers
use memutils_mod, only: print_memuse_stats
use constants_mod, only: SECONDS_PER_HOUR, SECONDS_PER_MINUTE
use FMS
use FMSconstants
use atmosphere_mod, only: atmosphere_init, atmosphere_end, atmosphere, atmosphere_domain

!--- FMS old io
use fms_io_mod, only: fms_io_exit!< This can't be removed until fms_io is not used at all

implicit none

Expand Down Expand Up @@ -82,11 +63,9 @@ program atmos_model
!-----------------------------------------------------------------------
type(domain2d), save :: atmos_domain ! This variable must be treated as read-only
!-----------------------------------------------------------------------
character(len=17) :: calendar = ' ' !< The calendar type used by the current integration. Valid values are
character(len=17) :: calendar = 'no_calendar ' !< The calendar type used by the current integration. Valid values are
!! consistent with the time_manager module: 'gregorian', 'julian',
!! 'noleap', or 'thirty_day'. The value 'no_calendar' cannot be used
!! because the time_manager's date !! functions are used.
!! All values must be lower case.
!! 'noleap', or 'thirty_day'. All values must be lower case.
integer, dimension(4) :: current_time = (/ 0, 0, 0, 0/) !< The current time integration starts with (DD,HH,MM,SS)
integer :: years=0 !< Number of years the current integration will be run
integer :: months=0 !< Number of months the current integration will be run
Expand Down Expand Up @@ -312,24 +291,27 @@ subroutine atmos_model_init
!-----------------------------------------------------------------------
!------ initialize atmospheric model ------

!$ call omp_set_num_threads(atmos_nthreads)
call fms_affinity_set('Atmos Program', use_hyper_thread, atmos_nthreads)
if (mpp_pe() .eq. mpp_root_pe()) then
stdout_unit=stdout()
write(stdout_unit,*) ' starting ',atmos_nthreads,' OpenMP threads per MPI-task'
call flush(stdout_unit)
endif
!$ call omp_set_num_threads(atmos_nthreads)
call fms_affinity_set('Atmos Program', use_hyper_thread, atmos_nthreads)
if (mpp_pe() .eq. mpp_root_pe()) then
stdout_unit=stdout()
write(stdout_unit,*) ' starting ',atmos_nthreads,' OpenMP threads per MPI-task'
call flush(stdout_unit)
endif

call atmosphere_init (Time_init, Time, Time_step_atmos)
call atmosphere_domain(atmos_domain)
call atmosphere_init (Time_init, Time, Time_step_atmos)
call atmosphere_domain(atmos_domain)

!----- add back in if needed -----
!call data_override_init(Atm_domain_in = atmos_domain)

!-----------------------------------------------------------------------
! open and close dummy file in restart dir to check if dir exists
call mpp_set_current_pelist()
if ( mpp_pe().EQ.mpp_root_pe() ) then
open(newunit = ascii_unit, file='RESTART/file', status='replace', form='formatted')
close(ascii_unit,status="delete")
endif
call mpp_set_current_pelist()
if ( mpp_pe().EQ.mpp_root_pe() ) then
open(newunit = ascii_unit, file='RESTART/file', status='replace', form='formatted')
close(ascii_unit,status="delete")
endif

! ---- terminate timing ----
call mpp_clock_end (id_init)
Expand Down