- Timestamp:
- 2019-11-22T15:29:17+01:00 (5 years ago)
- Location:
- NEMO/branches/2019/dev_r11943_MERGE_2019/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2019/dev_r11943_MERGE_2019/src
- Property svn:mergeinfo deleted
-
NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TRD/trdpen.F90
r10425 r11949 55 55 56 56 57 SUBROUTINE trd_pen( ptrdx, ptrdy, ktrd, kt, pdt )57 SUBROUTINE trd_pen( ptrdx, ptrdy, ktrd, kt, pdt, Kmm ) 58 58 !!--------------------------------------------------------------------- 59 59 !! *** ROUTINE trd_tra_mng *** … … 66 66 INTEGER , INTENT(in) :: ktrd ! tracer trend index 67 67 INTEGER , INTENT(in) :: kt ! time step index 68 INTEGER , INTENT(in) :: Kmm ! time level index 68 69 REAL(wp) , INTENT(in) :: pdt ! time step [s] 69 70 ! … … 77 78 IF( kt /= nkstp ) THEN ! full eos: set partial derivatives at the 1st call of kt time step 78 79 nkstp = kt 79 CALL eos_pen( ts n, rab_PE, zpe)80 CALL eos_pen( ts(:,:,:,:,Kmm), rab_PE, zpe, Kmm ) 80 81 CALL iom_put( "alphaPE", rab_pe(:,:,:,jp_tem) ) 81 82 CALL iom_put( "betaPE" , rab_pe(:,:,:,jp_sal) ) … … 95 96 IF( ln_linssh ) THEN ! cst volume : adv flux through z=0 surface 96 97 ALLOCATE( z2d(jpi,jpj) ) 97 z2d(:,:) = w n(:,:,1) * ( &98 & - ( rab_n(:,:,1,jp_tem) + rab_pe(:,:,1,jp_tem) ) * ts n(:,:,1,jp_tem) &99 & + ( rab_n(:,:,1,jp_sal) + rab_pe(:,:,1,jp_sal) ) * ts n(:,:,1,jp_sal) &100 & ) / e3t _n(:,:,1)98 z2d(:,:) = ww(:,:,1) * ( & 99 & - ( rab_n(:,:,1,jp_tem) + rab_pe(:,:,1,jp_tem) ) * ts(:,:,1,jp_tem,Kmm) & 100 & + ( rab_n(:,:,1,jp_sal) + rab_pe(:,:,1,jp_sal) ) * ts(:,:,1,jp_sal,Kmm) & 101 & ) / e3t(:,:,1,Kmm) 101 102 CALL iom_put( "petrd_sad" , z2d ) 102 103 DEALLOCATE( z2d ) … … 112 113 CASE ( jptra_bbc ) ; CALL iom_put( "petrd_bbc" , zpe ) ! bottom bound cond (geoth flux) 113 114 CASE ( jptra_atf ) ; CALL iom_put( "petrd_atf" , zpe ) ! asselin time filter (last trend) 114 !IF( ln_linssh ) THEN ! cst volume : ssh term (otherwise include in e3t variation)115 ! ALLOCATE( z2d(jpi,jpj) )116 ! z2d(:,:) = ( ssha(:,:) - sshb(:,:) ) &117 ! & * ( dPE_dt(:,:,1) * tsn(:,:,1,jp_tem) &118 ! & + dPE_ds(:,:,1) * tsn(:,:,1,jp_sal) ) / ( e3t_n(:,:,1) * pdt )119 ! CALL iom_put( "petrd_sad" , z2d )120 ! DEALLOCATE( z2d )121 !ENDIF122 115 ! 123 116 END SELECT
Note: See TracChangeset
for help on using the changeset viewer.