Changeset 3175 for branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/trcsub.F90

Timestamp:

2011-11-23T23:07:50+01:00 (12 years ago)

Author:

cetlod

Message:

Add missing average of rhop when substepping in TOP+some minor corrections

File:

• branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/trcsub.F90 (modified) (9 diffs)

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/TOP_SRC/trcsub.F90

@@ -91 +91 @@
           tsn_tm  (:,:,:,jp_tem) = tsn_tm  (:,:,:,jp_tem) + tsn  (:,:,:,jp_tem) * fse3t(:,:,:)  
           tsn_tm  (:,:,:,jp_sal) = tsn_tm  (:,:,:,jp_sal) + tsn  (:,:,:,jp_sal) * fse3t(:,:,:)  
+          rhop_tm (:,:,:)        = rhop_tm (:,:,:)        + rhop (:,:,:)        * fse3t(:,:,:)  
           avt_tm  (:,:,:)        = avt_tm  (:,:,:)        + avt  (:,:,:)        * fse3w(:,:,:)  
 # if defined key_zdfddm
@@ -171 +172 @@
          wn_temp    (:,:,:)      = wn    (:,:,:)
          tsn_temp   (:,:,:,:)    = tsn   (:,:,:,:)
+         rhop_temp  (:,:,:)      = rhop  (:,:,:)
          avt_temp   (:,:,:)      = avt   (:,:,:)
 # if defined key_zdfddm
@@ -282 +284 @@
          tsn_tm   (:,:,:,jp_tem) = tsn_tm  (:,:,:,jp_tem) + tsn  (:,:,:,jp_tem) * e3t_temp(:,:,:)  
          tsn_tm   (:,:,:,jp_sal) = tsn_tm  (:,:,:,jp_sal) + tsn  (:,:,:,jp_sal) * e3t_temp(:,:,:)  
+         rhop_tm (:,:,:)         = rhop_tm (:,:,:)        + rhop (:,:,:)        * e3t_temp(:,:,:)  
          avt_tm   (:,:,:)        = avt_tm  (:,:,:)        + avt  (:,:,:)        * e3w_temp(:,:,:)  
 # if defined key_zdfddm
@@ -371 +374 @@
                   tsn  (ji,jj,jk,jp_tem) = tsn_tm  (ji,jj,jk,jp_tem) * z1_ne3t
                   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
                   avt  (ji,jj,jk)        = avt_tm  (ji,jj,jk)        * z1_ne3w
 # if defined key_zdfddm
@@ -467 +471 @@
          CALL lbc_lnk( tsn   (:,:,:,jp_tem), 'T', 1. ) 
          CALL lbc_lnk( tsn   (:,:,:,jp_sal), 'T', 1. ) 
+         CALL lbc_lnk( rhop  (:,:,:)       , 'T', 1. ) 
          CALL lbc_lnk( avt   (:,:,:)       , 'W', 1. ) 
 # if defined key_zdfddm
-          CALL lbc_lnk( avs  (:,:,:)       , 'W', 1. ) 
+         CALL lbc_lnk( avs  (:,:,:)       , 'W', 1. ) 
 # endif
 #if defined key_ldfslp
@@ -572 +577 @@
       tsn_tm  (:,:,:,jp_tem) = tsn  (:,:,:,jp_tem) * fse3t(:,:,:)  
       tsn_tm  (:,:,:,jp_sal) = tsn  (:,:,:,jp_sal) * fse3t(:,:,:)  
+      rhop_tm (:,:,:)        = rhop (:,:,:)        * fse3t(:,:,:)  
       avt_tm  (:,:,:)        = avt  (:,:,:)        * fse3w(:,:,:)  
 # if defined key_zdfddm
@@ -672 +678 @@
       wn    (:,:,:)   =  wn_temp    (:,:,:)
       tsn   (:,:,:,:) =  tsn_temp   (:,:,:,:)
+      rhop  (:,:,:)   =  rhop_temp  (:,:,:)
       avt   (:,:,:)   =  avt_temp   (:,:,:)
 # if defined key_zdfddm
@@ -793 +800 @@
          tsn_tm  (:,:,:,jp_tem) = tsn  (:,:,:,jp_tem) * fse3t(:,:,:)  
          tsn_tm  (:,:,:,jp_sal) = tsn  (:,:,:,jp_sal) * fse3t(:,:,:)  
+         rhop_tm (:,:,:)        = rhop (:,:,:)        * fse3t(:,:,:)  
          avt_tm  (:,:,:)        = avt  (:,:,:)        * fse3w(:,:,:)  
 # if defined key_zdfddm
@@ -1051 +1059 @@
          &      avs_tm(jpi,jpj,jpk)         ,  avs_temp(jpi,jpj,jpk) ,   &
 # endif
+         &      rhop_tm(jpi,jpj,jpk)        ,  rhop_temp(jpi,jpj,jpk) ,  &
 #if defined key_traldf_c3d
          &      ahtt_tm(jpi,jpj,jpk)        ,  ahtt_temp(jpi,jpj,jpk),   &