Changeset 6666
- Timestamp:
- 2016-06-03T16:20:47+02:00 (8 years ago)
- Location:
- branches/UKMO/dev_r5518_nemovar_init_vvl/NEMOGCM/NEMO/OPA_SRC
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/UKMO/dev_r5518_nemovar_init_vvl/NEMOGCM/NEMO/OPA_SRC/ASM/asmbkg.F90
r6641 r6666 54 54 55 55 PUBLIC asm_bkg_wri !: Write out the background state 56 57 !! * Substitutions 58 # include "domzgr_substitute.h90" 56 59 57 60 !!---------------------------------------------------------------------- … … 117 120 CALL iom_rstput( kt, nitbkg_r, inum, 'sshn' , sshn ) 118 121 #if defined key_vvl 119 CALL iom_rstput( kt, nitbkg_r, inum, 'fse3t_n', fse3t_n)122 CALL iom_rstput( kt, nitbkg_r, inum, 'fse3t_n', e3t_n ) 120 123 #endif 121 124 #if defined key_zdftke -
branches/UKMO/dev_r5518_nemovar_init_vvl/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90
r5781 r6666 26 26 USE par_oce ! Ocean space and time domain variables 27 27 USE dom_oce ! Ocean space and time domain 28 USE domvvl ! domain: variable volume level28 ! USE domvvl ! domain: variable volume level 29 29 USE oce ! Dynamics and active tracers defined in memory 30 30 USE ldfdyn_oce ! ocean dynamics: lateral physics … … 85 85 REAL(wp), PUBLIC :: salfixmin !: Ensure that the salinity is larger than this value if (ln_salfix) 86 86 87 REAL(wp), DIMENSION(:,:), ALLOCATABLE :: ssh_bkg, ssh_bkginc ! Background sea surface height and its increment 88 REAL(wp), DIMENSION(:,:), ALLOCATABLE :: seaice_bkginc ! Increment to the background sea ice conc 87 REAL(wp), PUBLIC, DIMENSION(:,:), ALLOCATABLE :: ssh_bkg ! Background sea surface height 88 REAL(wp), DIMENSION(:,:), ALLOCATABLE :: ssh_bkginc ! Background sea surface height increment 89 REAL(wp), DIMENSION(:,:), ALLOCATABLE :: seaice_bkginc ! Increment to the background sea ice conc 89 90 90 91 !! * Substitutions -
branches/UKMO/dev_r5518_nemovar_init_vvl/NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90
r6641 r6666 9 9 !! vvl option includes z_star and z_tilde coordinates 10 10 !! 3.6 ! 2014-11 (P. Mathiot) add ice shelf capability 11 !! 3.6 ! 2016-05 (B. Lemieux-D) read scale factor and sshin the background file11 !! 3.6 ! 2016-05 (B. Lemieux-D) e3t scale factor and ssh read in the background file 12 12 !!---------------------------------------------------------------------- 13 13 !! 'key_vvl' variable volume … … 25 25 !!---------------------------------------------------------------------- 26 26 !! * Modules used 27 USE oce ! ocean dynamics and tracers 28 USE dom_oce ! ocean space and time domain 29 USE sbc_oce ! ocean surface boundary condition 30 USE in_out_manager ! I/O manager 31 USE iom ! I/O manager library 32 USE restart ! ocean restart 33 USE lib_mpp ! distributed memory computing library 34 USE lbclnk ! ocean lateral boundary conditions (or mpp link) 35 USE wrk_nemo ! Memory allocation 36 USE timing ! Timing 27 USE oce ! ocean dynamics and tracers 28 USE dom_oce ! ocean space and time domain 29 USE sbc_oce ! ocean surface boundary condition 30 USE asminc, ONLY : & ! background ssh for nemovar vertical grid initialization 31 & ssh_bkg 32 USE in_out_manager ! I/O manager 33 USE iom ! I/O manager library 34 USE restart ! ocean restart 35 USE asmpar, ONLY : & ! background file name 36 & c_asmbkg 37 USE lib_mpp ! distributed memory computing library 38 USE lbclnk ! ocean lateral boundary conditions (or mpp link) 39 USE wrk_nemo ! Memory allocation 40 USE timing ! Timing 37 41 38 42 IMPLICIT NONE … … 250 254 ENDIF 251 255 252 not_nemovar_run :ELSE256 ELSE 253 257 254 258 ! Read the now fse3t_scale factor and the ssh … … 853 857 IF( MIN(id1,id2) > 0 ) THEN 854 858 ! 855 CALL iom_get( inum, jpdom_autoglo, 'fse3t_n', fse3t_n, 1 )859 CALL iom_get( inum, jpdom_autoglo, 'fse3t_n', e3t_n, 1 ) 856 860 CALL iom_get( inum, jpdom_autoglo, 'sshn', ssh_bkg, 1 ) 857 861 !
Note: See TracChangeset
for help on using the changeset viewer.