Changeset 2239 for branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/ASM

Timestamp:

2010-10-13T00:03:11+02:00 (14 years ago)

Author:

rblod

Message:

First commit to compile ORCA2_LIM for next nemo v3.3

Location:

branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/ASM

Files:

• asminc.F90 (modified) (6 diffs)
• asmtrj.F90 (modified) (2 diffs)

branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/ASM/asminc.F90

@@ -47 +47 @@
       & ub, un, ua,    &
       & vb, vn, va,    &
-      & tb, tn, ta,    &
-      & sb, sn, sa,    &
+      & tsb, tsn, tsa, &
       & sshb, sshn,    &
       & rhd, rhop,     &
       & rotb, rotn,    &
       & hdivb, hdivn,  &
-      & gtu, gsu, gru, &
-      & gtv, gsv, grv 
+      & gtsu, gru,     &
+      & gtsv, grv 
    USE divcur, ONLY : &   ! Horizontal divergence and relative vorticity
       & div_cur
@@ -724 +723 @@
             ! Update the tracer tendencies
             DO jk = 1, jpkm1
-               ta(:,:,jk) = ta(:,:,jk) + t_bkginc(:,:,jk) * zincwgt  
-               sa(:,:,jk) = sa(:,:,jk) + s_bkginc(:,:,jk) * zincwgt
+               tsa(:,:,jk,jp_tem) = tsa(:,:,jk,jp_tem) + t_bkginc(:,:,jk) * zincwgt  
+               tsa(:,:,jk,jp_sal) = tsa(:,:,jk,jp_sal) + s_bkginc(:,:,jk) * zincwgt
             END DO
 
@@ -733 +732 @@
                   DO jj = 1, jpj
                      DO ji= 1, jpi
-                        sa(ji,jj,jk) = MAX( sa(ji,jj,jk), salfixmin )
+                        tsa(ji,jj,jk,jp_sal) = MAX( tsa(ji,jj,jk,jp_sal), salfixmin )
                      END DO
                   END DO
@@ -758 +757 @@
 
             ! Initialize the now fields with the background + increment
-            tn(:,:,:) = t_bkg(:,:,:) + t_bkginc(:,:,:)   
-            sn(:,:,:) = s_bkg(:,:,:) + s_bkginc(:,:,:)   
+            tsn(:,:,:,jp_tem) = t_bkg(:,:,:) + t_bkginc(:,:,:)   
+            tsn(:,:,:,jp_sal) = s_bkg(:,:,:) + s_bkginc(:,:,:)   
 
             ! Optional salinity fix
@@ -766 +765 @@
                   DO jj = 1, jpj
                      DO ji= 1, jpi
-                        sn(ji,jj,jk) = MAX( sn(ji,jj,jk), salfixmin )
+                        tsn(ji,jj,jk,jp_sal) = MAX( tsn(ji,jj,jk,jp_sal), salfixmin )
                      END DO
                   END DO
@@ -772 +771 @@
             ENDIF
 
-            tb(:,:,:) = tn(:,:,:)                        ! Update before fields
-            sb(:,:,:) = sn(:,:,:)
-
-            CALL eos( tb, sb, rhd, rhop )                ! Before potential and in situ densities
+            tsb(:,:,:,:) = tsn(:,:,:,:)                        ! Update before fields
+
+            CALL eos( tsb, rhd, rhop )                ! Before potential and in situ densities
          
 #if ! defined key_c1d
             IF( ln_zps ) &
-               &  CALL zps_hde( nit000, tb, sb, rhd,  &  ! Partial steps: before horizontal derivative
-               &                gtu, gsu, gru,        &  ! of T, S, rd at the bottom ocean level
-               &                gtv, gsv, grv )
+               &  CALL zps_hde( nit000, jpts, tsb,   &  ! Partial steps: before horizontal derivative
+               &                gtsu, gtsv, rhd,        &  ! of T, S, rd at the bottom ocean level
+               &                gru , grv )
 #endif
 

branches/DEV_r2106_LOCEAN2010/NEMO/OPA_SRC/ASM/asmtrj.F90

@@ -224 +224 @@
 #if defined key_ldfslp
             IF(lwp) WRITE(numout,*) ' Compute the slopes of neutral surface...'
-            CALL bn2( tb, sb, rn2 ) 
+            CALL bn2( tsb, rn2 ) 
             CALL ldf_slp( nit000, rhd, rn2 )
 #endif
@@ -280 +280 @@
 
 END MODULE asmtrj
-   
-