Changeset 4147 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90

Timestamp:

2013-11-04T12:51:55+01:00 (10 years ago)

Author:

cetlod

Message:

merge in dev_LOCEAN_2013, the 1st development branch dev_r3853_CNRS9_Confsetting, from its starting point ( r3853 ) on the trunk: see ticket #1169

File:

• branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90 (modified) (4 diffs)

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90

@@ -37 +37 @@
    PUBLIC   tra_adv_init   ! routine called by opa module
 
-   !                                        !!* Namelist namtra_adv *
-   LOGICAL ::   ln_traadv_cen2   = .TRUE.    ! 2nd order centered scheme flag
-   LOGICAL ::   ln_traadv_tvd    = .FALSE.   ! TVD scheme flag
-   LOGICAL ::   ln_traadv_muscl  = .FALSE.   ! MUSCL scheme flag
-   LOGICAL ::   ln_traadv_muscl2 = .FALSE.   ! MUSCL2 scheme flag
-   LOGICAL ::   ln_traadv_ubs    = .FALSE.   ! UBS scheme flag
-   LOGICAL ::   ln_traadv_qck    = .FALSE.   ! QUICKEST scheme flag
-   LOGICAL ::   ln_traadv_msc_ups= .FALSE.   ! use upstream scheme within muscl
+   !                              !!* Namelist namtra_adv *
+   LOGICAL ::   ln_traadv_cen2     ! 2nd order centered scheme flag
+   LOGICAL ::   ln_traadv_tvd      ! TVD scheme flag
+   LOGICAL ::   ln_traadv_muscl    ! MUSCL scheme flag
+   LOGICAL ::   ln_traadv_muscl2   ! MUSCL2 scheme flag
+   LOGICAL ::   ln_traadv_ubs      ! UBS scheme flag
+   LOGICAL ::   ln_traadv_qck      ! QUICKEST scheme flag
+   LOGICAL ::   ln_traadv_msc_ups  ! use upstream scheme within muscl
 
 
@@ -84 +84 @@
       ENDIF
       !
-      IF( nn_cla == 1 )   CALL cla_traadv( kt )       !==  Cross Land Advection  ==! (hor. advection)
+      IF( nn_cla == 1 .AND. cp_cfg == 'orca' .AND. jp_cfg == 2 )   CALL cla_traadv( kt )       !==  Cross Land Advection  ==! (hor. advection)
       !
       !                                               !==  effective transport  ==!
@@ -151 +151 @@
       !!----------------------------------------------------------------------
       INTEGER ::   ioptio
+      INTEGER ::   ios                 ! Local integer output status for namelist read
       !!
       NAMELIST/namtra_adv/ ln_traadv_cen2 , ln_traadv_tvd,     &
@@ -158 +159 @@
       !!----------------------------------------------------------------------
 
-      REWIND( numnam )                ! Read Namelist namtra_adv : tracer advection scheme
-      READ  ( numnam, namtra_adv )
+      REWIND( numnam_ref )              ! Namelist namtra_adv in reference namelist : Tracer advection scheme
+      READ  ( numnam_ref, namtra_adv, IOSTAT = ios, ERR = 901)
+901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namtra_adv in reference namelist', lwp )
+
+      REWIND( numnam_cfg )              ! Namelist namtra_adv in configuration namelist : Tracer advection scheme
+      READ  ( numnam_cfg, namtra_adv, IOSTAT = ios, ERR = 902 )
+902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namtra_adv in configuration namelist', lwp )
+      WRITE ( numond, namtra_adv )
 
       IF(lwp) THEN                    ! Namelist print