Changeset 2134

Timestamp:

2010-09-29T19:29:04+02:00 (14 years ago)

Author:

cbricaud

Message:

remove debug print and comment

Location:

branches/devmercator2010_1/NEMO/OPA_SRC/SBC

Files:

• fldread.F90 (modified) (7 diffs)
• sbcblk_clio.F90 (modified) (1 diff)

branches/devmercator2010_1/NEMO/OPA_SRC/SBC/fldread.F90

@@ -372 +372 @@
       INTEGER :: inrec                 ! number of record existing for this variable
       INTEGER :: kwgt
-<<<<<<< .working
       INTEGER :: jk             !vertical loop variable
       INTEGER :: ipk            !number of vertical levels of sdjf%fdta ( 2D: ipk=1 ; 3D: ipk=jpk )
-=======
       INTEGER :: iyear, imonth, iday   ! first day of the current file in yyyy mm dd
       INTEGER :: isec_week             ! number of seconds since start of the weekly file
->>>>>>> .merge-right.r2130
       CHARACTER(LEN=1000) ::   clfmt   ! write format
       !!---------------------------------------------------------------------
@@ -427 +424 @@
          llprev = llprevyr .OR. llprevmth .OR. llprevweek .OR. llprevday
 
-<<<<<<< .working
          CALL fld_clopn( sdjf, nyear  - COUNT((/llprevyr /))                                              ,               &
             &                  nmonth - COUNT((/llprevmth/)) + 12                   * COUNT((/llprevyr /)),               &
             &                  nday   - COUNT((/llprevday/)) + nmonth_len(nmonth-1) * COUNT((/llprevmth/)), .NOT. llprev )
 
-=======
          IF ( sdjf%cltype(1:4) == 'week' ) THEN
             isec_week  = ksec_week( sdjf%cltype(6:8) )
@@ -446 +441 @@
          CALL fld_clopn( sdjf , iyear , imonth , iday , .NOT. llprev )
 
->>>>>>> .merge-right.r2130
          ! if previous year/month/day file does not exist, we switch to the current year/month/day
          IF( llprev .AND. sdjf%num == 0 ) THEN
@@ -474 +468 @@
             ENDIF
          ELSE
-            write(narea+200,*)' sdjf%ln_tint SIZE(sdjf%fnow,3) ',sdjf%ln_tint,SIZE(sdjf%fnow,3) ; call flush(narea+200)
-            write(narea+200,*)' SIZE(sdjf%fdta,3)  SIZE(sdjf%fdta,4) ',SIZE(sdjf%fdta,3),SIZE(sdjf%fdta,4)  ; call flush(narea+200)
             SELECT CASE( SIZE(sdjf%fnow,3) )
             CASE(1)
@@ -490 +482 @@
                ENDIF
             END SELECT
-            write(narea+200,*)' test1 ok ' ; call flush(narea+200)
          ENDIF
          sdjf%rotn(2) = .FALSE.
@@ -501 +492 @@
       ENDIF
 
-<<<<<<< .working
 
       IF( sdjf%num == 0 )   CALL fld_clopn( sdjf, nyear, nmonth, nday )   ! make sure current year/month/day file is opened
-=======
       ! make sure current year/month/day file is opened
       IF( sdjf%num == 0 ) THEN
@@ -524 +513 @@
          CALL fld_clopn( sdjf, iyear, imonth, iday )
       ENDIF 
->>>>>>> .merge-right.r2130
 
       sdjf%nswap_sec = nsec_year + nsec1jan000 - 1   ! force read/update the after data in the following part of fld_read 
-<<<<<<< .working
      
-=======
-
->>>>>>> .merge-right.r2130
+
    END SUBROUTINE fld_init
 

branches/devmercator2010_1/NEMO/OPA_SRC/SBC/sbcblk_clio.F90

@@ -129 +129 @@
          &                          sn_ccov, sn_tair, sn_prec
       !!---------------------------------------------------------------------
-      write(narea+200,*)'clio : '; call flush(narea+200)
 
       !                                         ! ====================== !