Changeset 1725 for trunk/LMDZ.GENERIC/libf/phystd

Timestamp:

Jul 21, 2017, 5:30:44 PM (7 years ago)

Author:

jvatant

Message:

Optimization of the optci/cv routines

• The repeated calls to huge matrices gasi/v increased dramatically the execution time because of memory access
• Added a tmpk variable
• Save ~ 50% time on the RT, ~30% on the whole code on the tested simulations

JVO

Location:

trunk/LMDZ.GENERIC/libf/phystd

Files:

• optci.F90 (modified) (2 diffs)
• optcv.F90 (modified) (2 diffs)

trunk/LMDZ.GENERIC/libf/phystd/optci.F90

@@ -64 +64 @@
   real*8  KCOEF(4)
   integer NVAR(L_LEVELS)
+  
+  ! temporary variables to reduce memory access time to gasi
+  real*8 tmpk(2,2)
+  real*8 tmpkvar(2,2,2)
 
   ! temporary variables for multiple aerosol calculation
@@ -235 +239 @@
 
            if(L_REFVAR.eq.1)then ! added by RW for special no variable case
-              KCOEF(1) = GASI(MT(K),MP(K),1,NW,NG)
-              KCOEF(2) = GASI(MT(K),MP(K)+1,1,NW,NG)
-              KCOEF(3) = GASI(MT(K)+1,MP(K)+1,1,NW,NG)
-              KCOEF(4) = GASI(MT(K)+1,MP(K),1,NW,NG)
+           
+              ! JVO 2017 : added tmpk because the repeated calls to gasi/v increased dramatically
+              ! the execution time of optci/v -> ~ factor 2 on the whole radiative
+              ! transfer on the tested simulations !
+
+              tmpk = GASI(MT(K):MT(K)+1,MP(K):MP(K)+1,1,NW,NG)
+
+              KCOEF(1) = tmpk(1,1) ! KCOEF(1) = GASI(MT(K),MP(K),1,NW,NG)
+              KCOEF(2) = tmpk(1,2) ! KCOEF(2) = GASI(MT(K),MP(K)+1,1,NW,NG)
+              KCOEF(3) = tmpk(2,2) ! KCOEF(3) = GASI(MT(K)+1,MP(K)+1,1,NW,NG)
+              KCOEF(4) = tmpk(2,1) ! KCOEF(4) = GASI(MT(K)+1,MP(K),1,NW,NG)
+
            else
 
-              KCOEF(1) = GASI(MT(K),MP(K),NVAR(K),NW,NG) + WRATIO(K)*     &
-                   (GASI(MT(K),MP(K),NVAR(K)+1,NW,NG) -                   &
-                   GASI(MT(K),MP(K),NVAR(K),NW,NG))
-
-              KCOEF(2) = GASI(MT(K),MP(K)+1,NVAR(K),NW,NG) + WRATIO(K)*   &
-                   (GASI(MT(K),MP(K)+1,NVAR(K)+1,NW,NG) -                 &
-                   GASI(MT(K),MP(K)+1,NVAR(K),NW,NG))
-
-              KCOEF(3) = GASI(MT(K)+1,MP(K)+1,NVAR(K),NW,NG) + WRATIO(K)* &
-                   (GASI(MT(K)+1,MP(K)+1,NVAR(K)+1,NW,NG) -               &
-                   GASI(MT(K)+1,MP(K)+1,NVAR(K),NW,NG))
-
-              KCOEF(4) = GASI(MT(K)+1,MP(K),NVAR(K),NW,NG) + WRATIO(K)*   &
-                   (GASI(MT(K)+1,MP(K),NVAR(K)+1,NW,NG) -                 &
-                   GASI(MT(K)+1,MP(K),NVAR(K),NW,NG))
+              tmpkvar = GASI(MT(K):MT(K)+1,MP(K):MP(K)+1,NVAR(K):NVAR(K)+1,NW,NG)
+
+              KCOEF(1) = tmpkvar(1,1,1) + WRATIO(K) *  &
+                        ( tmpkvar(1,1,2)-tmpkvar(1,1,1) )
+
+              KCOEF(2) = tmpkvar(1,2,1) + WRATIO(K) *  &
+                        ( tmpkvar(1,2,2)-tmpkvar(1,2,1) )
+
+              KCOEF(3) = tmpkvar(2,2,1) + WRATIO(K) *  &
+                        ( tmpkvar(2,2,2)-tmpkvar(2,2,1) )
+              
+              KCOEF(4) = tmpkvar(2,1,1) + WRATIO(K) *  &
+                        ( tmpkvar(2,1,2)-tmpkvar(2,1,1) )
 
            endif

