Changeset 1953 for branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/OBC

Timestamp:

2010-06-24T17:27:10+02:00 (14 years ago)

Author:

acc

Message:

ticket #684 step 3: Add in changes from the trunk between revisions 1784 and 1821. No conflicts so far

Location:

branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/OBC

Files:

• obc_oce.F90 (modified) (1 diff)
• obcini.F90 (modified) (5 diffs)
• obcrst.F90 (modified) (2 diffs)

branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/OBC/obc_oce.F90

@@ -27 +27 @@
    !
    !                                  !!* Namelist namobc: open boundary condition *
-   INTEGER           ::   nn_nbobc    = 2        !: number of open boundaries ( 1=< nbobc =< 4 ) 
    INTEGER           ::   nn_obcdta   = 0        !:  = 0 use the initial state as obc data
    !                                             !   = 1 read obc data in obcxxx.dta files

branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/OBC/obcini.F90

@@ -70 +70 @@
 
       ! convert DOCTOR namelist name into the OLD names
-      nbobc    = nn_nbobc
       nobc_dta = nn_obcdta
       cffile   = cn_obcdta
@@ -101 +100 @@
       IF(lwp) WRITE(numout,*) 'obc_init : initialization of open boundaries'
       IF(lwp) WRITE(numout,*) '~~~~~~~~'
-      IF(lwp) WRITE(numout,*) '   Number of open boundaries    nn_nbobc = ', nn_nbobc
+      IF(lwp) WRITE(numout,*) '   Number of open boundaries    nbobc = ', nbobc
       IF(lwp) WRITE(numout,*)
 
@@ -306 +305 @@
       IF( lp_obc_east ) THEN
          !... (jpjed,jpjefm1),jpieob
+         bmask(nie0p1:nie1p1,nje0:nje1m1) = 0.e0
 
          ! ... initilization to zero
@@ -341 +341 @@
       IF( lp_obc_north ) THEN
          ! ... jpjnob,(jpind,jpisfm1)
+         bmask(nin0:nin1m1,njn0p1:njn1p1) = 0.e0
 
          ! ... initilization to zero
@@ -440 +441 @@
             END DO
          END IF
-  
+
          IF( lp_obc_north ) THEN ! ... North open boundary lateral surface
             DO jj = njn0, njn1

branches/DEV_r1784_mid_year_merge_2010/NEMO/OPA_SRC/OBC/obcrst.F90

@@ -96 +96 @@
          ! -------------
 
-         CALL ctl_opn( inum, 'restart.obc.output', 'REPLACE', 'UNFORMATTED', 'DIRECT', nreclo, numout, lwp )
+         CALL ctl_opn( inum, 'restart.obc.output', 'UNKNOWN', 'UNFORMATTED', 'DIRECT', nreclo, numout, lwp )
  
          ! 1.2 Write header
@@ -322 +322 @@
       ! 0.1 Open files
       ! ---------------
-      CALL ctl_opn( inum, 'restart.obc', 'REPLACE', 'UNFORMATTED', 'DIRECT', nreclo, numout, lwp )
+      CALL ctl_opn( inum, 'restart.obc', 'UNKNOWN', 'UNFORMATTED', 'DIRECT', nreclo, numout, lwp )
 
       ! 1. Read