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 10251 for branches/UKMO/dev_r5518_AMM15_package/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90 – NEMO

Ignore:
Timestamp:
2018-10-29T15:20:26+01:00 (5 years ago)
Author:
kingr
Message:

Rolled back to r10247 - i.e., undid merge of pkg br and 3.6_stable br

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_AMM15_package/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90

    r10248 r10251  
    431431         CALL ctl_stop( 'dta_dyn: unable to allocate sf structure' )   ;   RETURN 
    432432      ENDIF 
    433       !                                         ! fill sf with slf_i and control print 
    434       CALL fld_fill( sf_dyn, slf_d, cn_dir, 'dta_dyn_init', 'Data in file', 'namdta_dyn' ) 
    435433      ! Open file for each variable to get his number of dimension 
    436434      DO ifpr = 1, jfld 
    437          CALL fld_clopn( sf_dyn(ifpr), nyear, nmonth, nday ) 
    438          idv   = iom_varid( sf_dyn(ifpr)%num , slf_d(ifpr)%clvar )        ! id of the variable sdjf%clvar 
    439          idimv = iom_file ( sf_dyn(ifpr)%num )%ndims(idv)                 ! number of dimension for variable sdjf%clvar 
    440          IF( sf_dyn(ifpr)%num /= 0 )   CALL iom_close( sf_dyn(ifpr)%num ) ! close file if already open 
    441          ierr1=0 
     435         CALL iom_open( TRIM( cn_dir )//TRIM( slf_d(ifpr)%clname ), inum ) 
     436         idv   = iom_varid( inum , slf_d(ifpr)%clvar )  ! id of the variable sdjf%clvar 
     437         idimv = iom_file ( inum )%ndims(idv)             ! number of dimension for variable sdjf%clvar 
     438         IF( inum /= 0 )   CALL iom_close( inum )       ! close file if already open 
    442439         IF( idimv == 3 ) THEN    ! 2D variable 
    443440                                      ALLOCATE( sf_dyn(ifpr)%fnow(jpi,jpj,1)    , STAT=ierr0 ) 
     
    451448         ENDIF 
    452449      END DO 
     450      !                                         ! fill sf with slf_i and control print 
     451      CALL fld_fill( sf_dyn, slf_d, cn_dir, 'dta_dyn_init', 'Data in file', 'namdta_dyn' ) 
    453452      ! 
    454453      IF( lk_ldfslp .AND. .NOT.lk_c1d ) THEN                  ! slopes  
Note: See TracChangeset for help on using the changeset viewer.