Skip to content

Commit c68f5a1

Browse files
authored
Merge pull request #228 from GEOS-ESM/feature/rtodling/aero_affected_radiance
Feature/rtodling/aero affected radiance
2 parents 3cef113 + ab52313 commit c68f5a1

11 files changed

Lines changed: 526 additions & 481 deletions

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1010
### Added
1111

1212
### Changed
13+
06Feb2026:
14+
- revive knob for aerosol-affected radiances (zero-diff when not used)
15+
1316
29Jan2026:
1417
- revise ABI QC
1518

GEOSaana_GridComp/GEOSgsi_Coupler/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,17 @@ set (SRCSO
88
geos_nstmod.F90
99
gsi_fixture_GEOS.F90
1010
g5_pertmod.F90
11+
crtm_aerosol.F90
1112
cplr_pertmod.F90
1213
cplr_ensemble.F90
1314
cplr_nst.F90
1415
cplr_timermod.F90
16+
cplr_Set_CRTM_Aerosol.F90
1517
m_zeitTimer.F90
1618
# stub_GEOSagcmPert_GridCompMod.F90
1719
)
1820

1921
set (SRCSX
20-
crtm_aerosol.F90 cplr_Set_CRTM_Aerosol.F90
2122
crtm_cloud.F90 cplr_Set_CRTM_Cloud.F90
2223
)
2324

GEOSaana_GridComp/GEOSgsi_Coupler/crtm_aerosol.F90

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@ module crtm_aerosol
1414
use CRTM_Aerosol_Define, only: CRTM_Aerosol_type
1515
use CRTM_Parameters, only: DUST_AEROSOL, SEASALT_SSAM_AEROSOL, &
1616
SEASALT_SSCM1_AEROSOL, SEASALT_SSCM2_AEROSOL, &
17-
SEASALT_SSCM3_AEROSOL, SEASALT_SSCM3_AEROSOL, &
17+
SEASALT_SSCM3_AEROSOL, &
1818
BLACK_CARBON_AEROSOL, ORGANIC_CARBON_AEROSOL, &
1919
SULFATE_AEROSOL
2020

21-
2221
use Chem_RegistryMod, only: Chem_Registry, Chem_RegistryCreate, Chem_RegistryDestroy
2322
use Chem_MieMod, only: Chem_Mie, Chem_MieCreate, Chem_MieDestroy, &
2423
Chem_MieQueryIdx, Chem_MieQuery

GEOSaana_GridComp/GSI_GridComp/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ set (SRCS_UTIL
8181
gridmod.F90
8282
gscond_ad.f90
8383
gsi_4dcouplermod.f90
84+
gsi_crtmcoupler_aeromod.f90
8485
gsi_enscouplermod.f90
8586
gsi_io.f90
8687
gsi_nemsio_mod.f90
@@ -139,7 +140,6 @@ set (SRCS_UTIL
139140
rsearch.F90
140141
rtlnmc_version3.f90
141142
satthin.F90
142-
set_crtm_aerosolmod.f90
143143
set_crtm_cloudmod.f90
144144
sfc_model.f90
145145
simpin1.f90
@@ -731,6 +731,7 @@ if (EXTENDED_SOURCE)
731731
endif ()
732732

733733
set (SRCS_STUBS
734+
stub_crtm_aerosol.f90
734735
stub_get_wrf_mass_ensperts.f90
735736
stub_nstmod.f90
736737
stub_pertmod.F90

GEOSaana_GridComp/GSI_GridComp/set_crtm_aerosolmod.f90 renamed to GEOSaana_GridComp/GSI_GridComp/cplr_gfs_crtm_aeromod.f90

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,4 @@
1-
module set_crtm_aerosolmod
2-
!$$$ module documentation block
3-
! . . . .
4-
! module: set_crtm_aerosolmod
5-
! prgmmr: todling org: gmao date: 2011-06-01
6-
!
7-
! abstract: module providing interface to set-crtm-aerosol procedures
8-
!
9-
! program history log:
10-
! 2011-06-01 todling
11-
! 2011-09-20 hclin - separate na and na_crtm for p25 handling
12-
! 2019-03-21 martin - replaced blank subroutine here with that previously
13-
! in stub_set_crtm_aerosol.f90;
14-
! also moved eff rad for dust to size function
15-
!
16-
! subroutines included:
17-
! sub Set_CRTM_Aerosol_
18-
!
19-
! attributes:
20-
! language: f90
21-
! machine:
22-
!
23-
!$$$ end documentation block
24-
25-
implicit none
26-
27-
private
28-
29-
public Set_CRTM_Aerosol
30-
31-
contains
32-
33-
subroutine Set_CRTM_Aerosol ( km, na, na_crtm, aero_name, aero_conc, rh, aerosol)
1+
subroutine Set_CRTM_Aerosol_ ( km, na, na_crtm, aero_name, aero_conc, rh, aerosol)
342

353
!$$$ subprogram documentation block
364
! . . . .
@@ -213,6 +181,5 @@ function GOCART_Aerosol_size( kk, itype, & ! Input
213181
return
214182
end function GOCART_Aerosol_size
215183

216-
end subroutine Set_CRTM_Aerosol
184+
end subroutine Set_CRTM_Aerosol_
217185

218-
end module set_crtm_aerosolmod

GEOSaana_GridComp/GSI_GridComp/crtm_interface.f90

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ module crtm_interface
8181
n_aerosols_jac,aerosol_names_jac,rad_obs_type,cw_cv,ql_cv
8282
use control_vectors, only: lcalc_gfdl_cfrac
8383
use ncepnems_io, only: imp_physics
84+
use gsi_crtmcoupler_aeromod, only: Set_CRTM_Aerosol
8485

8586
implicit none
8687

@@ -886,7 +887,8 @@ subroutine init_crtm(init_pass,mype_diaghdr,mype,nchanl,nreal,isis,obstype,radmo
886887
endif
887888

888889
! Initial GFDL saturation water vapor pressure tables
889-
if (n_actual_aerosols_wk>0 .or. n_clouds_fwd_wk>0 .and. imp_physics==11) then
890+
if (imp_physics==11) then
891+
if (n_actual_aerosols_wk>0 .or. n_clouds_fwd_wk>0) then
890892

891893
if (mype==0) write(6,*)myname_,':initial and load GFDL saturation water vapor pressure tables'
892894

@@ -907,6 +909,7 @@ subroutine init_crtm(init_pass,mype_diaghdr,mype,nchanl,nreal,isis,obstype,radmo
907909
des2 (length) = des2 (length - 1)
908910
desw (length) = desw (length - 1)
909911

912+
endif
910913
endif
911914

912915
return
@@ -1100,7 +1103,6 @@ subroutine call_crtm(obstype,obstime,data_s,nchanl,nreal,ich, &
11001103
use constants, only: zero,half,one,one_tenth,fv,r0_05,r10,r100,r1000,constoz,grav,rad2deg, &
11011104
sqrt_tiny_r_kind,two,three,four,five,t0c,rd,eps,rd_over_cp,rearth
11021105
use constants, only: max_varname_length,pi
1103-
use set_crtm_aerosolmod, only: set_crtm_aerosol
11041106
use set_crtm_cloudmod, only: set_crtm_cloud
11051107
use crtm_module, only: limit_exp,o3_id,toa_pressure
11061108
use obsmod, only: iadate

0 commit comments

Comments
 (0)