Merge branch 'main' into ufs-dev-PR118

NCAR · Jan 30, 2024 · c51a0ce · c51a0ce
2 parents 4014741 + fb0000c
commit c51a0ce
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/physics/GFS_rrtmg_setup.F90 b/physics/GFS_rrtmg_setup.F90
@@ -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."
@@ -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 )

diff --git a/physics/GFS_rrtmgp_setup.F90 b/physics/GFS_rrtmgp_setup.F90
@@ -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
@@ -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,    &