Changeset 4059 for branches/2013/dev_r3996_CMCC6_topbc

Timestamp:

2013-10-11T15:47:34+02:00 (11 years ago)

Author:

vichi

Message:

Prepare new changed file to the merge with config setting

The modified files that include the reading of a namelist
now contain a commented piece of code that is
compliant with the development branch on config settings
Older reading of namelist is maintained for running tests
before the merge party

Location:

branches/2013/dev_r3996_CMCC6_topbc/NEMOGCM/NEMO/TOP_SRC

Files:

• trcbc.F90 (modified) (3 diffs)
• trcdta.F90 (modified) (2 diffs)

branches/2013/dev_r3996_CMCC6_topbc/NEMOGCM/NEMO/TOP_SRC/trcbc.F90

@@ -21 +21 @@
    PRIVATE
 
-   PUBLIC   trc_bc_init, trc_bc_read 
+   PUBLIC   trc_bc_init    ! called in trcini.F90 
+   PUBLIC   trc_bc_read    ! called in trcstp.F90 or within
 
    INTEGER  , SAVE, PUBLIC                             :: nb_trcobc   ! number of tracers with open BC
@@ -61 +62 @@
       INTEGER            :: jl, jn                         ! dummy loop indices
       INTEGER            :: ierr0, ierr1, ierr2, ierr3     ! temporary integers
+      INTEGER            ::  ios                           ! Local integer output status for namelist read
       CHARACTER(len=100) :: clndta, clntrc
       !
@@ -147 +149 @@
       END DO
       !
-      ! Read boundary conditions in namelist_top
-      !
+!MAV temporary code for 3.5
       REWIND( numnat )               ! read nattrc
       READ  ( numnat, namtrc_bc )
+!MAV future code for 3.6
+!      REWIND( numnat_ref )              ! Namelist namtrc_bc in reference namelist : Passive tracer data structure
+!      READ  ( numnat_ref, namtrc_bc, IOSTAT = ios, ERR = 901)
+!901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namtrc_bc in reference namelist', lwp )
+!
+!      REWIND( numnat_cfg )              ! Namelist namtrc_bc in configuration namelist : Passive tracer data structure
+!      READ  ( numnat_cfg, namtrc_bc, IOSTAT = ios, ERR = 902 )
+!902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namtrc_bc in configuration namelist', lwp )
+!      WRITE ( numont, namtrc_bc )
 
       ! print some information for each 

branches/2013/dev_r3996_CMCC6_topbc/NEMOGCM/NEMO/TOP_SRC/trcdta.F90

@@ -57 +57 @@
       INTEGER            :: jl, jn                           ! dummy loop indices
       INTEGER            :: ierr0, ierr1, ierr2, ierr3       ! temporary integers
+      INTEGER            ::  ios                     ! Local integer output status for namelist read
       CHARACTER(len=100) :: clndta, clntrc
       REAL(wp)           :: zfact
@@ -105 +106 @@
       END DO
       !
+!MAV temporary code for 3.5
       REWIND( numnat )               ! read nattrc
       READ  ( numnat, namtrc_dta )
+!MAV future code for 3.6
+!      REWIND( numnat_ref )              ! Namelist namtrc_dta in reference namelist : Passive tracer data
+!      READ  ( numnat_ref, namtrc_dta, IOSTAT = ios, ERR = 901)
+!901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namtrc_dta in reference namelist', lwp )
+!
+!      REWIND( numnat_cfg )              ! Namelist namtrc_dta in configuration namelist : Passive tracer data
+!      READ  ( numnat_cfg, namtrc_dta, IOSTAT = ios, ERR = 902 )
+!902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namtrc_dta in configuration namelist', lwp )
+!      WRITE ( numont, namtrc_dta )
 
       IF( lwp ) THEN