diff --git a/.github/workflows/containerized-ci.yml b/.github/workflows/containerized-ci.yml index 0fff82c015..13a227184d 100644 --- a/.github/workflows/containerized-ci.yml +++ b/.github/workflows/containerized-ci.yml @@ -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} diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml index a5fef1c1c1..ff9bb7ddfa 100644 --- a/.github/workflows/continuous_integration.yml +++ b/.github/workflows/continuous_integration.yml @@ -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} diff --git a/driver/data/outputs/UKMO/cosp2_output.um_global.gfortran.kgo.v005.nc.md5 b/driver/data/outputs/UKMO/cosp2_output.um_global.gfortran.kgo.v005.nc.md5 index d49c13c21c..b6dd98a358 100644 --- a/driver/data/outputs/UKMO/cosp2_output.um_global.gfortran.kgo.v005.nc.md5 +++ b/driver/data/outputs/UKMO/cosp2_output.um_global.gfortran.kgo.v005.nc.md5 @@ -1 +1 @@ -83c3d91b0c451ccfce9e8742a9e45d59 cosp2_output.um_global.gfortran.kgo.v005.nc +98893d9574e75430eee342feeeb5f204 cosp2_output.um_global.gfortran.kgo.v005.nc diff --git a/driver/data/outputs/UKMO/cosp2_output.um_global.gfortran.kgo.v006.nc.md5 b/driver/data/outputs/UKMO/cosp2_output.um_global.gfortran.kgo.v006.nc.md5 new file mode 100644 index 0000000000..7963a6e8ee --- /dev/null +++ b/driver/data/outputs/UKMO/cosp2_output.um_global.gfortran.kgo.v006.nc.md5 @@ -0,0 +1 @@ +98893d9574e75430eee342feeeb5f204 cosp2_output.um_global.gfortran.kgo.v006.nc diff --git a/driver/data/outputs/UKMO/cosp2_output.um_global.ifort.kgo.v006.nc.md5 b/driver/data/outputs/UKMO/cosp2_output.um_global.ifort.kgo.v006.nc.md5 new file mode 100644 index 0000000000..9193088868 --- /dev/null +++ b/driver/data/outputs/UKMO/cosp2_output.um_global.ifort.kgo.v006.nc.md5 @@ -0,0 +1 @@ +18d0113c3eaa894d392551c9eefc2178 cosp2_output.um_global.ifort.kgo.v006.nc diff --git a/driver/data/outputs/UKMO/cosp2_output.um_global.ifx.kgo.v006.nc.md5 b/driver/data/outputs/UKMO/cosp2_output.um_global.ifx.kgo.v006.nc.md5 new file mode 100644 index 0000000000..96621cb628 --- /dev/null +++ b/driver/data/outputs/UKMO/cosp2_output.um_global.ifx.kgo.v006.nc.md5 @@ -0,0 +1 @@ +b7fbb90a799a9f625a19ebedbc9df889 cosp2_output.um_global.ifx.kgo.v006.nc diff --git a/driver/data/outputs/UKMO/cosp2_output.um_global_model_levels.gfortran.kgo.v005.nc.md5 b/driver/data/outputs/UKMO/cosp2_output.um_global_model_levels.gfortran.kgo.v005.nc.md5 index 939ecf6629..052af4b5cc 100644 --- a/driver/data/outputs/UKMO/cosp2_output.um_global_model_levels.gfortran.kgo.v005.nc.md5 +++ b/driver/data/outputs/UKMO/cosp2_output.um_global_model_levels.gfortran.kgo.v005.nc.md5 @@ -1 +1 @@ -ddb2ff79094fbf5323f951a6eb0b7d39 cosp2_output.um_global_model_levels.gfortran.kgo.v005.nc +e956d433d07f6b0e77c5f0d0c4656137 cosp2_output.um_global_model_levels.gfortran.kgo.v005.nc diff --git a/driver/data/outputs/UKMO/cosp2_output.um_global_model_levels.gfortran.kgo.v006.nc.md5 b/driver/data/outputs/UKMO/cosp2_output.um_global_model_levels.gfortran.kgo.v006.nc.md5 new file mode 100644 index 0000000000..e174e1497c --- /dev/null +++ b/driver/data/outputs/UKMO/cosp2_output.um_global_model_levels.gfortran.kgo.v006.nc.md5 @@ -0,0 +1 @@ +6926dc2c81b7f89978e69902f8604672 cosp2_output.um_global_model_levels.gfortran.kgo.v006.nc diff --git a/driver/data/outputs/UKMO/cosp2_output_um.gfortran.kgo.v006.nc.md5 b/driver/data/outputs/UKMO/cosp2_output_um.gfortran.kgo.v006.nc.md5 new file mode 100644 index 0000000000..d56a1ce8f9 --- /dev/null +++ b/driver/data/outputs/UKMO/cosp2_output_um.gfortran.kgo.v006.nc.md5 @@ -0,0 +1 @@ +76b8b0c8ba0859782a1b53feecc2a0c9 cosp2_output_um.gfortran.kgo.v006.nc diff --git a/driver/data/outputs/UKMO/cosp2_output_um.ifort.kgo.v006.nc.md5 b/driver/data/outputs/UKMO/cosp2_output_um.ifort.kgo.v006.nc.md5 new file mode 100644 index 0000000000..ff200434f2 --- /dev/null +++ b/driver/data/outputs/UKMO/cosp2_output_um.ifort.kgo.v006.nc.md5 @@ -0,0 +1 @@ +de1b3d3f128ff1b37af223716fe0ce6e cosp2_output_um.ifort.kgo.v006.nc diff --git a/driver/data/outputs/UKMO/cosp2_output_um.ifx.kgo.v006.nc.md5 b/driver/data/outputs/UKMO/cosp2_output_um.ifx.kgo.v006.nc.md5 new file mode 100644 index 0000000000..818d452bf2 --- /dev/null +++ b/driver/data/outputs/UKMO/cosp2_output_um.ifx.kgo.v006.nc.md5 @@ -0,0 +1 @@ +0be777ab13228608576a633569496162 cosp2_output_um.ifx.kgo.v006.nc diff --git a/driver/download_test_data.sh b/driver/download_test_data.sh index 5c5e11e784..0a8052c818 100755 --- a/driver/download_test_data.sh +++ b/driver/download_test_data.sh @@ -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" ) ;; diff --git a/driver/plot_test_outputs.py b/driver/plot_test_outputs.py index c05e2bf262..a494952b31 100644 --- a/driver/plot_test_outputs.py +++ b/driver/plot_test_outputs.py @@ -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 diff --git a/src/cosp.F90 b/src/cosp.F90 index 3da7a06577..40ee93b814 100755 --- a/src/cosp.F90 +++ b/src/cosp.F90 @@ -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) @@ -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 @@ -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