Skip to content

Commit

Permalink
Merge branch 'michalakes-patch-1' into ufs-dev-PR97
Browse files Browse the repository at this point in the history
  • Loading branch information
grantfirl committed Jan 24, 2024
2 parents 1584636 + 0140c17 commit 644be8d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions physics/GFS_rrtmg_setup.F90
Original file line number Diff line number Diff line change
Expand Up @@ -171,8 +171,6 @@ subroutine GFS_rrtmg_setup_init ( si, levr, ictm, isol, solar_file, ico2, &
! Initialize the CCPP error handling variables
errmsg = ''
errflg = 0

if (is_initialized) return

if (do_RRTMGP) then
write(errmsg,'(*(a))') "Logic error: do_RRTMGP must be set to .false."
Expand Down Expand Up @@ -213,6 +211,8 @@ subroutine GFS_rrtmg_setup_init ( si, levr, ictm, isol, solar_file, ico2, &
print *, 'lextop=',lextop, ' ltp=',ltp
endif

if (is_initialized) return

! Call initialization routines
call sol_init ( me, isol, solar_file, con_solr_2008,con_solr_2002,&
con_pi )
Expand Down
4 changes: 2 additions & 2 deletions physics/GFS_rrtmgp_setup.F90
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@ subroutine GFS_rrtmgp_setup_init(do_RRTMGP, imp_physics, imp_physics_fer_hires,
! Initialize the CCPP error handling variables
errmsg = ''
errflg = 0

if (is_initialized) return

! Consistency checks
if (.not. do_RRTMGP) then
Expand Down Expand Up @@ -125,6 +123,8 @@ subroutine GFS_rrtmgp_setup_init(do_RRTMGP, imp_physics, imp_physics_fer_hires,
iyear0 = 0
monthd = 0

if (is_initialized) return

! Call initialization routines..
call sol_init ( me, isol, solar_file, con_solr_2008, con_solr_2002, con_pi )
call aer_init ( levr, me, iaermdl, iaerflg, lalw1bd, aeros_file, con_pi, con_t0c, &
Expand Down

0 comments on commit 644be8d

Please sign in to comment.