Changeset 1271
- Timestamp:
- 2009-01-15T09:12:00+01:00 (15 years ago)
- Location:
- trunk/NEMO
- Files:
-
- 2 added
- 14 edited
-
NST_SRC/agrif_top_interp.F90 (modified) (3 diffs)
-
NST_SRC/agrif_top_sponge.F90 (added)
-
NST_SRC/agrif_top_update.F90 (modified) (1 diff)
-
NST_SRC/agrif_user.F90 (modified) (5 diffs)
-
OPA_SRC/DOM/dommsk.F90 (modified) (1 diff)
-
OPA_SRC/IOM/iom_ioipsl.F90 (modified) (1 diff)
-
OPA_SRC/IOM/iom_nf90.F90 (modified) (1 diff)
-
TOP_SRC/DUMMY/agrif_top_sponge.F90 (added)
-
TOP_SRC/PISCES/p4zopt.F90 (modified) (1 diff)
-
TOP_SRC/TRP/trcbbl.F90 (modified) (1 diff)
-
TOP_SRC/TRP/trcnxt.F90 (modified) (3 diffs)
-
TOP_SRC/TRP/trctrp.F90 (modified) (2 diffs)
-
TOP_SRC/TRP/trczdf_exp.F90 (modified) (1 diff)
-
TOP_SRC/TRP/trczdf_imp.F90 (modified) (1 diff)
-
TOP_SRC/TRP/trczdf_iso.F90 (modified) (1 diff)
-
TOP_SRC/TRP/trczdf_iso_vopt.F90 (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEMO/NST_SRC/agrif_top_interp.F90
r1206 r1271 6 6 USE sol_oce 7 7 USE agrif_oce 8 USE trcstp 9 USE sms 8 USE trc 10 9 11 10 IMPLICIT NONE … … 22 21 CONTAINS 23 22 24 SUBROUTINE Agrif_trc ( kt )23 SUBROUTINE Agrif_trc 25 24 !!--------------------------------------------- 26 25 !! *** ROUTINE Agrif_trc *** … … 29 28 # include "vectopt_loop_substitute.h90" 30 29 31 INTEGER, INTENT(in) :: kt32 33 30 INTEGER :: ji,jj,jk,jn 34 31 REAL(wp) :: zrhox -
trunk/NEMO/NST_SRC/agrif_top_update.F90
r1206 r1271 8 8 USE dom_oce 9 9 USE agrif_oce 10 USE trcstp 11 USE sms 10 USE trc 12 11 13 12 IMPLICIT NONE -
trunk/NEMO/NST_SRC/agrif_user.F90
r1200 r1271 62 62 USE dom_oce 63 63 USE opa 64 USE sms 64 #if defined key_top 65 USE trc 66 #endif 65 67 #if defined key_tradmp || defined key_esopa 66 68 USE tradmp … … 76 78 USE agrif_top_update 77 79 USE agrif_top_interp 80 USE agrif_top_sponge 78 81 79 82 IMPLICIT NONE … … 153 156 154 157 #if defined key_top 158 Call Agrif_Set_raf(trn,(/'x','y','N','N'/)) 155 159 Call Agrif_Set_raf(trb,(/'x','y','N','N'/)) 156 Call Agrif_Set_raf(trn,(/'x','y','N','N'/))157 160 Call Agrif_Set_raf(tra,(/'x','y','N','N'/)) 158 161 #endif … … 241 244 #if defined key_top 242 245 Call Agrif_Bc_variable(tabtrtemp,trn,calledweight=1.) 243 Call Agrif_Bc_variable(tabtrtemp,tra,calledweight=1. )246 Call Agrif_Bc_variable(tabtrtemp,tra,calledweight=1.,procname=interptrn) 244 247 #endif 245 248 Agrif_UseSpecialValue = .FALSE. … … 292 295 ENDIF 293 296 ENDIF 297 #if defined key_top 298 ! Check passive tracer cell 299 IF( ndttrc .ne. 1 ) THEN 300 WRITE(*,*) 'ndttrc should be equal to 1' 301 ENDIF 302 #endif 294 303 295 304 ENDIF 296 305 306 #if defined key_top 307 CALL Agrif_Update_trc(0) 308 #endif 297 309 CALL Agrif_Update_tra(0) 298 310 CALL Agrif_Update_dyn(0) -
trunk/NEMO/OPA_SRC/DOM/dommsk.F90
r1152 r1271 229 229 umask(ji,jj,jk) = tmask(ji,jj ,jk) * tmask(ji+1,jj ,jk) 230 230 vmask(ji,jj,jk) = tmask(ji,jj ,jk) * tmask(ji ,jj+1,jk) 231 END DO 232 DO ji = 1, jpim1 231 233 fmask(ji,jj,jk) = tmask(ji,jj ,jk) * tmask(ji+1,jj ,jk) & 232 234 & * tmask(ji,jj+1,jk) * tmask(ji+1,jj+1,jk) -
trunk/NEMO/OPA_SRC/IOM/iom_ioipsl.F90
r1152 r1271 287 287 !! ** Purpose : read the time axis cdvar in the file 288 288 !!-------------------------------------------------------------------- 289 INTEGER 290 INTEGER 291 INTEGER 292 CHARACTER(len=*) 293 INTEGER 294 INTEGER 295 REAL(wp) 296 REAL(wp), DIMENSION( jpk), INTENT(in), OPTIONAL :: pv_r1d ! written 1d field297 REAL(wp), DIMENSION( jpi,jpj), INTENT(in), OPTIONAL :: pv_r2d ! written 2d field298 REAL(wp), DIMENSION( jpi,jpj,jpk), INTENT(in), OPTIONAL :: pv_r3d ! written 3d field289 INTEGER , INTENT(in) :: kt ! ocean time-step 290 INTEGER , INTENT(in) :: kwrite ! writing time-step 291 INTEGER , INTENT(in) :: kiomid ! Identifier of the file 292 CHARACTER(len=*) , INTENT(in) :: cdvar ! variable name 293 INTEGER , INTENT(in) :: kvid ! variable id 294 INTEGER , INTENT(in), OPTIONAL :: ktype ! variable type (default R8) 295 REAL(wp) , INTENT(in), OPTIONAL :: pv_r0d ! written Od field 296 REAL(wp), DIMENSION( :), INTENT(in), OPTIONAL :: pv_r1d ! written 1d field 297 REAL(wp), DIMENSION(:, : ), INTENT(in), OPTIONAL :: pv_r2d ! written 2d field 298 REAL(wp), DIMENSION(:, :, :), INTENT(in), OPTIONAL :: pv_r3d ! written 3d field 299 299 ! 300 300 INTEGER :: idims ! number of dimension -
trunk/NEMO/OPA_SRC/IOM/iom_nf90.F90
r1152 r1271 313 313 !! ** Purpose : read the time axis cdvar in the file 314 314 !!-------------------------------------------------------------------- 315 INTEGER 316 INTEGER 317 INTEGER 318 CHARACTER(len=*) 319 INTEGER 320 INTEGER 321 REAL(wp) 322 REAL(wp), DIMENSION( jpk), INTENT(in), OPTIONAL :: pv_r1d ! written 1d field323 REAL(wp), DIMENSION( jpi,jpj), INTENT(in), OPTIONAL :: pv_r2d ! written 2d field324 REAL(wp), DIMENSION( jpi,jpj,jpk), INTENT(in), OPTIONAL :: pv_r3d ! written 3d field315 INTEGER , INTENT(in) :: kt ! ocean time-step 316 INTEGER , INTENT(in) :: kwrite ! writing time-step 317 INTEGER , INTENT(in) :: kiomid ! Identifier of the file 318 CHARACTER(len=*) , INTENT(in) :: cdvar ! variable name 319 INTEGER , INTENT(in) :: kvid ! variable id 320 INTEGER , INTENT(in), OPTIONAL :: ktype ! variable type (default R8) 321 REAL(wp) , INTENT(in), OPTIONAL :: pv_r0d ! written Od field 322 REAL(wp), DIMENSION( :), INTENT(in), OPTIONAL :: pv_r1d ! written 1d field 323 REAL(wp), DIMENSION(:, : ), INTENT(in), OPTIONAL :: pv_r2d ! written 2d field 324 REAL(wp), DIMENSION(:, :, :), INTENT(in), OPTIONAL :: pv_r3d ! written 3d field 325 325 ! 326 326 INTEGER :: idims ! number of dimension -
trunk/NEMO/TOP_SRC/PISCES/p4zopt.F90
r1180 r1271 280 280 INTEGER :: numlight 281 281 REAL(wp) :: ztoto 282 CHARACTER(LEN=20) :: clname 282 283 283 284 ! FROM THE NEW BIOOPTIC MODEL PROPOSED JM ANDRE, WE READ HERE 284 285 ! A PRECOMPUTED ARRAY CORRESPONDING TO THE ATTENUATION COEFFICIENT 285 286 286 CALL ctlopn( numlight, 'kRGB61.txt', 'OLD', 'FORMATTED', 'SEQUENTIAL', & 287 clname = 'kRGB61.txt' 288 CALL ctlopn( numlight, clname, 'OLD', 'FORMATTED', 'SEQUENTIAL', & 287 289 & 1, numout, .TRUE., 1 ) 288 290 -
trunk/NEMO/TOP_SRC/TRP/trcbbl.F90
r1264 r1271 100 100 !! Beckmann, A., and R. Doscher, 1997, J. Phys.Oceanogr., 581-591. 101 101 !!---------------------------------------------------------------------- 102 USE oce _trc, ONLY : ztrtrd => ua ! use ua as 3D workspace102 USE oce, ONLY : ztrtrd => ua ! use ua as 3D workspace 103 103 !! 104 104 INTEGER, INTENT( in ) :: kt ! ocean time-step -
trunk/NEMO/TOP_SRC/TRP/trcnxt.F90
r1175 r1271 70 70 !! ** Action : - update trb, trn 71 71 !!---------------------------------------------------------------------- 72 USE oce, ONLY : ztrtrd => ua ! use ua as 3D workspace 72 73 !! * Arguments 73 USE oce_trc, ONLY : ztrtrd => ua ! use ua as a 3D workspace 74 INTEGER, INTENT( in ) :: kt ! ocean time-step index 74 INTEGER, INTENT( in ) :: kt ! ocean time-step index 75 75 !! * Local declarations 76 76 INTEGER :: ji, jj, jk, jn ! dummy loop indices … … 83 83 WRITE(numout,*) 'trc_nxt : time stepping on passive tracers' 84 84 ENDIF 85 86 85 87 86 DO jn = 1, jptra … … 113 112 END DO ! End of slab 114 113 ! ! =============== 115 ! Update tracers116 CALL Agrif_trc ( kt )114 ! Interp tracers on boundaries (coarse => fine) 115 CALL Agrif_trc 117 116 ! ! =============== 118 117 DO jn = 1, jptra ! Horizontal slab -
trunk/NEMO/TOP_SRC/TRP/trctrp.F90
r1256 r1271 42 42 43 43 USE zpshde_trc ! partial step: hor. derivative (zps_hde_trc routine) 44 45 #if defined key_agrif 46 USE agrif_top_sponge ! Momemtum and tracers sponges 47 #endif 44 48 45 49 IMPLICIT NONE … … 104 108 IF( l_trcldf_iso_zps ) CALL trc_ldf_iso_zps( kt ) ! partial step iso-neutral laplacian 105 109 IF( l_trcldf_lap ) CALL trc_ldf_lap ( kt ) ! iso-level laplacian 110 111 #if defined key_agrif 112 IF(.NOT. Agrif_Root()) CALL Agrif_Sponge_trc ! tracers sponge 113 #endif 106 114 107 115 ! ! vertical diffusion -
trunk/NEMO/TOP_SRC/TRP/trczdf_exp.F90
r1175 r1271 76 76 !! 77 77 !!--------------------------------------------------------------------- 78 USE oce _trc, ONLY : ztrtrd => ua ! use ua as 3D workspace78 USE oce, ONLY : ztrtrd => ua ! use ua as 3D workspace 79 79 !! * Arguments 80 80 INTEGER, INTENT( in ) :: kt ! ocean time-step index -
trunk/NEMO/TOP_SRC/TRP/trczdf_imp.F90
r1264 r1271 75 75 !! 76 76 !!--------------------------------------------------------------------- 77 USE oce_trc, ONLY : ztrtrd => ua ! use ua as 3D workspace78 77 !! 79 78 !! * Arguments 79 USE oce, ONLY : ztrtrd => ua ! use ua as 3D workspace 80 80 81 INTEGER, INTENT( in ) :: kt ! ocean time-step index 81 82 INTEGER :: ikst, ikenm2, ikstp1 -
trunk/NEMO/TOP_SRC/TRP/trczdf_iso.F90
r1258 r1271 118 118 !!--------------------------------------------------------------------- 119 119 !! * Modules used 120 USE oce _trc, ONLY : zavs => va, ztrtrd => ua120 USE oce , ONLY : zavs => va, ztrtrd => ua 121 121 122 122 !! * Arguments -
trunk/NEMO/TOP_SRC/TRP/trczdf_iso_vopt.F90
r1264 r1271 85 85 ! ----------------------------------------------------- 86 86 87 CALL trc_zdf_iso 87 CALL trc_zdf_iso( kt ) 88 88 89 89 IF( ln_ctl ) THEN ! print mean trends (used for debugging) … … 151 151 !! - Save the trend in trtrd ('key_trdmld_trc') 152 152 !!--------------------------------------------------------------------- 153 USE oce _trc, ONLY :zwd => ua, & ! ua, va used as153 USE oce, ONLY : zwd => ua, & ! ua, va used as 154 154 zws => va ! workspace 155 155 INTEGER, INTENT( in ) :: kt ! ocean time-step index … … 369 369 370 370 371 SUBROUTINE trc_zdf_iso 371 SUBROUTINE trc_zdf_iso ( kt ) 372 372 !!---------------------------------------------------------------------- 373 373 !! *** ROUTINE trc_zdf_iso *** … … 408 408 !! Save in trtrd arrays the trends if 'key_trdmld_trc' defined 409 409 !!--------------------------------------------------------------------- 410 USE oce _trc, ONLY : zwx => ua, & ! use ua, va as410 USE oce, ONLY : zwx => ua, & ! use ua, va as 411 411 zwy => va ! workspace arrays 412 INTEGER, INTENT(in) :: kt 412 413 413 414 INTEGER :: ji, jj, jk, jn ! dummy loop indices
Note: See TracChangeset
for help on using the changeset viewer.
