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 7773 for branches/UKMO/dev_r5785_SSS_obsoper/NEMOGCM/NEMO/OFF_SRC – NEMO

Ignore:
Timestamp:
2017-03-09T13:52:43+01:00 (7 years ago)
Author:
mattmartin
Message:

Committing updates after doing the following:

  • merging the branch dev_r4650_general_vert_coord_obsoper@7763 into this branch
  • updating it so that the following OBS changes were implemented correctly on top of the simplification changes:
    • generalised vertical coordinate for profile obs. This was done so that is now the default option.
    • sst bias correction implemented with the new simplified obs code.
    • included the biogeochemical obs types int he new simplified obs code.
    • included the changes to exclude obs in the boundary for limited area models
    • included other changes for the efficiency of the obs operator to remove global arrays.
Location:
branches/UKMO/dev_r5785_SSS_obsoper/NEMOGCM/NEMO/OFF_SRC
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5785_SSS_obsoper/NEMOGCM/NEMO/OFF_SRC/domrea.F90

    • Property svn:keywords deleted
  • branches/UKMO/dev_r5785_SSS_obsoper/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90

    • Property svn:keywords deleted
    r5682 r7773  
    9696   !!---------------------------------------------------------------------- 
    9797   !! NEMO/OFF 3.3 , NEMO Consortium (2010) 
    98    !! $Id$ 
     98   !! $Id: dtadyn.F90 5682 2015-08-12 15:46:45Z mattmartin $ 
    9999   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
    100100   !!---------------------------------------------------------------------- 
     
    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' ) 
    433435      ! Open file for each variable to get his number of dimension 
    434436      DO ifpr = 1, jfld 
    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 
     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 
    439442         IF( idimv == 3 ) THEN    ! 2D variable 
    440443                                      ALLOCATE( sf_dyn(ifpr)%fnow(jpi,jpj,1)    , STAT=ierr0 ) 
     
    448451         ENDIF 
    449452      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' ) 
    452453      ! 
    453454      IF( lk_ldfslp .AND. .NOT.lk_c1d ) THEN                  ! slopes  
Note: See TracChangeset for help on using the changeset viewer.