Skip to content

Commit

Permalink
add od and xs calcs to LUT LA-SRB test
Browse files Browse the repository at this point in the history
  • Loading branch information
@mattldawson
mattldawson committed Jan 25, 2024
1 parent c94c8f6 commit 3e71d7e
Show file tree
Hide file tree
Showing 8 changed files with 485 additions and 24 deletions.
3 changes: 2 additions & 1 deletion examples/ts1_tsmlt.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,8 @@
"name": "jo2_a",
"__reaction": "O2 + hv -> O + O1D",
"cross section": {
"netcdf files": [
"apply O2 bands": true,
"netcdf files": [
{
"file path": "data/cross_sections/O2_1.nc",
"lower extrapolation": { "type": "boundary" },
Expand Down
18 changes: 10 additions & 8 deletions src/photolysis_rates.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ subroutine get( this, la_srb, spherical_geometry, grid_warehouse, &
!> Local variables
character(len=*), parameter :: Iam = "photolysis rates calculator"
integer :: vertNdx, rateNdx, nRates
real(dk), allocatable :: airVcol(:), airScol(:)
real(dk), allocatable :: air_vertical_column(:), air_slant_column(:)
real(dk), allocatable :: xsqyWrk(:)
real(dk), allocatable :: cross_section(:,:)
real(dk), allocatable :: quantum_yield(:,:)
Expand Down Expand Up @@ -343,13 +343,15 @@ subroutine get( this, la_srb, spherical_geometry, grid_warehouse, &
! O2 photolysis can have special la & srb band handling
if( any( this%o2_rate_indices_ == rateNdx ) ) then
airProfile => profile_warehouse%get_profile( this%air_profile_ )
allocate( airVcol( airProfile%ncells_ ), &
airScol( airProfile%ncells_ + 1 ) )
call spherical_geometry%air_mass( airProfile%exo_layer_dens_, airVcol,&
airScol )
call la_srb%cross_section( grid_warehouse, profile_warehouse, airVcol,&
airScol, cross_section, spherical_geometry )
deallocate( airVcol, airScol )
allocate( air_vertical_column( airProfile%ncells_ ), &
air_slant_column( airProfile%ncells_ + 1 ) )
call spherical_geometry%air_mass( airProfile%exo_layer_dens_, &
air_vertical_column, &
air_slant_column )
call la_srb%cross_section( grid_warehouse, profile_warehouse, &
air_vertical_column, air_slant_column, &
cross_section, spherical_geometry )
deallocate( air_vertical_column, air_slant_column )
deallocate( airProfile )
endif

Expand Down
38 changes: 27 additions & 11 deletions test/data/la_srb_bands.config.json
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,24 @@
{
"grids" : [
{
"name": "height",
"type": "equal interval",
"units": "km",
"begins at" : 0.0,
"ends at" : 120.0,
"cell delta" : 1.0
"name": "height",
"type": "equal interval",
"units": "km",
"begins at" : 0.5,
"ends at" : 150.5,
"cell delta" : 1.0
},
{
"name": "wavelength",
"type": "from csv file",
"units": "nm",
"file path": "data/grids/wavelength/combined.grid"
"name": "wavelength",
"type": "from csv file",
"units": "nm",
"file path": "test/data/waccm2_ref_101_mod.grid"
},
{
"name": "LUT wavelength",
"type": "from csv file",
"units": "nm",
"file path": "test/data/waccm2_ref_101.grid"
}
],
"cross section parameters file": "data/cross_sections/O2_parameters.txt",
Expand All @@ -39,5 +45,15 @@
"units": "molecule cm-3",
"file path": "data/profiles/atmosphere/ussa.dens"
}
]
],
"O2 cross section": {
"netcdf files": [
{
"file path": "data/cross_sections/O2_1.nc",
"lower extrapolation": { "type": "boundary" },
"interpolator": { "type": "fractional target" }
}
],
"type": "base"
}
}
104 changes: 104 additions & 0 deletions test/data/waccm2_ref_101.grid
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
102
120.0000
121.0000
122.0000
123.5000
124.3000
125.5000
126.3000
127.1000
130.1000
131.1000
135.0000
140.0000
145.0000
150.0000
155.0000
160.0000
165.0000
168.0000
171.0000
173.0000
174.4000
177.0000
178.6000
180.2000
181.8000
183.5000
185.2000
186.9000
188.7000
190.5000
192.3000
194.2000
196.1000
198.0000
200.0000
202.0000
204.1000
205.8000
208.0000
211.0000
214.0000
217.0000
220.0000
223.0000
226.0000
229.0000
232.0000
235.0000
238.0000
241.0000
244.0000
247.0000
250.0000
253.0000
256.0000
259.0000
263.0000
267.0000
271.0000
275.0000
279.0000
283.0000
287.0000
291.0000
295.0000
298.5000
302.5000
305.5000
308.5000
311.5000
314.5000
317.5000
322.5000
327.5000
332.5000
337.5000
342.5000
347.5000
350.0000
355.0000
360.0000
365.0000
370.0000
375.0000
380.0000
385.0000
390.0000
395.0000
400.0000
405.0000
410.0000
415.0000
420.0000
430.0000
440.0000
450.0000
500.0000
550.0000
600.0000
650.0000
700.0000
750.0000

104 changes: 104 additions & 0 deletions test/data/waccm2_ref_101_mod.grid
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
102
120.0000
121.4000
121.9000
123.5000
124.3000
125.5000
126.3000
127.1000
130.1000
131.1000
135.0000
140.0000
145.0000
150.0000
155.0000
160.0000
165.0000
168.0000
171.0000
173.0000
175.4000
177.0000
178.6000
180.2000
181.8000
183.5000
185.2000
186.9000
188.7000
190.5000
192.3000
194.2000
196.1000
198.0000
200.0000
202.0000
204.1000
206.2000
208.0000
211.0000
214.0000
217.0000
220.0000
223.0000
226.0000
229.0000
232.0000
235.0000
238.0000
241.0000
244.0000
247.0000
250.0000
253.0000
256.0000
259.0000
263.0000
267.0000
271.0000
275.0000
279.0000
283.0000
287.0000
291.0000
295.0000
298.5000
302.5000
305.5000
308.5000
311.5000
314.5000
317.5000
322.5000
327.5000
332.5000
337.5000
342.5000
347.5000
350.0000
355.0000
360.0000
365.0000
370.0000
375.0000
380.0000
385.0000
390.0000
395.0000
400.0000
405.0000
410.0000
415.0000
420.0000
430.0000
440.0000
450.0000
500.0000
550.0000
600.0000
650.0000
700.0000
750.0000

1 change: 1 addition & 0 deletions test/unit/tuv_doug/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ target_sources(tuv_doug
inter4.f
la_srb.f
lymana.f
rdo2xs.f
schum.f
../test_utils.F90
)
Expand Down
Loading

0 comments on commit 3e71d7e

Please sign in to comment.