More descriptive names for absorption coefficient files. More sparing…

… division in one gas optics kernel. Optimzation rather than debugging by default for Intel compiler.
alexeedm · Jan 16, 2019 · 1593b91 · 1593b91
1 parent 00a2019
commit 1593b91
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/build/Makefile.conf.ifort b/build/Makefile.conf.ifort
@@ -13,5 +13,5 @@ export F77FLAGS = -m64 -O3 -traceback                                        -qo
 #
 # Debugging
 #
-export FCFLAGS  = -m64 -g  -traceback -assume realloc_lhs -extend-source 132 -check bounds,uninit,pointers,stack -stand f03
-export F77FLAGS = -m64 -g  -traceback                                        -check bounds,uninit,pointers,stack
+# export FCFLAGS  = -m64 -g  -traceback -assume realloc_lhs -extend-source 132 -check bounds,uninit,pointers,stack -stand f03
+# export F77FLAGS = -m64 -g  -traceback                                        -check bounds,uninit,pointers,stack
diff --git a/examples/rfmip-clear-sky/Makefile b/examples/rfmip-clear-sky/Makefile
@@ -68,4 +68,4 @@ mo_rfmip_io.o:          mo_rfmip_io.F90          mo_simple_netcdf.o
 mo_load_coefficients.o: mo_load_coefficients.F90 mo_simple_netcdf.o
 
 clean:
-	-rm rrtmgp_rfmip_lw *.o *.mod *.optrpt ../*.optrpt
+	-rm rrtmgp_rfmip_sw rrtmgp_rfmip_lw *.o *.mod *.optrpt ../*.optrpt
diff --git a/rrtmgp/data/coefficients_lw.nc → ...gp/data/rrtmgp-data-lw-g256-2018-12-04.nc b/rrtmgp/data/coefficients_lw.nc → ...gp/data/rrtmgp-data-lw-g256-2018-12-04.nc
diff --git a/rrtmgp/data/coefficients_sw.nc → ...gp/data/rrtmgp-data-sw-g240-2018-12-04.nc b/rrtmgp/data/coefficients_sw.nc → ...gp/data/rrtmgp-data-sw-g240-2018-12-04.nc
diff --git a/rrtmgp/kernels/mo_gas_optics_kernels.F90 b/rrtmgp/kernels/mo_gas_optics_kernels.F90
@@ -250,7 +250,7 @@ subroutine gas_optical_depths_minor(ncol, nlay,ngpt,ngas,nflav,   &
     ! -----------------
     ! local variables
     real(wp), parameter :: PaTohPa = 0.01
-    real(wp), dimension(ngas) :: vmr
+    real(wp) :: vmr_fact, dry_fact             ! conversion from column abundance to dry vol. mixing ratio;
     real(wp) :: scaling, kminor_loc, tau_minor ! minor species absorption coefficient, optical depth
     integer  :: icol, ilay, iflav, igpt, imnr
     integer  :: itl, itu, iml, imu
@@ -269,7 +269,6 @@ subroutine gas_optical_depths_minor(ncol, nlay,ngpt,ngas,nflav,   &
           !
           if(layer_limits(icol,1) > 0) then
             do ilay = layer_limits(icol,1), layer_limits(icol,2)
-              vmr(1:ngas) = col_gas(icol,ilay,1:ngas)/col_gas(icol,ilay,0)
               !
               ! Scaling of minor gas absortion coefficient begins with column amount of minor gas
               !
@@ -283,11 +282,13 @@ subroutine gas_optical_depths_minor(ncol, nlay,ngpt,ngas,nflav,   &
                 !
                 scaling = scaling * (PaTohPa*play(icol,ilay)/tlay(icol,ilay))
                 if(idx_minor_scaling(imnr) > 0) then  ! there is a second gas that affects this gas's absorption
+                  vmr_fact = 1._wp / col_gas(icol,ilay,0)
+                  dry_fact = 1._wp / (1._wp + col_gas(icol,ilay,idx_h2o) * vmr_fact)
                   ! scale by density of special gas
                   if (scale_by_complement(imnr)) then ! scale by densities of all gases but the special one
-                    scaling = scaling * (1._wp - vmr(idx_minor_scaling(imnr)) / (1._wp+vmr(idx_h2o)) )
+                    scaling = scaling * (1._wp - col_gas(icol,ilay,idx_minor_scaling(imnr)) * vmr_fact * dry_fact)
                   else
-                    scaling = scaling *          vmr(idx_minor_scaling(imnr)) / (1._wp+vmr(idx_h2o))
+                    scaling = scaling *          col_gas(icol,ilay,idx_minor_scaling(imnr)) * vmr_fact * dry_fact
                   endif
                 endif
               endif