Changeset 5613


Ignore:
Timestamp:
2015-07-20T11:12:03+02:00 (5 years ago)
Author:
cguiavarch
Message:

Add local changes for FOAM

Location:
branches/UKMO/dev_r5518_FOAM_local/NEMOGCM/NEMO/OPA_SRC
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_FOAM_local/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90

    r5463 r5613  
    4646   USE iom 
    4747   USE ioipsl 
    48    USE dynspg_oce, ONLY: un_adv, vn_adv ! barotropic velocities      
    49  
     48   USE dynspg_oce, ONLY: un_adv, vn_adv ! barotropic velocities     
     49   USE insitu_tem, ONLY: insitu_t, theta2t 
    5050#if defined key_lim2 
    5151   USE limwri_2  
     
    156156       
    157157      CALL iom_put( "toce", tsn(:,:,:,jp_tem) )    ! 3D temperature 
     158      CALL theta2t ! in-situ temperature conversion 
     159      CALL iom_put( "tinsitu", insitu_t(:,:,:))    ! in-situ temperature 
    158160      CALL iom_put(  "sst", tsn(:,:,1,jp_tem) )    ! surface temperature 
    159161      IF ( iom_use("sbt") ) THEN 
     
    194196         CALL iom_put( "taubot", z2d )            
    195197      ENDIF 
    196           
     198       
    197199      CALL iom_put( "uoce", un(:,:,:)         )    ! 3D i-current 
    198200      CALL iom_put(  "ssu", un(:,:,1)         )    ! surface i-current 
  • branches/UKMO/dev_r5518_FOAM_local/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90

    r5002 r5613  
    117117 
    118118      ! number of seconds since the beginning of current year/month/week/day at the middle of the time-step 
    119       nsec_year  = nday_year * nsecd - ndt05   ! 1 time step before the middle of the first time step 
    120       nsec_month = nday      * nsecd - ndt05   ! because day will be called at the beginning of step 
    121       nsec_week  = idweek    * nsecd - ndt05 
    122       nsec_day   =             nsecd - ndt05 
     119      nsec_year  = nday_year * nsecd - ndt   ! 1 time step before the middle of the first time step 
     120      nsec_month = nday      * nsecd - ndt   ! because day will be called at the beginning of step 
     121      nsec_week  = idweek    * nsecd - ndt 
     122      nsec_day   =             nsecd - ndt 
    123123 
    124124      ! control print 
     
    223223      IF( ABS(adatrj  - REAL(NINT(adatrj ),wp)) < zprec )   adatrj  = REAL(NINT(adatrj ),wp)   ! avoid truncation error 
    224224 
    225       IF( nsec_day > nsecd ) THEN                       ! New day 
     225      IF( nsec_day >= nsecd ) THEN                       ! New day 
    226226         ! 
    227227         nday      = nday + 1 
  • branches/UKMO/dev_r5518_FOAM_local/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

    r5407 r5613  
    206206      ENDIF 
    207207#endif 
     208      ! 
     209      ! Met Office addition: if failed, return non-zero exit code 
     210      IF( nstop /= 0 )  CALL exit( 9 )  
    208211      ! 
    209212   END SUBROUTINE nemo_gcm 
     
    612615      !!---------------------------------------------------------------------- 
    613616      USE diawri    , ONLY: dia_wri_alloc 
     617      USE insitu_tem, ONLY: insitu_tem_alloc 
    614618      USE dom_oce   , ONLY: dom_oce_alloc 
    615619      USE ldfdyn_oce, ONLY: ldfdyn_oce_alloc 
     
    628632      ierr =        oce_alloc       ()          ! ocean 
    629633      ierr = ierr + dia_wri_alloc   () 
     634      ierr = ierr + insitu_tem_alloc() 
    630635      ierr = ierr + dom_oce_alloc   ()          ! ocean domain 
    631636      ierr = ierr + ldfdyn_oce_alloc()          ! ocean lateral  physics : dynamics 
Note: See TracChangeset for help on using the changeset viewer.