Address issues with the Intel compiler and aerosol wavelength grid in…

…dexing (#10) * link to cpp std lib * fix CMake flag, update TUV-x, and fix aerosol wavelength grid use
mattldawson · Apr 5, 2024 · c12d1e4 · c12d1e4
1 parent a3669a5
commit c12d1e4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 18 deletions.
diff --git a/Externals_CAM.cfg b/Externals_CAM.cfg
@@ -75,7 +75,7 @@ required = True
 local_path = libraries/tuv-x
 protocol = git
 repo_url = https://github.com/NCAR/tuv-x.git
-hash = b771af381777b7689d9da56995fb5b5fdd33be65
+hash = d60e6c037ee0c481d629d5b9bf977f89a29d1b35
 required = True
 
 [hemco]

diff --git a/cime_config/buildlib b/cime_config/buildlib
@@ -170,16 +170,15 @@ def _build_tuvx(caseroot, libroot, bldroot):
             cmake_args = "-DCMAKE_Fortran_COMPILER={} ".format(arg_dict["SFC"])
         else:
             cmake_args = "-DCMAKE_Fortran_COMPILER={} ".format(arg_dict["MPIFC"])
-            cmake_args += "-DENABLE_MPI:BOOL=TRUE "
+            cmake_args += "-DTUVX_ENABLE_MPI:BOOL=TRUE "
         if case.get_value("DEBUG"):
             cmake_args += "-DCMAKE_BUILD_TYPE=Debug "
         else:
             cmake_args += "-DCMAKE_BUILD_TYPE=Release "
-        cmake_args += "-DENABLE_UTIL_ONLY=ON "
         cmake_args += "-DCMAKE_C_COMPILER_WORKS=1 "
         cmake_args += "-DCMAKE_CXX_COMPILER_WORKS=1 "
-        cmake_args += "-DENABLE_TESTS=OFF "
-        cmake_args += "-DENABLE_COVERAGE=OFF "
+        cmake_args += "-DTUVX_ENABLE_TESTS=OFF "
+        cmake_args += "-DTUVX_ENABLE_COVERAGE=OFF "
         cmake_args += "-DCMAKE_Fortran_FLAGS='{}' ".format(arg_dict["FFLAGS"])
         cmake_args += "-DCMAKE_INSTALL_PREFIX='{}' ".format(libroot)
         cmake_args += srcpath

diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
@@ -206,7 +206,7 @@
   <entry id="CAM_LINKED_LIBS">
     <type>char</type>
     <valid_values></valid_values>
-    <default_value>-ltuvx</default_value>
+    <default_value>-ltuvx -lstdc++</default_value>
     <group>build_component_cam</group>
     <file>env_build.xml</file>
     <desc>

diff --git a/src/chemistry/mozart/mo_tuvx.F90 b/src/chemistry/mozart/mo_tuvx.F90
@@ -1716,9 +1716,9 @@ subroutine get_aerosol_optical_properties( this, state, pbuf, optical_depth, &
       !       last bin should be moved to the just before the first bin (!?!)
       ! =========================================================================
       call get_sw_spectral_boundaries( low_bound, high_bound, 'nm' )
-      wavelength_edges(1:nswbands-1) = high_bound(nswbands-1:1:-1)
-      wavelength_edges(nswbands    ) = high_bound(nswbands       )
-      wavelength_edges(nswbands+1  ) = low_bound( nswbands       )
+      wavelength_edges(1:nswbands-1) = low_bound( nswbands-1:1:-1)
+      wavelength_edges(nswbands    ) = low_bound( nswbands       )
+      wavelength_edges(nswbands+1  ) = high_bound(nswbands       )
       call reorder_optics_array(     aer_tau )
       call reorder_optics_array(   aer_tau_w )
       call reorder_optics_array( aer_tau_w_g )
@@ -1729,17 +1729,14 @@ subroutine get_aerosol_optical_properties( this, state, pbuf, optical_depth, &
       ! TODO is this the correct regridding scheme to use?
       n_tuvx_bins = this%n_wavelength_bins_
       do i_col = 1, pcols
-         do i_level = 1, pver
+         do i_level = 1, pver + 1
             call rebin(nswbands, n_tuvx_bins, wavelength_edges, this%wavelength_edges_, &
-               aer_tau(i_col,pver-i_level,:), optical_depth(i_col,i_level,:))
+               aer_tau(i_col,pver+1-i_level,:), optical_depth(i_col,i_level,:))
             call rebin(nswbands, n_tuvx_bins, wavelength_edges, this%wavelength_edges_, &
-               aer_tau_w(i_col,pver-i_level,:), single_scattering_albedo(i_col,i_level,:))
+               aer_tau_w(i_col,pver+1-i_level,:), single_scattering_albedo(i_col,i_level,:))
             call rebin(nswbands, n_tuvx_bins, wavelength_edges, this%wavelength_edges_, &
-               aer_tau_w_g(i_col,pver-i_level,:), asymmetry_factor(i_col,i_level,:))
+               aer_tau_w_g(i_col,pver+1-i_level,:), asymmetry_factor(i_col,i_level,:))
          end do
-         optical_depth(i_col,pver+1,:) = optical_depth(i_col,pver,:)
-         single_scattering_albedo(i_col,pver+1,:) = single_scattering_albedo(i_col,pver,:)
-         asymmetry_factor(i_col,pver+1,:) = asymmetry_factor(i_col,pver,:)
       end do
 
       ! ================================================================
@@ -1748,12 +1745,12 @@ subroutine get_aerosol_optical_properties( this, state, pbuf, optical_depth, &
       associate( tau   => optical_depth, &
                  omega => single_scattering_albedo, &
                  g     => asymmetry_factor )
-         where(omega > 0.0_r8)
+         where(omega > 0.0_r8 .and. g > 0.0_r8)
             g = g / omega
          elsewhere
             g = 0.0_r8
          end where
-         where(tau > 0.0_r8)
+         where(tau > 0.0_r8 .and. omega > 0.0_r8)
             omega = omega / tau
          elsewhere
             omega = 0.0_r8