Changeset 361 for trunk/NEMO

Timestamp:

2005-12-21T11:58:28+01:00 (19 years ago)

Author:

opalod

Message:

nemo_v1_update_033 : RB + CT : Add new surface pressure gradient algorithms

Location:

trunk/NEMO

Files:

• OFF_SRC/DOM/dom_oce.F90 (modified) (1 diff)
• OFF_SRC/DYN/dynspg.F90 (added)
• OFF_SRC/DYN/dynspg_fsc.F90 (deleted)
• OFF_SRC/DYN/dynspg_fsc_atsk.F90 (deleted)
• TOP_SRC/TRP/trcadv_cen2.F90 (modified) (1 diff)
• TOP_SRC/TRP/trcadv_muscl.F90 (modified) (1 diff)
• TOP_SRC/TRP/trcadv_muscl2.F90 (modified) (1 diff)
• TOP_SRC/TRP/trcadv_smolar.F90 (modified) (1 diff)
• TOP_SRC/TRP/trcadv_tvd.F90 (modified) (2 diffs)

trunk/NEMO/OFF_SRC/DOM/dom_oce.F90

@@ -48 +48 @@
       npse, npsw,      &  !: index of south east and south west processor
       nbne, nbnw,      &  !: logical of north east & north west processor
-      nbse, nbsw          !: logical of south east & south west processor
+      nbse, nbsw,      &  !: logical of south east & south west processor
+      nidom
 
    INTEGER, PUBLIC, DIMENSION(jpi) ::   &   !:

trunk/NEMO/TOP_SRC/TRP/trcadv_cen2.F90

@@ -273 +273 @@
 
          ! Surface value
-         IF( lk_dynspg_fsc ) THEN       ! free surface-constant volume
+         IF ( lk_dynspg_rl ) THEN       ! rigid lid : flux set to zero
+            zwx(:,:, 1 ) = 0.e0  
+         ELSE                           ! free surface-constant volume
             zwx(:,:, 1 ) = zwn(:,:,1) * trn(:,:,1,jn)
-         ELSE                           ! rigid lid : flux set to zero
-            zwx(:,:, 1 ) = 0.e0  
          ENDIF
 

trunk/NEMO/TOP_SRC/TRP/trcadv_muscl.F90

@@ -293 +293 @@
          END DO
          ! surface values
-         IF( lk_dynspg_fsc .OR. lk_dynspg_fsc_tsk ) THEN        ! free surface-constant volume
+         IF( lk_dynspg_rl ) THEN        ! rigid lid : flux set to zero
+            zt1(:,:, 1 ) = 0.e0
+         ELSE                           ! free surface
             zt1(:,:, 1 ) = zwn(:,:,1) * trb(:,:,1,jn)
-         ELSE                                                   ! rigid lid : flux set to zero
-            zt1(:,:, 1 ) = 0.e0
          ENDIF
 

trunk/NEMO/TOP_SRC/TRP/trcadv_muscl2.F90

@@ -357 +357 @@
 
          ! surface values
-         IF( lk_dynspg_fsc .OR. lk_dynspg_fsc_tsk ) THEN        ! free surface-constant volume
+         IF( lk_dynspg_rl ) THEN        ! rigid lid : flux set to zero
+            zt1(:,:, 1 ) = 0.e0
+         ELSE                           ! free surface
             zt1(:,:, 1 ) = zwn(:,:,1) * trb(:,:,1,jn)
-         ELSE                                                   ! rigid lid : flux set to zero
-            zt1(:,:, 1 ) = 0.e0
          ENDIF
 

trunk/NEMO/TOP_SRC/TRP/trcadv_smolar.F90

@@ -186 +186 @@
 
          ! Surface value
-         IF( lk_dynspg_fsc .OR. lk_dynspg_fsc_tsk ) THEN        ! free surface-constant volume
+         IF( lk_dynspg_rl ) THEN        ! rigid lid : flux set to zero
+            zkz(:,:, 1 ) = 0.e0  
+         ELSE                           ! free surface
             zkz(:,:, 1 ) = zwn(:,:,1) * trn(:,:,1,jn) * tmask(ji,jj,1)
-         ELSE                                                   ! rigid lid : flux set to zero
-            zkz(:,:, 1 ) = 0.e0  
          ENDIF
 

trunk/NEMO/TOP_SRC/TRP/trcadv_tvd.F90

@@ -135 +135 @@
          ! upstream tracer flux in the k direction
          ! Surface value
-         IF( lk_dynspg_fsc .OR. lk_dynspg_fsc_tsk ) THEN   ! free surface-constant volume
+         IF( lk_dynspg_rl ) THEN   ! rigid lid : flux set to zero
+            ztw(:,:,1) = 0.e0
+         ELSE                      ! free surface 
             DO jj = 1, jpj
                DO ji = 1, jpi
@@ -142 +144 @@
                END DO
             END DO
-         ELSE                                              ! rigid lid : flux set to zero
-            ztw(:,:,1) = 0.e0
          ENDIF