Changeset 4313
- Timestamp:
- 2013-11-22T13:12:59+01:00 (10 years ago)
- Location:
- branches/2013/dev_MERGE_2013/NEMOGCM/NEMO
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90
r4230 r4313 243 243 tsn(:,:,:,jp_sal) = sf_dyn(jf_sal)%fnow(:,:,:) * tmask(:,:,:) ! salinity 244 244 ! 245 CALL eos ( tsn, rhd, rhop ) ! In any case, we need rhop245 CALL eos ( tsn, rhd, rhop, gdept_0(:,:,:) ) ! In any case, we need rhop 246 246 CALL zdf_mxl( kt ) ! In any case, we need mxl 247 247 ! … … 521 521 !!--------------------------------------------------------------------- 522 522 #if defined key_ldfslp && ! defined key_c1d 523 CALL eos( pts, rhd, rhop ) ! Time-filtered in situ density523 CALL eos( pts, rhd, rhop, gdept_0(:,:,:) ) ! Time-filtered in situ density 524 524 CALL bn2( pts, rn2 ) ! before Brunt-Vaisala frequency 525 525 IF( ln_zps ) & -
branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90
r4245 r4313 761 761 tsb(:,:,:,:) = tsn(:,:,:,:) ! Update before fields 762 762 763 CALL eos( tsb, rhd, rhop ) ! Before potential and in situ densities763 CALL eos( tsb, rhd, rhop, gdept_0(:,:,:) ) ! Before potential and in situ densities 764 764 765 765 IF( ln_zps .AND. .NOT. lk_c1d ) & … … 769 769 770 770 #if defined key_zdfkpp 771 CALL eos( tsn, rhd ) ! Compute rhd771 CALL eos( tsn, rhd, fsdept_n(:,:,:) ) ! Compute rhd 772 772 #endif 773 773 -
branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/C1D/step_c1d.F90
r4247 r4313 130 130 CALL tra_nxt ( kstp ) ! tracer fields at next time step 131 131 IF( ln_zdfnpc ) CALL tra_npc ( kstp ) ! applied non penetrative convective adjustment on (t,s) 132 CALL eos( tsb, rhd, rhop ) ! now (swap=before) in situ density for dynhpg module132 CALL eos( tsb, rhd, rhop, gdept_0(:,:,:) ) ! now (swap=before) in situ density for dynhpg module 133 133 134 134 !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> -
branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DIA/diaar5.F90
r4292 r4313 98 98 ztsn(:,:,:,jp_tem) = tsn(:,:,:,jp_tem) ! thermosteric ssh 99 99 ztsn(:,:,:,jp_sal) = sn0(:,:,:) 100 CALL eos( ztsn, zrhd ) ! now in situ density using initial salinity100 CALL eos( ztsn, zrhd, fsdept_n(:,:,:) ) ! now in situ density using initial salinity 101 101 ! 102 102 zbotpres(:,:) = 0._wp ! no atmospheric surface pressure, levitating sea-ice … … 112 112 113 113 ! ! steric sea surface height 114 CALL eos( tsn, zrhd, zrhop ) ! now in situ and potential density114 CALL eos( tsn, zrhd, zrhop, fsdept_n(:,:,:) ) ! now in situ and potential density 115 115 zrhop(:,:,jpk) = 0._wp 116 116 CALL iom_put( 'rhop', zrhop ) -
branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90
r4292 r4313 130 130 ENDIF 131 131 ! 132 CALL eos( tsb, rhd, rhop ) ! before potential and in situ densities132 CALL eos( tsb, rhd, rhop, gdept_0(:,:,:) ) ! before potential and in situ densities 133 133 #if ! defined key_c1d 134 134 IF( ln_zps ) CALL zps_hde( nit000, jpts, tsb, gtsu, gtsv, & ! zps: before hor. gradient -
branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/IOM/restart.F90
r4292 r4313 228 228 CALL iom_get( numror, jpdom_autoglo, 'rhop' , rhop ) ! now potential density 229 229 ELSE 230 CALL eos ( tsn, rhd, rhop )230 CALL eos ( tsn, rhd, rhop, fsdept_n(:,:,:) ) 231 231 ENDIF 232 232 #if defined key_zdfkpp … … 234 234 CALL iom_get( numror, jpdom_autoglo, 'rhd' , rhd ) ! now in situ density anomaly 235 235 ELSE 236 CALL eos( tsn, rhd ) ! compute rhd236 CALL eos( tsn, rhd, fsdept_n(:,:,:) ) ! compute rhd 237 237 ENDIF 238 238 #endif -
branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/TRA/tranpc.F90
r3294 r4313 81 81 inpci = 0 82 82 83 CALL eos( tsa, rhd, zrhop ) ! Potential density83 CALL eos( tsa, rhd, zrhop, fsdept_n(:,:,:) ) ! Potential density 84 84 85 85 IF( l_trdtra ) THEN !* Save ta and sa trends -
branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/TRD/trdicp.F90
r3294 r4313 276 276 zkepe(:,:,:) = 0._wp 277 277 278 CALL eos( tsn, rhd, rhop ) ! now potential and in situ densities278 CALL eos( tsn, rhd, rhop, fsdept_n(:,:,:) ) ! now potential and in situ densities 279 279 280 280 zcof = 0.5_wp / rau0 ! Density flux at w-point -
branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/step.F90
r4312 r4313 112 112 ! Note that the computation of vertical velocity above, hence "after" sea level 113 113 ! is necessary to compute momentum advection for the rhs of barotropic loop: 114 CALL eos ( tsn, rhd, rhop ) ! now in situ density for hpg computation114 CALL eos ( tsn, rhd, rhop, fsdept_n(:,:,:) ) ! now in situ density for hpg computation 115 115 IF( ln_zps ) CALL zps_hde( kstp, jpts, tsn, gtsu, gtsv, & ! zps: now hor. derivative 116 116 & rhd, gru , grv ) ! of t, s, rd at the last ocean level
Note: See TracChangeset
for help on using the changeset viewer.