Changeset 867 for trunk/NEMO
- Timestamp:
- 2008-03-14T15:57:19+01:00 (16 years ago)
- Location:
- trunk/NEMO/LIM_SRC_3
- Files:
-
- 6 edited
-
limdyn.F90 (modified) (3 diffs)
-
limitd_me.F90 (modified) (4 diffs)
-
limitd_th.F90 (modified) (4 diffs)
-
limthd.F90 (modified) (3 diffs)
-
limtrp.F90 (modified) (3 diffs)
-
limupdate.F90 (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEMO/LIM_SRC_3/limdyn.F90
r863 r867 271 271 272 272 IF(ln_ctl) THEN ! Control print 273 CALL prt_ctl_info(' ') 274 CALL prt_ctl_info(' - Cell values : ') 275 CALL prt_ctl_info(' ~~~~~~~~~~~~~ ') 273 276 CALL prt_ctl(tab2d_1=tio_u , clinfo1=' lim_dyn : tio_u :', tab2d_2=tio_v , clinfo2=' tio_v :') 274 277 CALL prt_ctl(tab2d_1=ust2s , clinfo1=' lim_dyn : ust2s :') … … 284 287 CALL prt_ctl(tab2d_1=stress12_i, clinfo1=' lim_dyn : stress12_i:') 285 288 DO jl = 1, jpl 289 CALL prt_ctl_info(' ') 286 290 CALL prt_ctl_info(' - Category : ', ivar1=jl) 287 291 CALL prt_ctl_info(' ~~~~~~~~~~') … … 297 301 CALL prt_ctl(tab2d_1=smv_i (:,:,jl) , clinfo1= ' lim_dyn : smv_i : ') 298 302 DO ja = 1, nlay_i 303 CALL prt_ctl_info(' ') 299 304 CALL prt_ctl_info(' - Layer : ', ivar1=ja) 300 305 CALL prt_ctl_info(' ~~~~~~~') -
trunk/NEMO/LIM_SRC_3/limitd_me.F90
r863 r867 462 462 d_smv_i_trp(:,:,:) = smv_i(:,:,:) - old_smv_i(:,:,:) 463 463 464 !-------------------------!465 ! Back to initial values466 !-------------------------!467 468 ! update of fields will be made later in lim update469 u_ice(:,:) = old_u_ice(:,:)470 v_ice(:,:) = old_v_ice(:,:)471 a_i(:,:,:) = old_a_i(:,:,:)472 v_s(:,:,:) = old_v_s(:,:,:)473 v_i(:,:,:) = old_v_i(:,:,:)474 e_s(:,:,:,:) = old_e_s(:,:,:,:)475 e_i(:,:,:,:) = old_e_i(:,:,:,:)476 oa_i(:,:,:) = old_oa_i(:,:,:)477 IF ( ( num_sal .EQ. 2 ) .OR. ( num_sal .EQ. 4 ) ) &478 smv_i(:,:,:) = old_smv_i(:,:,:)479 480 464 IF(ln_ctl) THEN ! Control print 465 CALL prt_ctl_info(' ') 466 CALL prt_ctl_info(' - Cell values : ') 467 CALL prt_ctl_info(' ~~~~~~~~~~~~~ ') 481 468 CALL prt_ctl(tab2d_1=area , clinfo1=' lim_itd_me : cell area :') 482 469 CALL prt_ctl(tab2d_1=at_i , clinfo1=' lim_itd_me : at_i :') … … 484 471 CALL prt_ctl(tab2d_1=vt_s , clinfo1=' lim_itd_me : vt_s :') 485 472 DO jl = 1, jpl 473 CALL prt_ctl_info(' ') 486 474 CALL prt_ctl_info(' - Category : ', ivar1=jl) 487 475 CALL prt_ctl_info(' ~~~~~~~~~~') … … 497 485 CALL prt_ctl(tab2d_1=smv_i (:,:,jl) , clinfo1= ' lim_itd_me : smv_i : ') 498 486 DO jk = 1, nlay_i 487 CALL prt_ctl_info(' ') 499 488 CALL prt_ctl_info(' - Layer : ', ivar1=jk) 500 489 CALL prt_ctl_info(' ~~~~~~~') … … 505 494 ENDIF 506 495 496 !-------------------------! 497 ! Back to initial values 498 !-------------------------! 499 500 ! update of fields will be made later in lim update 501 u_ice(:,:) = old_u_ice(:,:) 502 v_ice(:,:) = old_v_ice(:,:) 503 a_i(:,:,:) = old_a_i(:,:,:) 504 v_s(:,:,:) = old_v_s(:,:,:) 505 v_i(:,:,:) = old_v_i(:,:,:) 506 e_s(:,:,:,:) = old_e_s(:,:,:,:) 507 e_i(:,:,:,:) = old_e_i(:,:,:,:) 508 oa_i(:,:,:) = old_oa_i(:,:,:) 509 IF ( ( num_sal .EQ. 2 ) .OR. ( num_sal .EQ. 4 ) ) & 510 smv_i(:,:,:) = old_smv_i(:,:,:) 507 511 508 512 !----------------------------------------------------! -
trunk/NEMO/LIM_SRC_3/limitd_th.F90
r863 r867 134 134 d_smv_i_thd(:,:,:) = smv_i(:,:,:) - old_smv_i(:,:,:) 135 135 136 !- Recover Old values137 a_i(:,:,:) = old_a_i (:,:,:)138 v_s(:,:,:) = old_v_s (:,:,:)139 v_i(:,:,:) = old_v_i (:,:,:)140 e_s(:,:,:,:) = old_e_s (:,:,:,:)141 e_i(:,:,:,:) = old_e_i (:,:,:,:)142 143 IF ( ( num_sal .EQ. 2 ) .OR. ( num_sal .EQ. 4 ) ) &144 smv_i(:,:,:) = old_smv_i (:,:,:)145 146 136 IF(ln_ctl) THEN ! Control print 137 CALL prt_ctl_info(' ') 138 CALL prt_ctl_info(' - Cell values : ') 139 CALL prt_ctl_info(' ~~~~~~~~~~~~~ ') 147 140 CALL prt_ctl(tab2d_1=area , clinfo1=' lim_itd_th : cell area :') 148 141 CALL prt_ctl(tab2d_1=at_i , clinfo1=' lim_itd_th : at_i :') … … 150 143 CALL prt_ctl(tab2d_1=vt_s , clinfo1=' lim_itd_th : vt_s :') 151 144 DO jl = 1, jpl 145 CALL prt_ctl_info(' ') 152 146 CALL prt_ctl_info(' - Category : ', ivar1=jl) 153 147 CALL prt_ctl_info(' ~~~~~~~~~~') … … 163 157 CALL prt_ctl(tab2d_1=smv_i (:,:,jl) , clinfo1= ' lim_itd_th : smv_i : ') 164 158 DO ja = 1, nlay_i 159 CALL prt_ctl_info(' ') 165 160 CALL prt_ctl_info(' - Layer : ', ivar1=ja) 166 161 CALL prt_ctl_info(' ~~~~~~~') … … 171 166 ENDIF 172 167 168 !- Recover Old values 169 a_i(:,:,:) = old_a_i (:,:,:) 170 v_s(:,:,:) = old_v_s (:,:,:) 171 v_i(:,:,:) = old_v_i (:,:,:) 172 e_s(:,:,:,:) = old_e_s (:,:,:,:) 173 e_i(:,:,:,:) = old_e_i (:,:,:,:) 174 175 IF ( ( num_sal .EQ. 2 ) .OR. ( num_sal .EQ. 4 ) ) & 176 smv_i(:,:,:) = old_smv_i (:,:,:) 177 173 178 174 179 END SUBROUTINE lim_itd_th -
trunk/NEMO/LIM_SRC_3/limthd.F90
r863 r867 476 476 477 477 IF(ln_ctl) THEN ! Control print 478 CALL prt_ctl_info(' ') 479 CALL prt_ctl_info(' - Cell values : ') 480 CALL prt_ctl_info(' ~~~~~~~~~~~~~ ') 478 481 CALL prt_ctl(tab2d_1=area , clinfo1=' lim_thd : cell area :') 479 482 CALL prt_ctl(tab2d_1=at_i , clinfo1=' lim_thd : at_i :') … … 481 484 CALL prt_ctl(tab2d_1=vt_s , clinfo1=' lim_thd : vt_s :') 482 485 DO jl = 1, jpl 486 CALL prt_ctl_info(' ') 483 487 CALL prt_ctl_info(' - Category : ', ivar1=jl) 484 488 CALL prt_ctl_info(' ~~~~~~~~~~') … … 494 498 CALL prt_ctl(tab2d_1=smv_i (:,:,jl) , clinfo1= ' lim_thd : smv_i : ') 495 499 DO jk = 1, nlay_i 500 CALL prt_ctl_info(' ') 496 501 CALL prt_ctl_info(' - Layer : ', ivar1=jk) 497 502 CALL prt_ctl_info(' ~~~~~~~') -
trunk/NEMO/LIM_SRC_3/limtrp.F90
r863 r867 554 554 555 555 IF(ln_ctl) THEN ! Control print 556 CALL prt_ctl_info(' ') 557 CALL prt_ctl_info(' - Cell values : ') 558 CALL prt_ctl_info(' ~~~~~~~~~~~~~ ') 556 559 CALL prt_ctl(tab2d_1=area , clinfo1=' lim_trp : cell area :') 557 560 CALL prt_ctl(tab2d_1=at_i , clinfo1=' lim_trp : at_i :') … … 559 562 CALL prt_ctl(tab2d_1=vt_s , clinfo1=' lim_trp : vt_s :') 560 563 DO jl = 1, jpl 564 CALL prt_ctl_info(' ') 561 565 CALL prt_ctl_info(' - Category : ', ivar1=jl) 562 566 CALL prt_ctl_info(' ~~~~~~~~~~') … … 572 576 CALL prt_ctl(tab2d_1=smv_i (:,:,jl) , clinfo1= ' lim_trp : smv_i : ') 573 577 DO jk = 1, nlay_i 578 CALL prt_ctl_info(' ') 574 579 CALL prt_ctl_info(' - Layer : ', ivar1=jk) 575 580 CALL prt_ctl_info(' ~~~~~~~') -
trunk/NEMO/LIM_SRC_3/limupdate.F90
r863 r867 998 998 999 999 IF(ln_ctl) THEN ! Control print 1000 CALL prt_ctl_info(' ') 1000 1001 CALL prt_ctl_info(' - Cell values : ') 1001 1002 CALL prt_ctl_info(' ~~~~~~~~~~~~~ ') … … 1010 1011 1011 1012 DO jl = 1, jpl 1013 CALL prt_ctl_info(' ') 1012 1014 CALL prt_ctl_info(' - Category : ', ivar1=jl) 1013 1015 CALL prt_ctl_info(' ~~~~~~~~~~') … … 1054 1056 DO jk = 1, nlay_i 1055 1057 CALL prt_ctl_info(' - Layer : ', ivar1=jk) 1056 CALL prt_ctl(tab2d_1=t_i(:,:,jk,jl) , clinfo1= ' lim_ dyn: t_i : ')1058 CALL prt_ctl(tab2d_1=t_i(:,:,jk,jl) , clinfo1= ' lim_update : t_i : ') 1057 1059 END DO 1058 1060 END DO 1059 1061 1062 CALL prt_ctl_info(' ') 1060 1063 CALL prt_ctl_info(' - Heat / FW fluxes : ') 1061 1064 CALL prt_ctl_info(' ~~~~~~~~~~~~~~~~~~ ') … … 1064 1067 CALL prt_ctl(tab2d_1=fhbri , clinfo1= ' lim_update : fhbri : ', tab2d_2=fheat_rpo , clinfo2= ' fheat_rpo : ') 1065 1068 1069 CALL prt_ctl_info(' ') 1066 1070 CALL prt_ctl_info(' - Stresses : ') 1067 1071 CALL prt_ctl_info(' ~~~~~~~~~~ ')
Note: See TracChangeset
for help on using the changeset viewer.
