Changeset 7953 for branches/2017/dev_r7881_HPC09_ZDF/NEMOGCM/NEMO/TOP_SRC/trcsub.F90

Timestamp:

2017-04-23T09:30:41+02:00 (7 years ago)

Author:

gm

Message:

#1880 (HPC-09): add zdfphy (the ZDF manager) + remove all key_...

File:

• branches/2017/dev_r7881_HPC09_ZDF/NEMOGCM/NEMO/TOP_SRC/trcsub.F90 (modified) (9 diffs)

branches/2017/dev_r7881_HPC09_ZDF/NEMOGCM/NEMO/TOP_SRC/trcsub.F90

@@ -84 +84 @@
           tsn_tm  (:,:,:,jp_sal) = tsn_tm  (:,:,:,jp_sal) + tsn  (:,:,:,jp_sal) * e3t_n(:,:,:)  
           rhop_tm (:,:,:)        = rhop_tm (:,:,:)        + rhop (:,:,:)        * e3t_n(:,:,:)  
-          avt_tm  (:,:,:)        = avt_tm  (:,:,:)        + avt  (:,:,:)        * e3w_n(:,:,:)  
-# if defined key_zdfddm
           avs_tm  (:,:,:)        = avs_tm  (:,:,:)        + avs  (:,:,:)        * e3w_n(:,:,:)  
-# endif
          IF( l_ldfslp ) THEN
             uslp_tm (:,:,:)      = uslp_tm (:,:,:)        + uslp (:,:,:)
@@ -122 +119 @@
          tsn_temp   (:,:,:,:)    = tsn   (:,:,:,:)
          rhop_temp  (:,:,:)      = rhop  (:,:,:)    
-         avt_temp   (:,:,:)      = avt   (:,:,:)
-# if defined key_zdfddm
          avs_temp   (:,:,:)      = avs   (:,:,:)
-# endif
          IF( l_ldfslp ) THEN
             uslp_temp  (:,:,:)   = uslp  (:,:,:)   ;   wslpi_temp (:,:,:)   = wslpi (:,:,:)
@@ -161 +155 @@
          tsn_tm   (:,:,:,jp_sal) = tsn_tm  (:,:,:,jp_sal) + tsn  (:,:,:,jp_sal) * e3t_n(:,:,:)  
          rhop_tm (:,:,:)         = rhop_tm (:,:,:)        + rhop (:,:,:)        * e3t_n(:,:,:)  
-         avt_tm   (:,:,:)        = avt_tm  (:,:,:)        + avt  (:,:,:)        * e3w_n(:,:,:)  
-# if defined key_zdfddm
          avs_tm   (:,:,:)        = avs_tm  (:,:,:)        + avs  (:,:,:)        * e3w_n(:,:,:)  
-# endif
          IF( l_ldfslp ) THEN
             uslp_tm  (:,:,:)     = uslp_tm (:,:,:)        + uslp (:,:,:) 
@@ -245 +236 @@
                   tsn  (ji,jj,jk,jp_sal) = tsn_tm  (ji,jj,jk,jp_sal) * z1_ne3t
                   rhop (ji,jj,jk)        = rhop_tm (ji,jj,jk)        * z1_ne3t
-!!gm : BUG? ==>> for avt & avs I don't understand the division by e3w
-                  avt  (ji,jj,jk)        = avt_tm  (ji,jj,jk)        * z1_ne3w
-# if defined key_zdfddm
+!!gm : BUG ==>> for avs I don't understand the division by e3w
                   avs  (ji,jj,jk)        = avs_tm  (ji,jj,jk)        * z1_ne3w
-# endif
                END DO
             END DO
@@ -297 +285 @@
       rhop_tm (:,:,:)        = rhop (:,:,:)        * e3t_n(:,:,:)  
 !!gm : BUG? ==>> for avt & avs I don't understand the division by e3w
-      avt_tm  (:,:,:)        = avt  (:,:,:)        * e3w_n(:,:,:)  
-# if defined key_zdfddm
       avs_tm  (:,:,:)        = avs  (:,:,:)        * e3w_n(:,:,:)  
-# endif
       IF( l_ldfslp ) THEN
          wslpi_tm(:,:,:)     = wslpi(:,:,:)
@@ -354 +339 @@
       tsn   (:,:,:,:) =  tsn_temp   (:,:,:,:)
       rhop  (:,:,:)   =  rhop_temp  (:,:,:)
-      avt   (:,:,:)   =  avt_temp   (:,:,:)
-# if defined key_zdfddm
       avs   (:,:,:)   =  avs_temp   (:,:,:)
-# endif
       IF( l_ldfslp ) THEN
          wslpi (:,:,:)=  wslpi_temp (:,:,:)
@@ -396 +378 @@
          tsn_tm  (:,:,:,jp_sal) = tsn  (:,:,:,jp_sal) * e3t_n(:,:,:)  
          rhop_tm (:,:,:)        = rhop (:,:,:)        * e3t_n(:,:,:)  
-         avt_tm  (:,:,:)        = avt  (:,:,:)        * e3w_n(:,:,:)  
-# if defined key_zdfddm
          avs_tm  (:,:,:)        = avs  (:,:,:)        * e3w_n(:,:,:)  
-# endif
       IF( l_ldfslp ) THEN
          uslp_tm (:,:,:)        = uslp (:,:,:)
@@ -534 +513 @@
       !
       ALLOCATE( un_temp(jpi,jpj,jpk)        ,  vn_temp(jpi,jpj,jpk)  ,   &
-         &      wn_temp(jpi,jpj,jpk)        ,  avt_temp(jpi,jpj,jpk) ,   &
+         &      wn_temp(jpi,jpj,jpk)        ,                            &
          &      rhop_temp(jpi,jpj,jpk)      ,  rhop_tm(jpi,jpj,jpk) ,   &
          &      sshn_temp(jpi,jpj)          ,  sshb_temp(jpi,jpj) ,      &
@@ -548 +527 @@
          &      fr_i_temp(jpi,jpj)          ,  fr_i_tm(jpi,jpj) ,        &
          &      wndm_temp(jpi,jpj)          ,  wndm_tm(jpi,jpj) ,        &
-# if defined key_zdfddm
          &      avs_tm(jpi,jpj,jpk)         ,  avs_temp(jpi,jpj,jpk) ,   &
-# endif
          &      hdivn_temp(jpi,jpj,jpk)     ,  hdivb_temp(jpi,jpj,jpk),  &
          &      un_tm(jpi,jpj,jpk)          ,  vn_tm(jpi,jpj,jpk)  ,     &
-         &      avt_tm(jpi,jpj,jpk)                                ,     &
          &      sshn_tm(jpi,jpj)            ,  sshb_hold(jpi,jpj) ,      &
          &      tsn_tm(jpi,jpj,jpk,2)       ,                            &