Merge branch 'develop' into spack-180

.github/workflows/gcc.yml

@@ -31,7 +31,7 @@ env:
 
 jobs:
   setup:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - name: checkout-upp  # This is for getting spack.yaml
@@ -67,7 +67,7 @@ jobs:
 
   build:
     needs: setup
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - name: checkout-upp

modulefiles/hera_external_ifi.lua

@@ -0,0 +1,6 @@
+help([[
+Load external libIFI for UPP on hera
+]])
+
+prepend_path("MODULEPATH", "/scratch2/BMC/ifi/modulefiles")
+load("ifi/20230511-intel-2022.1.2")

modulefiles/hera_ifi_test_prereqs.lua

@@ -0,0 +1,6 @@
+help([[
+Load prerequisites for IFI's own internal test programs and its "fip2 lookalike." This is only needed with the internal IFI when building with -DBUILD_IFI_EXECUTABLES=ON (the -B option to compile_upp.sh).
+]])
+
+
+load("netcdf-cxx4/4.3.1")

modulefiles/jet_external_ifi.lua

@@ -0,0 +1,6 @@
+help([[
+Load external libIFI for UPP on hera
+]])
+
+prepend_path("MODULEPATH", "/lfs5/BMC/ifi/modulefiles")
+load("ifi/20241001-intel-2022.1.2")

modulefiles/jet_ifi_test_prereqs.lua

@@ -0,0 +1,6 @@
+help([[
+Load prerequisites for IFI's own internal test programs and its "fip2 lookalike." This is only needed with the internal IFI when building with -DBUILD_IFI_EXECUTABLES=ON (the -B option to compile_upp.sh).
+]])
+
+
+load("netcdf-cxx4/4.3.1")

parm/gefs/post_itag_gefs128

@@ -0,0 +1,7 @@
+&MODEL_INPUTS
+MODELNAME='GFS'
+/
+&NAMPGB
+KPO=50,PO=1000.,975.,950.,925.,900.,875.,850.,825.,800.,775.,750.,725.,700.,675.,650.,625.,600.,575.,550.,525.,500.,475.,450.,425.,400.,375.,350.,325.,300.,275.,250.,225.,200.,175.,150.,125.,100.,70.,50.,40.,30.,20.,15.,10.,7.,5.,3.,2.,1.,0.4,nasa_on=.true.,
+/
+EOF

parm/gfs/post_itag_gfs128

@@ -0,0 +1,7 @@
+&MODEL_INPUTS
+MODELNAME='GFS'
+/
+&NAMPGB
+KPO=57,PO=1000.,975.,950.,925.,900.,875.,850.,825.,800.,775.,750.,725.,700.,675.,650.,625.,600.,575.,550.,525.,500.,475.,450.,425.,400.,375.,350.,325.,300.,275.,250.,225.,200.,175.,150.,125.,100.,70.,50.,40.,30.,20.,15.,10.,7.,5.,3.,2.,1.,0.7,0.4,0.2,0.1,0.07,0.04,0.02,0.01,rdaod=.true.,
+ /
+EOF

parm/sfs/postcntrl_sfs.xml

@@ -294,6 +294,12 @@
        <scale>3.0</scale>
     </param>
 
+    <param>
+       <shortname>AVE_DSWRF_ON_TOP_OF_ATMOS</shortname>
+       <table_info>NCEP</table_info>
+       <scale>3.0</scale>
+    </param>
+
     <param>
        <shortname>AVE_USWRF_ON_TOP_OF_ATMOS</shortname>
        <table_info>NCEP</table_info>

parm/sfs/postxconfig-NT-sfs.txt

@@ -1,5 +1,5 @@
 1
-113
+114
 GFSPRS
 0
 ncep_nco
@@ -1990,6 +1990,48 @@ surface
 ?
 ?
 ?
+388
+AVE_DSWRF_ON_TOP_OF_ATMOS
+?
+1
+tmpl4_8
+DSWRF
+NCEP
+AVE
+top_of_atmos
+0
+?
+0
+?
+?
+0
+?
+0
+?
+?
+?
+?
+0
+0.0
+0
+0.0
+?
+0
+0.0
+0
+0.0
+0
+0.0
+0
+0.0
+1
+3.0
+0
+0
+0
+?
+?
+?
 130
 AVE_USWRF_ON_TOP_OF_ATMOS
 ?

sorc/ncep_post.fd/CLDRAD.f

@@ -4703,7 +4703,7 @@ SUBROUTINE CLDRAD
         ENDDO
 
         IF ( LAEROPT ) THEN
-         PRINT *, 'COMPUTE AEROSOL OPTICAL PROPERTIES'
+         if(me == 0)PRINT *, 'COMPUTE AEROSOL OPTICAL PROPERTIES'
 
 !!! ALLOCATE AEROSOL OPTICAL PROPERTIES
          ALLOCATE ( extrhd_DU(KRHLEV,nbin_du,NBDSW))
@@ -4740,9 +4740,9 @@ SUBROUTINE CLDRAD
          else if (nasa_on) then
          nAero=KCM2
          endif
-         PRINT *, 'aft  AEROSOL allocate, nbin_du=',nbin_du,  &
-          'nbin_ss=',nbin_ss,'nbin_su=',nbin_su,'nbin_bc=',     &
-          'nbin_oc=',nbin_oc,'nbin_ni=',nbin_no3,'nAero=',nAero
+!         PRINT *, 'aft  AEROSOL allocate, nbin_du=',nbin_du,  &
+!          'nbin_ss=',nbin_ss,'nbin_su=',nbin_su,'nbin_bc=',     &
+!          'nbin_oc=',nbin_oc,'nbin_ni=',nbin_no3,'nAero=',nAero
 
 !!! READ AEROSOL LUTS
          DO i = 1, nAero