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 5086 for branches/2014/dev_r4650_UKMO3_masked_damping/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90 – NEMO

Ignore:
Timestamp:
2015-02-17T10:06:39+01:00 (9 years ago)
Author:
timgraham
Message:

Merged head of trunk into branch in preparation for putting code back onto the trunk
In working copy ran the command:
svn merge svn+sshtimgraham@…/ipsl/forge/projets/nemo/svn/trunk

Also recompiled NEMO_book.pdf with merged input files

File:
1 edited

Legend:

Unmodified
Added
Removed

  • branches/2014/dev_r4650_UKMO3_masked_damping/NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90

    r4624 r5086  
    208208      !----------------------------------------------------------------------- 
    209209 
     210      enactfiles(:) = '' 
     211      coriofiles(:) = '' 
     212      profbfiles(:) = '' 
     213      slafilesact(:) = '' 
     214      slafilespas(:) = '' 
     215      slafbfiles(:) = '' 
     216      sstfiles(:)   = '' 
     217      sstfbfiles(:) = '' 
     218      seaicefiles(:) = '' 
    210219      velcurfiles(:) = '' 
    211220      veladcpfiles(:) = '' 
     221      velavcurfiles(:) = '' 
     222      velhrcurfiles(:) = '' 
     223      velavadcpfiles(:) = '' 
     224      velhradcpfiles(:) = '' 
     225      velfbfiles(:) = '' 
     226      velcurfiles(:) = '' 
     227      veladcpfiles(:) = '' 
     228      endailyavtypes(:) = -1 
     229      endailyavtypes(1) = 820 
     230      ln_profb_ena(:) = .FALSE. 
     231      ln_profb_enatim(:) = .TRUE. 
     232      ln_velfb_av(:) = .FALSE. 
     233      ln_ignmis = .FALSE. 
     234       
    212235      CALL ini_date( dobsini ) 
    213236      CALL fin_date( dobsend ) 
    … …  
    460483      CALL obs_grid_setup( ) 
    461484      IF ( ( n1dint < 0 ).OR.( n1dint > 1 ) ) THEN 
    462          IF(lwp) WRITE(numout,cform_err) 
    463          IF(lwp) WRITE(numout,*) ' Choice of vertical (1D) interpolation method', & 
    464             &                    ' is not available' 
    465          nstop = nstop + 1 
     485         CALL ctl_stop(' Choice of vertical (1D) interpolation method', & 
     486            &                    ' is not available') 
    466487      ENDIF 
    467488      IF ( ( n2dint < 0 ).OR.( n2dint > 4 ) ) THEN 
    468          IF(lwp) WRITE(numout,cform_err) 
    469          IF(lwp) WRITE(numout,*) ' Choice of horizontal (2D) interpolation method', & 
    470             &                    ' is not available' 
    471          nstop = nstop + 1 
     489         CALL ctl_stop(' Choice of horizontal (2D) interpolation method', & 
     490            &                    ' is not available') 
    472491      ENDIF 
    473492 
Note: See TracChangeset for help on using the changeset viewer.