Skip to content

Correct indexing of cospOUT #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 25 commits into from
Aug 27, 2025
Merged

Correct indexing of cospOUT #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
22ae359
Correct indexing of cospOUT in CloudSat quickbeam_column and cosp_dia…
jshaw35 Mar 10, 2024
3b547b3
Merge branch 'master' of https://github.com/CFMIP/COSPv2.0 into cloud…
jshaw35 Mar 19, 2024
121e0e6
Merge branch 'master' of https://github.com/CFMIP/COSPv2.0 into cloud…
jshaw35 Mar 21, 2024
b914d37
Update plot_test_outputs.py to include missed CloudSat variables.
jshaw35 Apr 10, 2024
2c13eb2
Update histogram axis labels for CloudSat+MODIS dBZe vs ICOD joint PDF.
jshaw35 Apr 10, 2024
e9bc0ad
Update CFODD_NDBZE xticks.
jshaw35 Apr 10, 2024
76a626c
Re-update xticks and yticks to bin edges.
jshaw35 Apr 10, 2024
b1fd01f
Merge remote-tracking branch 'cfmip_origin/master' into cloudsat_bugfix
jshaw35 Jul 3, 2025
2002831
Merge branch 'cloudsat_bugfix' of https://github.com/jshaw35/COSPv2.0…
jshaw35 Jul 3, 2025
ea7597f
Merge remote-tracking branch 'cfmip_origin/master' into cloudsat_bugfix
jshaw35 Jul 14, 2025
d62179a
KGOs v005 and v006 for #86
alejandrobodas Jul 18, 2025
40e4de2
Checksums for v005 and v006 KGOs (#86)
alejandrobodas Jul 18, 2025
00bee39
Merge remote-tracking branch 'cfmip_origin/KGOs_5_6' into cloudsat_bu…
jshaw35 Jul 19, 2025
bacaec1
update kgo versions
jshaw35 Jul 19, 2025
4108dbe
Update of gfortran KGOs yo v006 (#86)
alejandrobodas Jul 24, 2025
1574ae5
merge with KGOs_5_6
jshaw35 Jul 24, 2025
64f52b3
Bugfix in quickbeam precipitation occurence diagnostics
dustinswales Jul 25, 2025
f26e40a
Add logic in driver to guard against requesting unavailable diagnostics
dustinswales Jul 25, 2025
4d2b9b3
Merge remote-tracking branch 'cfmip_origin/master' into cloudsat_bugfix
jshaw35 Jul 29, 2025
2f9caf4
Merge branch 'cloudsat_bugfix' of https://github.com/jshaw35/COSPv2.0…
jshaw35 Jul 29, 2025
77ee04e
Remove CloudSat precip diagnostics from maps.
jshaw35 Jul 29, 2025
6fae6b5
Update gfortran KGO on model levels
alejandrobodas Aug 19, 2025
38d3ead
Delete line left over.
alejandrobodas Aug 19, 2025
b6ba90e
merge with KGOs_5_6
jshaw35 Aug 24, 2025
17bea3c
reconcile with KGOs_5_6
jshaw35 Aug 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/containerized-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- compiler: ifx
image: ghcr.io/earth-system-radiation/rte-rrtmgp-ci:oneapi
# Common variables
- kgo_version: v005
- kgo_version: v006
defaults:
run:
shell: bash -el {0}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/continuous_integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
python-version: [3.11]
include:
- compiler_short_name: gfortran
- kgo_version: v005
- kgo_version: v006
defaults:
run:
shell: bash -el {0}
Expand Down
2 changes: 1 addition & 1 deletion driver/data/outputs/UKMO/cosp2_output.um_global.gfortran.kgo.v005.nc.md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
83c3d91b0c451ccfce9e8742a9e45d59 cosp2_output.um_global.gfortran.kgo.v005.nc
98893d9574e75430eee342feeeb5f204 cosp2_output.um_global.gfortran.kgo.v005.nc
1 change: 1 addition & 0 deletions driver/data/outputs/UKMO/cosp2_output.um_global.gfortran.kgo.v006.nc.md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
98893d9574e75430eee342feeeb5f204 cosp2_output.um_global.gfortran.kgo.v006.nc
1 change: 1 addition & 0 deletions driver/data/outputs/UKMO/cosp2_output.um_global.ifort.kgo.v006.nc.md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
18d0113c3eaa894d392551c9eefc2178 cosp2_output.um_global.ifort.kgo.v006.nc
1 change: 1 addition & 0 deletions driver/data/outputs/UKMO/cosp2_output.um_global.ifx.kgo.v006.nc.md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b7fbb90a799a9f625a19ebedbc9df889 cosp2_output.um_global.ifx.kgo.v006.nc
2 changes: 1 addition & 1 deletion driver/data/outputs/UKMO/cosp2_output.um_global_model_levels.gfortran.kgo.v005.nc.md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ddb2ff79094fbf5323f951a6eb0b7d39 cosp2_output.um_global_model_levels.gfortran.kgo.v005.nc
e956d433d07f6b0e77c5f0d0c4656137 cosp2_output.um_global_model_levels.gfortran.kgo.v005.nc
1 change: 1 addition & 0 deletions driver/data/outputs/UKMO/cosp2_output.um_global_model_levels.gfortran.kgo.v006.nc.md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6926dc2c81b7f89978e69902f8604672 cosp2_output.um_global_model_levels.gfortran.kgo.v006.nc
1 change: 1 addition & 0 deletions driver/data/outputs/UKMO/cosp2_output_um.gfortran.kgo.v006.nc.md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
76b8b0c8ba0859782a1b53feecc2a0c9 cosp2_output_um.gfortran.kgo.v006.nc
1 change: 1 addition & 0 deletions driver/data/outputs/UKMO/cosp2_output_um.ifort.kgo.v006.nc.md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
de1b3d3f128ff1b37af223716fe0ce6e cosp2_output_um.ifort.kgo.v006.nc
1 change: 1 addition & 0 deletions driver/data/outputs/UKMO/cosp2_output_um.ifx.kgo.v006.nc.md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0be777ab13228608576a633569496162 cosp2_output_um.ifx.kgo.v006.nc
24 changes: 12 additions & 12 deletions driver/download_test_data.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,27 @@ COMPILER=$1
case $COMPILER in

"gfortran")
KGO_VERSION=v005
kgo_links=( "https://docs.google.com/uc?export=download&id=1olgrWzCSpFyPdimFnRfeFxkq5SoIfPDv" \
"https://docs.google.com/uc?export=download&id=1B9Too1KSfT7fcWKJj2OeR7cytk56eZO2" \
"https://docs.google.com/uc?export=download&id=1ddBYJsdRXy4z7kLrhRq54KvtuO6AjnTq" )
KGO_VERSION=v006
kgo_links=( "https://docs.google.com/uc?export=download&id=1HgtrBVI5-7ypQWxzzMPvAq_5IIE5q9-B" \
"https://docs.google.com/uc?export=download&id=17Ah7z2oGiwwZ-yW1JX3Vg81_l7Q1zFf7" \
"https://docs.google.com/uc?export=download&id=1IzBbnhnfYeaSPLRSvWsWCEzsL_D9_ZKq" )
out_type=( "cosp2_output_um.${COMPILER}.kgo" \
"cosp2_output.um_global.${COMPILER}.kgo" \
"cosp2_output.um_global_model_levels.${COMPILER}.kgo" )
;;

"ifort")
KGO_VERSION=v005
kgo_links=( "https://docs.google.com/uc?export=download&id=1R6uvtWno-bhdgxACCwdcaRNXs9l5_G4w" \
"https://docs.google.com/uc?export=download&id=1bVU1_dx6hXcV_fHX2cLUn-D03T-Hij8z" )
"ifort")
KGO_VERSION=v006
kgo_links=( "https://docs.google.com/uc?export=download&id=121bSDuGNdbkb9WKhJLu9Pwe8KnhUMtDx" \
"https://docs.google.com/uc?export=download&id=1JwWJKw8rO1MpDLXFvdWvrqKF5_HbKZAK" )
out_type=( "cosp2_output_um.${COMPILER}.kgo" \
"cosp2_output.um_global.${COMPILER}.kgo" )
;;

