Changeset 4230 for branches/2013/dev_LOCEAN_CMCC_INGV_2013/NEMOGCM/NEMO/TOP_SRC/trcbc.F90

Timestamp:

2013-11-18T12:57:11+01:00 (10 years ago)

Author:

cetlod

Message:

dev_LOCEAN_CMCC_INGV_2013 : merge LOCEAN & CMCC_INGV branches, see ticket #1182

File:

• branches/2013/dev_LOCEAN_CMCC_INGV_2013/NEMOGCM/NEMO/TOP_SRC/trcbc.F90 (copied) (copied from branches/2013/dev_CMCC_INGV_2013/NEMOGCM/NEMO/TOP_SRC/trcbc.F90) (1 diff)

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

@@ -134 +134 @@
       IF( lwp ) WRITE(numout,*) ' '
 
-      ! Initialize the namelists with default values
-      cn_dir  = './'            ! directory in which the model is executed
-      DO jn = 1, ntrc
-         WRITE( clndta,'("TR_",I1)' ) jn
-         clndta = TRIM( clndta )
-         !                 !  file      ! frequency ! variable  ! time inter !  clim   ! 'yearly' or ! weights  ! rotation ! land/sea mask !
-         !                 !  name      !  (hours)  !  name     !   (T/F)    !  (T/F)  !  'monthly'  ! filename ! pairs    ! filename      !
-         sn_trcobc(jn)  = FLD_N( clndta ,   -1      , clndta    ,  .false.   , .true.  ,  'monthly'  , ''       , &
-              & ''       , ''            )
-         sn_trcsbc(jn)  = FLD_N( clndta ,   -1      , clndta    ,  .false.   , .true.  ,  'monthly'  , ''       , &
-              & ''       , ''            )
-         sn_trccbc(jn)  = FLD_N( clndta ,   -1      , clndta    ,  .false.   , .true.  ,  'monthly'  , ''       , &
-              & ''       , ''            )
-         rn_trofac(jn) = 1._wp
-         rn_trsfac(jn) = 1._wp
-         rn_trcfac(jn) = 1._wp
-      END DO
-      !
-!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 )
+      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