trunk/LMDZ.GENERIC/libf/phystd/optcv.F90

@@ -73 +73 @@
   real*8  KCOEF(4)
   integer NVAR(L_LEVELS)
+  
+  ! temporary variables to reduce memory access time to gasv
+  real*8 tmpk(2,2)
+  real*8 tmpkvar(2,2,2)
 
   ! temporary variables for multiple aerosol calculation
@@ -226 +230 @@
 
            if(L_REFVAR.eq.1)then ! added by RW for special no variable case
-              KCOEF(1) = GASV(MT(K),MP(K),1,NW,NG)
-              KCOEF(2) = GASV(MT(K),MP(K)+1,1,NW,NG)
-              KCOEF(3) = GASV(MT(K)+1,MP(K)+1,1,NW,NG)
-              KCOEF(4) = GASV(MT(K)+1,MP(K),1,NW,NG)
+           
+              ! JVO 2017 : added tmpk because the repeated calls to gasi/v increased dramatically
+              ! the execution time of optci/v -> ~ factor 2 on the whole radiative
+              ! transfer on the tested simulations !
+
+              tmpk = GASV(MT(K):MT(K)+1,MP(K):MP(K)+1,1,NW,NG)
+              
+              KCOEF(1) = tmpk(1,1) ! KCOEF(1) = GASV(MT(K),MP(K),1,NW,NG)
+              KCOEF(2) = tmpk(1,2) ! KCOEF(2) = GASV(MT(K),MP(K)+1,1,NW,NG)
+              KCOEF(3) = tmpk(2,2) ! KCOEF(3) = GASV(MT(K)+1,MP(K)+1,1,NW,NG)
+              KCOEF(4) = tmpk(2,1) ! KCOEF(4) = GASV(MT(K)+1,MP(K),1,NW,NG)
+
            else
 
-              KCOEF(1) = GASV(MT(K),MP(K),NVAR(K),NW,NG) + WRATIO(K)*    &
-                   (GASV(MT(K),MP(K),NVAR(K)+1,NW,NG) -                  &
-                   GASV(MT(K),MP(K),NVAR(K),NW,NG))
-
-              KCOEF(2) = GASV(MT(K),MP(K)+1,NVAR(K),NW,NG) + WRATIO(K)*  &
-                   (GASV(MT(K),MP(K)+1,NVAR(K)+1,NW,NG) -                &
-                   GASV(MT(K),MP(K)+1,NVAR(K),NW,NG))
-
-              KCOEF(3) = GASV(MT(K)+1,MP(K)+1,NVAR(K),NW,NG) + WRATIO(K)*&
-                   (GASV(MT(K)+1,MP(K)+1,NVAR(K)+1,NW,NG) -              &
-                   GASV(MT(K)+1,MP(K)+1,NVAR(K),NW,NG))
-
-              KCOEF(4) = GASV(MT(K)+1,MP(K),NVAR(K),NW,NG) + WRATIO(K)*  &
-                   (GASV(MT(K)+1,MP(K),NVAR(K)+1,NW,NG) -                &
-                   GASV(MT(K)+1,MP(K),NVAR(K),NW,NG))
+              tmpkvar = GASV(MT(K):MT(K)+1,MP(K):MP(K)+1,NVAR(K):NVAR(K)+1,NW,NG)
+
+              KCOEF(1) = tmpkvar(1,1,1) + WRATIO(K) *  &
+                        ( tmpkvar(1,1,2)-tmpkvar(1,1,1) )
+
+              KCOEF(2) = tmpkvar(1,2,1) + WRATIO(K) *  &
+                        ( tmpkvar(1,2,2)-tmpkvar(1,2,1) )
+
+              KCOEF(3) = tmpkvar(2,2,1) + WRATIO(K) *  &
+                        ( tmpkvar(2,2,2)-tmpkvar(2,2,1) )
+              
+              KCOEF(4) = tmpkvar(2,1,1) + WRATIO(K) *  &
+                        ( tmpkvar(2,1,2)-tmpkvar(2,1,1) )
+
 
            endif