"ifx")
KGO_VERSION=v005
kgo_links=( "https://docs.google.com/uc?export=download&id=1CLPJ1ikAcGBEiZ3WAGqL-zpaPIgC__po" \
"https://docs.google.com/uc?export=download&id=1JOrLFbt0BYgpD0h6A3tsoRD4iTJ4jDvZ" )
"ifx")
KGO_VERSION=v006
kgo_links=( "https://docs.google.com/uc?export=download&id=1rby-uiuB8G9vVa4JvRUCYNYPPOG5TmLB" \
"https://docs.google.com/uc?export=download&id=1SDxQodiDvrwcwfi3ZCMtQITkmHMXIwD-" )
out_type=( "cosp2_output_um.${COMPILER}.kgo" \
"cosp2_output.um_global.${COMPILER}.kgo" )
;;
Expand Down
2 changes: 1 addition & 1 deletion driver/plot_test_outputs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def collapse_dimensions_for_plotting(longitude, latitude, vname, vx, vd, dims):
if vd['xaxis_type'] == 'latitude':
xticks_labels = None
xticks = np.arange(-90,91,30)
xlabel = 'Latitude (deg)'
xlabel = 'Latitude (deg)'
if vd['yaxis_type'] == 'pres7':
yticks_labels = ('1000', '800', '680', '560', '440', '310', '180','')
yticks = y
Expand Down
36 changes: 18 additions & 18 deletions src/cosp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1283,8 +1283,8 @@ function COSP_SIMULATOR(cospIN,cospgridIN,cospOUT,start_idx,stop_idx,debug)
Nlvgrid, cloudsat_DBZE_BINS, 'cloudsat', cloudsatDBZe, cloudsatZe_non, &
cospgridIN%land(:), cospgridIN%surfelev(:), cospgridIN%at(:,cospIN%Nlevels), &
cospIN%fracPrecipIce, cospgridIN%hgt_matrix, cospgridIN%hgt_matrix_half, &
cospOUT%cloudsat_cfad_ze(ij:ik,:,:), cospOUT%cloudsat_precip_cover, &
cospOUT%cloudsat_pia)
cospOUT%cloudsat_cfad_ze(ij:ik,:,:), cospOUT%cloudsat_precip_cover(ij:ik,:), &
cospOUT%cloudsat_pia(ij:ik))
! Free up memory (if necessary)
if (allocated(out1D_1)) then
deallocate(out1D_1)
Expand Down Expand Up @@ -1688,14 +1688,14 @@ function COSP_SIMULATOR(cospIN,cospgridIN,cospOUT,start_idx,stop_idx,debug)
call cosp_diag_warmrain( &
cloudsatIN%Npoints, cloudsatIN%Ncolumns, Nlvgrid, & !! in
tempI, zlev, & !! in
cospOUT%modis_Liquid_Water_Path_Mean, & !! in
cospOUT%modis_Optical_Thickness_Water_Mean, & !! in
cospOUT%modis_Cloud_Particle_Size_Water_Mean, & !! in
cospOUT%modis_Cloud_Fraction_Water_Mean, & !! in
cospOUT%modis_Ice_Water_Path_Mean, & !! in
cospOUT%modis_Optical_Thickness_Ice_Mean, & !! in
cospOUT%modis_Cloud_Particle_Size_Ice_Mean, & !! in
cospOUT%modis_Cloud_Fraction_Ice_Mean, & !! in
cospOUT%modis_Liquid_Water_Path_Mean(ij:ik), & !! in
cospOUT%modis_Optical_Thickness_Water_Mean(ij:ik), & !! in
cospOUT%modis_Cloud_Particle_Size_Water_Mean(ij:ik), & !! in
cospOUT%modis_Cloud_Fraction_Water_Mean(ij:ik), & !! in
cospOUT%modis_Ice_Water_Path_Mean(ij:ik), & !! in
cospOUT%modis_Optical_Thickness_Ice_Mean(ij:ik), & !! in
cospOUT%modis_Cloud_Particle_Size_Ice_Mean(ij:ik), & !! in
cospOUT%modis_Cloud_Fraction_Ice_Mean(ij:ik), & !! in
frac_outI, & !! in
Ze_totI, & !! in
cfodd_ntotal, wr_occfreq_ntotal ) !! inout
Expand All @@ -1705,14 +1705,14 @@ function COSP_SIMULATOR(cospIN,cospgridIN,cospOUT,start_idx,stop_idx,debug)
call cosp_diag_warmrain( &
cloudsatIN%Npoints, cloudsatIN%Ncolumns, cospIN%Nlevels, & !! in
cospgridIN%at, cospgridIN%hgt_matrix, & !! in
cospOUT%modis_Liquid_Water_Path_Mean, & !! in
cospOUT%modis_Optical_Thickness_Water_Mean, & !! in
cospOUT%modis_Cloud_Particle_Size_Water_Mean, & !! in
cospOUT%modis_Cloud_Fraction_Water_Mean, & !! in
cospOUT%modis_Ice_Water_Path_Mean, & !! in
cospOUT%modis_Optical_Thickness_Ice_Mean, & !! in
cospOUT%modis_Cloud_Particle_Size_Ice_Mean, & !! in
cospOUT%modis_Cloud_Fraction_Ice_Mean, & !! in
cospOUT%modis_Liquid_Water_Path_Mean(ij:ik), & !! in
cospOUT%modis_Optical_Thickness_Water_Mean(ij:ik), & !! in
cospOUT%modis_Cloud_Particle_Size_Water_Mean(ij:ik), & !! in
cospOUT%modis_Cloud_Fraction_Water_Mean(ij:ik), & !! in
cospOUT%modis_Ice_Water_Path_Mean(ij:ik), & !! in
cospOUT%modis_Optical_Thickness_Ice_Mean(ij:ik), & !! in
cospOUT%modis_Cloud_Particle_Size_Ice_Mean(ij:ik), & !! in
cospOUT%modis_Cloud_Fraction_Ice_Mean(ij:ik), & !! in
cospIN%frac_out, & !! in
cloudsatDBZe, & !! in
cfodd_ntotal, wr_occfreq_ntotal ) !! inout
Expand Down
Loading