Changeset 2789 for branches/2011/dev_r2787_LOCEAN3_TRA_TRP/NEMOGCM/NEMO/OPA_SRC/FLO/flowri.F90

Timestamp:

2011-06-27T13:18:25+02:00 (13 years ago)

Author:

cetlod

Message:

Implementation of the merge of TRA/TRP : first guess, see ticket #842

File:

• branches/2011/dev_r2787_LOCEAN3_TRA_TRP/NEMOGCM/NEMO/OPA_SRC/FLO/flowri.F90 (modified) (3 diffs)

branches/2011/dev_r2787_LOCEAN3_TRA_TRP/NEMOGCM/NEMO/OPA_SRC/FLO/flowri.F90

@@ -127 +127 @@
                   ! Change  by Alexandra Bozec et Jean-Philippe Boulanger
                   ! We save  the instantaneous profile of T and S of the column     
-                  ! ztemp(jfl)=tn(iafloc,ibfloc,icfl)
-                  ! zsal(jfl)=sn(iafloc,ibfloc,icfl)
-                  ztemp(1:jpk,jfl) = tn(iafloc,ibfloc,1:jpk)
-                  zsal (1:jpk,jfl) = sn(iafloc,ibfloc,1:jpk)            
+                  ! ztemp(jfl)=tsn(iafloc,ibfloc,icfl,jp_tem)
+                  ! zsal(jfl)=tsn(iafloc,ibfloc,icfl,jp_sal)
+                  ztemp(1:jpk,jfl) = tsn(iafloc,ibfloc,1:jpk,jp_tem)
+                  zsal (1:jpk,jfl) = tsn(iafloc,ibfloc,1:jpk,jp_sal)            
                ELSE
                   flxx(jfl) = 0.
@@ -187 +187 @@
                ! Change  by Alexandra Bozec et Jean-Philippe Boulanger
                ! We save  the instantaneous profile of T and S of the column     
-               !     ztemp(jfl)=tn(iafloc,ibfloc,icfl)
-               !     zsal(jfl)=sn(iafloc,ibfloc,icfl)
-               ztemp(1:jpk,jfl) = tn(iafloc,ibfloc,1:jpk)
-               zsal (1:jpk,jfl) = sn(iafloc,ibfloc,1:jpk)
+               !     ztemp(jfl)=tsn(iafloc,ibfloc,icfl,jp_tem)
+               !     zsal(jfl)=tsn(iafloc,ibfloc,icfl,jp_sal)
+               ztemp(1:jpk,jfl) = tsn(iafloc,ibfloc,1:jpk,jp_tem)
+               zsal (1:jpk,jfl) = tsn(iafloc,ibfloc,1:jpk,jp_sal)
             END DO
          ENDIF
@@ -224 +224 @@
       !         ibfloc=ibfln
       !# endif
-      !         ztemp(jfl)=tn(iafloc,ibfloc,jk)
-      !         zsal(jfl)=sn(iaflo!,ibfloc,jk)
+      !         ztemp(jfl)=tsn(iafloc,ibfloc,jk,jp_tem)
+      !         zsal(jfl)=tsn(iaflo!,ibfloc,jk,jp_sal)
       !# if defined key_mpp_mpi   
       !        ELSE