radiation_setup compatible with 49r1

reuterbal · Jan 14, 2025 · 77d9057 · 77d9057
1 parent cf61999
commit 77d9057
Showing 1 changed file with 34 additions and 21 deletions.
diff --git a/ifs/radiation_setup.F90 b/ifs/radiation_setup.F90
@@ -292,7 +292,11 @@ SUBROUTINE SETUP_RADIATION_SCHEME(PRADIATION,LDOUTPUT,FILE_NAME)
 
       ! The default aerosol optics file is the following - please
       ! update here, not in radiation/module/radiation_config.F90
-      RAD_CONFIG%AEROSOL_OPTICS_OVERRIDE_FILE_NAME = 'aerosol_ifs_rrtm_46R1_with_NI_AM.nc'
+      IF (RAD_CONFIG%USE_GENERAL_AEROSOL_OPTICS) THEN
+        RAD_CONFIG%AEROSOL_OPTICS_OVERRIDE_FILE_NAME = 'aerosol_ifs_49R1_20230119.nc'
+      ELSE
+        RAD_CONFIG%AEROSOL_OPTICS_OVERRIDE_FILE_NAME = 'aerosol_ifs_rrtm_46R1_with_NI_AM.nc'
+      END IF
 
     ELSE
       ! Using Tegen climatology
@@ -439,7 +443,7 @@ SUBROUTINE SETUP_RADIATION_SCHEME(PRADIATION,LDOUTPUT,FILE_NAME)
     ! second emissivity to represent values within it.
     CALL YDERAD%YSPECTPLANCK%INIT(2, [ 8.0E-6_JPRB, 13.0E-6_JPRB ], &
          &  [ 1,2,1 ])
-      
+
     ! Populate the mapping between the 14 RRTM shortwave bands and the
     ! 6 albedo inputs.
     YDERAD%NSW = 6
@@ -518,25 +522,34 @@ SUBROUTINE SETUP_RADIATION_SCHEME(PRADIATION,LDOUTPUT,FILE_NAME)
          &  PRADIATION%NWEIGHT_PAR, PRADIATION%IBAND_PAR, PRADIATION%WEIGHT_PAR,&
          &  'photosynthetically active radiation, PAR')
 
-    IF (YDERAD%NAERMACC > 0) THEN
-      ! With the MACC aerosol climatology we need to add in the
-      ! background aerosol afterwards using the Tegen arrays.  In this
-      ! case we first configure the background aerosol mass-extinction
-      ! coefficient at 550 nm, which corresponds to the 10th RRTMG
-      ! shortwave band.
-      PRADIATION%TROP_BG_AER_MASS_EXT  = DRY_AEROSOL_MASS_EXTINCTION(RAD_CONFIG,&
-           &                                   ITYPE_TROP_BG_AER, 550.0E-9_JPRB)
-      PRADIATION%STRAT_BG_AER_MASS_EXT = DRY_AEROSOL_MASS_EXTINCTION(RAD_CONFIG,&
-           &                                   ITYPE_STRAT_BG_AER, 550.0E-9_JPRB)
-
-      WRITE(NULOUT,'(a,i0)') 'Tropospheric background uses aerosol type ',&
-           &                 ITYPE_TROP_BG_AER
-      WRITE(NULOUT,'(a,i0)') 'Stratospheric background uses aerosol type ',&
-           &                 ITYPE_STRAT_BG_AER
-    ELSE
-      PRADIATION%TROP_BG_AER_MASS_EXT  = 0.0_JPRB
-      PRADIATION%STRAT_BG_AER_MASS_EXT = 0.0_JPRB
-    ENDIF
+    ! PRADIATION%TROP_BG_AER_MASS_EXT  = 0.0_JPRB
+    ! PRADIATION%STRAT_BG_AER_MASS_EXT = 0.0_JPRB
+    ! IF (YDERAD%NAERMACC > 0) THEN
+    !   ! With the MACC aerosol climatology we need to add in the
+    !   ! background aerosol afterwards using the Tegen arrays.  In this
+    !   ! case we first configure the background aerosol mass-extinction
+    !   ! coefficient at 550 nm, which corresponds to the 10th RRTMG
+    !   ! shortwave band.
+    !   IF (ITYPE_TROP_BG_AER > 0) THEN
+    !     PRADIATION%TROP_BG_AER_MASS_EXT  = DRY_AEROSOL_MASS_EXTINCTION(RAD_CONFIG,&
+    !         &                                   ITYPE_TROP_BG_AER, 550.0e-9_JPRB)
+    !     WRITE(NULOUT,'(a,i2,a,e12.4,a)') 'Tropospheric background:  aerosol type ',&
+    !         &  ITYPE_TROP_BG_AER, ', 550-nm mass-extinction coefficient ', &
+    !         &  PRADIATION%TROP_BG_AER_MASS_EXT, ' m2 kg-1'
+    !   ELSE
+    !     WRITE(NULOUT,'(a)') 'No tropospheric background aerosol'
+    !   ENDIF
+
+    !   IF (ITYPE_STRAT_BG_AER > 0) THEN
+    !     PRADIATION%STRAT_BG_AER_MASS_EXT = DRY_AEROSOL_MASS_EXTINCTION(RAD_CONFIG,&
+    !         &                                   ITYPE_STRAT_BG_AER, 550.0e-9_JPRB)
+    !     WRITE(NULOUT,'(a,i2,a,e12.4,a)') 'Stratospheric background: aerosol type ',&
+    !         &  ITYPE_STRAT_BG_AER, ', 550-nm mass-extinction coefficient ', &
+    !         &  PRADIATION%STRAT_BG_AER_MASS_EXT, ' m2 kg-1'
+    !   ELSE
+    !     WRITE(NULOUT,'(a)') 'No stratospheric background aerosol'
+    !   ENDIF
+    ! ENDIF
 
     IF (IVERBOSESETUP > 1) THEN
       WRITE(NULOUT,'(a)') '-------------------------------------------------------------------------------'