- Timestamp:
- 2015-12-16T10:25:22+01:00 (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2015/dev_merge_2015/NEMOGCM/NEMO/OPA_SRC/TRD/trdpen.F90
r5836 r6060 37 37 38 38 !! * Substitutions 39 # include "domzgr_substitute.h90"40 39 # include "zdfddm_substitute.h90" 41 40 # include "vectopt_loop_substitute.h90" … … 79 78 zpe(:,:,:) = 0._wp 80 79 ! 81 IF ( kt /= nkstp ) THEN! full eos: set partial derivatives at the 1st call of kt time step80 IF( kt /= nkstp ) THEN ! full eos: set partial derivatives at the 1st call of kt time step 82 81 nkstp = kt 83 82 CALL eos_pen( tsn, rab_PE, zpe ) … … 97 96 CASE ( jptra_yad ) ; CALL iom_put( "petrd_yad", zpe ) ! merid. advection 98 97 CASE ( jptra_zad ) ; CALL iom_put( "petrd_zad", zpe ) ! vertical advection 99 IF( .NOT.lk_vvl) THEN ! cst volume : adv flux through z=0 surface98 IF( ln_linssh ) THEN ! cst volume : adv flux through z=0 surface 100 99 CALL wrk_alloc( jpi, jpj, z2d ) 101 100 z2d(:,:) = wn(:,:,1) * ( & 102 101 & - ( rab_n(:,:,1,jp_tem) + rab_pe(:,:,1,jp_tem) ) * tsn(:,:,1,jp_tem) & 103 102 & + ( rab_n(:,:,1,jp_sal) + rab_pe(:,:,1,jp_sal) ) * tsn(:,:,1,jp_sal) & 104 & ) / fse3t(:,:,1)103 & ) / e3t_n(:,:,1) 105 104 CALL iom_put( "petrd_sad" , z2d ) 106 105 CALL wrk_dealloc( jpi, jpj, z2d ) … … 116 115 CASE ( jptra_bbc ) ; CALL iom_put( "petrd_bbc" , zpe ) ! bottom bound cond (geoth flux) 117 116 CASE ( jptra_atf ) ; CALL iom_put( "petrd_atf" , zpe ) ! asselin time filter (last trend) 118 !IF( .NOT.lk_vvl) THEN ! cst volume : ssh term (otherwise include in e3t variation)117 !IF( ln_linssh ) THEN ! cst volume : ssh term (otherwise include in e3t variation) 119 118 ! CALL wrk_alloc( jpi, jpj, z2d ) 120 119 ! z2d(:,:) = ( ssha(:,:) - sshb(:,:) ) & 121 120 ! & * ( dPE_dt(:,:,1) * tsn(:,:,1,jp_tem) & 122 ! & + dPE_ds(:,:,1) * tsn(:,:,1,jp_sal) ) / ( fse3t(:,:,1) * pdt )121 ! & + dPE_ds(:,:,1) * tsn(:,:,1,jp_sal) ) / ( e3t_n(:,:,1) * pdt ) 123 122 ! CALL iom_put( "petrd_sad" , z2d ) 124 123 ! CALL wrk_dealloc( jpi, jpj, z2d ) … … 151 150 rab_pe(:,:,:,:) = 0._wp 152 151 ! 153 IF ( lk_vvl) CALL ctl_stop('trd_pen_init : PE trends not coded for variable volume')152 IF( .NOT.ln_linssh ) CALL ctl_stop('trd_pen_init : PE trends not coded for variable volume') 154 153 ! 155 154 nkstp = nit000 - 1
Note: See TracChangeset
for help on using the changeset viewer.