Changeset 5613

Timestamp:

2015-07-20T11:12:03+02:00 (9 years ago)

Author:

cguiavarch

Message:

Add local changes for FOAM

Location:

branches/UKMO/dev_r5518_FOAM_local/NEMOGCM/NEMO/OPA_SRC

Files:

• DIA/diawri.F90 (modified) (3 diffs)
• DOM/daymod.F90 (modified) (2 diffs)
• nemogcm.F90 (modified) (3 diffs)

branches/UKMO/dev_r5518_FOAM_local/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90

@@ -46 +46 @@
    USE iom
    USE ioipsl
-   USE dynspg_oce, ONLY: un_adv, vn_adv ! barotropic velocities     
-
+   USE dynspg_oce, ONLY: un_adv, vn_adv ! barotropic velocities    
+   USE insitu_tem, ONLY: insitu_t, theta2t
 #if defined key_lim2
    USE limwri_2 
@@ -156 +156 @@
       
       CALL iom_put( "toce", tsn(:,:,:,jp_tem) )    ! 3D temperature
+      CALL theta2t ! in-situ temperature conversion
+      CALL iom_put( "tinsitu", insitu_t(:,:,:))    ! in-situ temperature
       CALL iom_put(  "sst", tsn(:,:,1,jp_tem) )    ! surface temperature
       IF ( iom_use("sbt") ) THEN
@@ -194 +196 @@
          CALL iom_put( "taubot", z2d )           
       ENDIF
-         
+      
       CALL iom_put( "uoce", un(:,:,:)         )    ! 3D i-current
       CALL iom_put(  "ssu", un(:,:,1)         )    ! surface i-current

branches/UKMO/dev_r5518_FOAM_local/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90

@@ -117 +117 @@
 
       ! number of seconds since the beginning of current year/month/week/day at the middle of the time-step
-      nsec_year  = nday_year * nsecd - ndt05   ! 1 time step before the middle of the first time step
-      nsec_month = nday      * nsecd - ndt05   ! because day will be called at the beginning of step
-      nsec_week  = idweek    * nsecd - ndt05
-      nsec_day   =             nsecd - ndt05
+      nsec_year  = nday_year * nsecd - ndt   ! 1 time step before the middle of the first time step
+      nsec_month = nday      * nsecd - ndt   ! because day will be called at the beginning of step
+      nsec_week  = idweek    * nsecd - ndt
+      nsec_day   =             nsecd - ndt
 
       ! control print
@@ -223 +223 @@
       IF( ABS(adatrj  - REAL(NINT(adatrj ),wp)) < zprec )   adatrj  = REAL(NINT(adatrj ),wp)   ! avoid truncation error
 
-      IF( nsec_day > nsecd ) THEN                       ! New day
+      IF( nsec_day >= nsecd ) THEN                       ! New day
          !
          nday      = nday + 1

branches/UKMO/dev_r5518_FOAM_local/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -206 +206 @@
       ENDIF
 #endif
+      !
+      ! Met Office addition: if failed, return non-zero exit code
+      IF( nstop /= 0 )  CALL exit( 9 ) 
       !
    END SUBROUTINE nemo_gcm
@@ -612 +615 @@
       !!----------------------------------------------------------------------
       USE diawri    , ONLY: dia_wri_alloc
+      USE insitu_tem, ONLY: insitu_tem_alloc
       USE dom_oce   , ONLY: dom_oce_alloc
       USE ldfdyn_oce, ONLY: ldfdyn_oce_alloc
@@ -628 +632 @@
       ierr =        oce_alloc       ()          ! ocean
       ierr = ierr + dia_wri_alloc   ()
+      ierr = ierr + insitu_tem_alloc()
       ierr = ierr + dom_oce_alloc   ()          ! ocean domain
       ierr = ierr + ldfdyn_oce_alloc()          ! ocean lateral  physics : dynamics