Changeset 3666 for branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/OFF_SRC

Timestamp:

2012-11-26T15:22:04+01:00 (12 years ago)

Author:

cetlod

Message:

commit the changes resulting for the merged branches, see ticket #1025

Location:

branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/OFF_SRC

Files:

• domrea.F90 (modified) (1 diff)
• dtadyn.F90 (modified) (1 diff)
• nemogcm.F90 (modified) (1 diff)

branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/OFF_SRC/domrea.F90

@@ -113 +113 @@
          CALL iom_get( inum2, jpdom_data, 'vmask', vmask )
          CALL iom_get( inum2, jpdom_data, 'fmask', fmask )
+
+         CALL lbc_lnk( tmask, 'T', 1._wp )    ! Lateral boundary conditions
+         CALL lbc_lnk( umask, 'U', 1._wp )      
+         CALL lbc_lnk( vmask, 'V', 1._wp )
+         CALL lbc_lnk( fmask, 'F', 1._wp )
 
 #if defined key_c1d

branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90

@@ -436 +436 @@
       ! Open file for each variable to get his number of dimension
       DO ifpr = 1, jfld
-         CALL iom_open( slf_d(ifpr)%clname, inum )
+         CALL iom_open( TRIM( cn_dir )//TRIM( slf_d(ifpr)%clname ), inum )
          idv   = iom_varid( inum , slf_d(ifpr)%clvar )  ! id of the variable sdjf%clvar
          idimv = iom_file ( inum )%ndims(idv)             ! number of dimension for variable sdjf%clvar

branches/2012/dev_LOCEAN_UKMO_CMCC_INGV_2012/NEMOGCM/NEMO/OFF_SRC/nemogcm.F90

@@ -184 +184 @@
          !
          WRITE(numout,*)
-         WRITE(numout,*) '         CNRS - NERC - Met OFFICE - MERCATOR-ocean'
+         WRITE(numout,*) '   CNRS - NERC - Met OFFICE - MERCATOR-ocean - INGV - CMCC'
          WRITE(numout,*) '                       NEMO team'
          WRITE(numout,*) '            Ocean General Circulation Model'
-         WRITE(numout,*) '                  version 3.3  (2010) '
+         WRITE(numout,*) '                  version 3.5  (2012) '
          WRITE(numout,*)
          WRITE(numout,*)