Changeset 8042
- Timestamp:
- 2017-05-18T12:30:54+02:00 (7 years ago)
- Location:
- branches/UKMO/dev_r5518_GO6_package_inc_asm/NEMOGCM/NEMO/OPA_SRC
- Files:
-
- 2 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/UKMO/dev_r5518_GO6_package_inc_asm/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90
r7651 r8042 47 47 USE iom 48 48 USE ioipsl 49 USE dynspg_oce, ONLY: un_adv, vn_adv ! barotropic velocities 50 49 USE dynspg_oce, ONLY: un_adv, vn_adv ! barotropic velocities 50 USE insitu_tem, ONLY: insitu_t, theta2t 51 51 #if defined key_lim2 52 52 USE limwri_2 … … 164 164 165 165 CALL iom_put( "toce", tsn(:,:,:,jp_tem) ) ! 3D temperature 166 CALL theta2t ! in-situ temperature conversion 167 CALL iom_put( "tinsitu", insitu_t(:,:,:)) ! in-situ temperature 166 168 CALL iom_put( "sst", tsn(:,:,1,jp_tem) ) ! surface temperature 167 169 IF ( iom_use("sbt") ) THEN … … 202 204 CALL iom_put( "taubot", z2d ) 203 205 ENDIF 204 206 205 207 CALL iom_put( "uoce", un(:,:,:) ) ! 3D i-current 206 208 CALL iom_put( "ssu", un(:,:,1) ) ! surface i-current -
branches/UKMO/dev_r5518_GO6_package_inc_asm/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90
r8036 r8042 212 212 ENDIF 213 213 #endif 214 ! 215 ! Met Office addition: if failed, return non-zero exit code 216 IF( nstop /= 0 ) CALL exit( 9 ) 214 217 ! 215 218 END SUBROUTINE nemo_gcm … … 626 629 !!---------------------------------------------------------------------- 627 630 USE diawri , ONLY: dia_wri_alloc 631 USE insitu_tem, ONLY: insitu_tem_alloc 628 632 USE dom_oce , ONLY: dom_oce_alloc 629 633 USE ldfdyn_oce, ONLY: ldfdyn_oce_alloc … … 642 646 ierr = oce_alloc () ! ocean 643 647 ierr = ierr + dia_wri_alloc () 648 ierr = ierr + insitu_tem_alloc() 644 649 ierr = ierr + dom_oce_alloc () ! ocean domain 645 650 ierr = ierr + ldfdyn_oce_alloc() ! ocean lateral physics : dynamics
Note: See TracChangeset
for help on using the changeset viewer.