New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 2134 – NEMO

Changeset 2134


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/devmercator2010_1/NEMO/OPA_SRC/SBC/fldread.F90

    r2131 r2134  
    372372      INTEGER :: inrec                 ! number of record existing for this variable 
    373373      INTEGER :: kwgt 
    374 <<<<<<< .working 
    375374      INTEGER :: jk             !vertical loop variable 
    376375      INTEGER :: ipk            !number of vertical levels of sdjf%fdta ( 2D: ipk=1 ; 3D: ipk=jpk ) 
    377 ======= 
    378376      INTEGER :: iyear, imonth, iday   ! first day of the current file in yyyy mm dd 
    379377      INTEGER :: isec_week             ! number of seconds since start of the weekly file 
    380 >>>>>>> .merge-right.r2130 
    381378      CHARACTER(LEN=1000) ::   clfmt   ! write format 
    382379      !!--------------------------------------------------------------------- 
     
    427424         llprev = llprevyr .OR. llprevmth .OR. llprevweek .OR. llprevday 
    428425 
    429 <<<<<<< .working 
    430426         CALL fld_clopn( sdjf, nyear  - COUNT((/llprevyr /))                                              ,               & 
    431427            &                  nmonth - COUNT((/llprevmth/)) + 12                   * COUNT((/llprevyr /)),               & 
    432428            &                  nday   - COUNT((/llprevday/)) + nmonth_len(nmonth-1) * COUNT((/llprevmth/)), .NOT. llprev ) 
    433429 
    434 ======= 
    435430         IF ( sdjf%cltype(1:4) == 'week' ) THEN 
    436431            isec_week  = ksec_week( sdjf%cltype(6:8) ) 
     
    446441         CALL fld_clopn( sdjf , iyear , imonth , iday , .NOT. llprev ) 
    447442 
    448 >>>>>>> .merge-right.r2130 
    449443         ! if previous year/month/day file does not exist, we switch to the current year/month/day 
    450444         IF( llprev .AND. sdjf%num == 0 ) THEN 
     
    474468            ENDIF 
    475469         ELSE 
    476             write(narea+200,*)' sdjf%ln_tint SIZE(sdjf%fnow,3) ',sdjf%ln_tint,SIZE(sdjf%fnow,3) ; call flush(narea+200) 
    477             write(narea+200,*)' SIZE(sdjf%fdta,3)  SIZE(sdjf%fdta,4) ',SIZE(sdjf%fdta,3),SIZE(sdjf%fdta,4)  ; call flush(narea+200) 
    478470            SELECT CASE( SIZE(sdjf%fnow,3) ) 
    479471            CASE(1) 
     
    490482               ENDIF 
    491483            END SELECT 
    492             write(narea+200,*)' test1 ok ' ; call flush(narea+200) 
    493484         ENDIF 
    494485         sdjf%rotn(2) = .FALSE. 
     
    501492      ENDIF 
    502493 
    503 <<<<<<< .working 
    504494 
    505495      IF( sdjf%num == 0 )   CALL fld_clopn( sdjf, nyear, nmonth, nday )   ! make sure current year/month/day file is opened 
    506 ======= 
    507496      ! make sure current year/month/day file is opened 
    508497      IF( sdjf%num == 0 ) THEN 
     
    524513         CALL fld_clopn( sdjf, iyear, imonth, iday ) 
    525514      ENDIF  
    526 >>>>>>> .merge-right.r2130 
    527515 
    528516      sdjf%nswap_sec = nsec_year + nsec1jan000 - 1   ! force read/update the after data in the following part of fld_read  
    529 <<<<<<< .working 
    530517      
    531 ======= 
    532  
    533 >>>>>>> .merge-right.r2130 
     518 
    534519   END SUBROUTINE fld_init 
    535520 
  • branches/devmercator2010_1/NEMO/OPA_SRC/SBC/sbcblk_clio.F90

    r2130 r2134  
    129129         &                          sn_ccov, sn_tair, sn_prec 
    130130      !!--------------------------------------------------------------------- 
    131       write(narea+200,*)'clio : '; call flush(narea+200) 
    132131 
    133132      !                                         ! ====================== ! 
Note: See TracChangeset for help on using the changeset viewer.