Changeset 661 for trunk/NEMO/OPA_SRC/DYN

Timestamp:

2007-05-25T17:51:50+02:00 (17 years ago)

Author:

opalod

Message:

nemo_v2_bugfix_039:RB: change dom_vvl functions to corresponding subroutines for compatibility with AGRIF

Location:

trunk/NEMO/OPA_SRC/DYN

Files:

• dynnxt.F90 (modified) (1 diff)
• dynspg_flt.F90 (modified) (1 diff)
• dynspg_ts.F90 (modified) (1 diff)

trunk/NEMO/OPA_SRC/DYN/dynnxt.F90

@@ -135 +135 @@
          ! Scale factors at before and after time step
          ! -------------------------------------------
-         zfse3ub(:,:,:) = sfe3( zsshub, 'U' )   ;    zfse3ua(:,:,:) = sfe3( zsshua, 'U' )
-         zfse3vb(:,:,:) = sfe3( zsshvb, 'V' )   ;    zfse3va(:,:,:) = sfe3( zsshva, 'V' )
+         CALL dom_vvl_sf( zsshub, 'U', zfse3ub ) ;    CALL dom_vvl_sf( zsshua, 'U', zfse3ua ) 
+         CALL dom_vvl_sf( zsshvb, 'V', zfse3vb ) ;    CALL dom_vvl_sf( zsshva, 'V', zfse3va ) 
 
          ! Asselin filtered scale factor at now time step
          ! ----------------------------------------------
          IF( (neuler == 0 .AND. kt == nit000) .OR. lk_dynspg_ts ) THEN
-            zfse3un(:,:,:) = sfe3ini( 'U' )
-            zfse3vn(:,:,:) = sfe3ini( 'V' )
+            CALL dom_vvl_sf_ini( 'U', zfse3un ) ;   CALL dom_vvl_sf_ini( 'V', zfse3vn ) 
          ELSE
             zsshun(:,:) = atfp * ( zsshub(:,:) + zsshua(:,:) ) + atfp1 * sshu(:,:)
             zsshvn(:,:) = atfp * ( zsshvb(:,:) + zsshva(:,:) ) + atfp1 * sshv(:,:)
-            zfse3un(:,:,:) = sfe3( zsshun, 'U' )   ;    zfse3vn(:,:,:) = sfe3( zsshvn, 'V' )
+            CALL dom_vvl_sf( zsshun, 'U', zfse3un ) ;   CALL dom_vvl_sf( zsshvn, 'V', zfse3vn ) 
          ENDIF
 

trunk/NEMO/OPA_SRC/DYN/dynspg_flt.F90

@@ -187 +187 @@
          ! Scale factors at before and after time step
          ! -------------------------------------------
-         zfse3ua(:,:,:) = sfe3( zsshua, 'U' )    ;    zfse3ub(:,:,:) = sfe3( zsshub, 'U' )
-         zfse3va(:,:,:) = sfe3( zsshva, 'V' )    ;    zfse3vb(:,:,:) = sfe3( zsshvb, 'V' )
+         CALL dom_vvl_sf( zsshub, 'U', zfse3ub ) ;    CALL dom_vvl_sf( zsshua, 'U', zfse3ua )
+         CALL dom_vvl_sf( zsshvb, 'V', zfse3vb ) ;    CALL dom_vvl_sf( zsshva, 'V', zfse3va )
+
 
          ! Thickness weighting

trunk/NEMO/OPA_SRC/DYN/dynspg_ts.F90

@@ -511 +511 @@
             ! Scale factors at before and after time step
             ! -------------------------------------------
-            zfse3un_e(:,:,:) = sfe3( zsshun_e, 'U' )    ;    zfse3vn_e(:,:,:) = sfe3( zsshvn_e, 'V' )
+            CALL dom_vvl_sf( zsshun_e, 'U', zfse3un_e ) ;   CALL dom_vvl_sf( zsshvn_e, 'V', zfse3vn_e )
 
             ! Ocean depth at U- and V-points