Changeset 683 for trunk/NEMO/OPA_SRC
- Timestamp:
- 2007-06-29T18:37:27+02:00 (17 years ago)
- Location:
- trunk/NEMO/OPA_SRC
- Files:
-
- 9 edited
-
DYN/dynspg_exp.F90 (modified) (2 diffs)
-
DYN/dynspg_flt.F90 (modified) (2 diffs)
-
DYN/dynspg_rl.F90 (modified) (2 diffs)
-
DYN/dynspg_ts.F90 (modified) (3 diffs)
-
SBC/flx_core.h90 (modified) (2 diffs)
-
SOL/solisl.F90 (modified) (2 diffs)
-
TRD/trdmld_rst.F90 (modified) (4 diffs)
-
ZDF/zdftke.F90 (modified) (2 diffs)
-
restart.F90 (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/NEMO/OPA_SRC/DYN/dynspg_exp.F90
r657 r683 40 40 !!---------------------------------------------------------------------- 41 41 !! OPA 9.0 , LOCEAN-IPSL (2005) 42 !! $Header $42 !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/DYN/dynspg_exp.F90,v 1.9 2007/06/05 10:38:27 opalod Exp $ 43 43 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 44 44 !!---------------------------------------------------------------------- … … 238 238 IF( TRIM(cdrw) == 'READ' ) THEN 239 239 IF( iom_varid( numror, 'sshn' ) > 0 ) THEN 240 CALL iom_get( numror, jpdom_ local, 'sshb' , sshb(:,:) )241 CALL iom_get( numror, jpdom_ local, 'sshn' , sshn(:,:) )240 CALL iom_get( numror, jpdom_autoglo, 'sshb' , sshb(:,:) ) 241 CALL iom_get( numror, jpdom_autoglo, 'sshn' , sshn(:,:) ) 242 242 IF( neuler == 0 ) sshb(:,:) = sshn(:,:) 243 243 ELSE -
trunk/NEMO/OPA_SRC/DYN/dynspg_flt.F90
r661 r683 59 59 !!---------------------------------------------------------------------- 60 60 !! OPA 9.0 , LOCEAN-IPSL (2005) 61 !! $Header $61 !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/DYN/dynspg_flt.F90,v 1.14 2007/06/05 10:38:27 opalod Exp $ 62 62 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 63 63 !!---------------------------------------------------------------------- … … 453 453 ! Caution : extra-hallow 454 454 ! gcx and gcxb are defined as: DIMENSION(1-jpr2di:jpi+jpr2di,1-jpr2dj:jpj+jpr2dj) 455 CALL iom_get( numror, jpdom_ local, 'gcx' , gcx (1:jpi,1:jpj) )456 CALL iom_get( numror, jpdom_ local, 'gcxb', gcxb(1:jpi,1:jpj) )457 CALL iom_get( numror, jpdom_ local, 'sshb', sshb(:,:) )458 CALL iom_get( numror, jpdom_ local, 'sshn', sshn(:,:) )455 CALL iom_get( numror, jpdom_autoglo, 'gcx' , gcx (1:jpi,1:jpj) ) 456 CALL iom_get( numror, jpdom_autoglo, 'gcxb', gcxb(1:jpi,1:jpj) ) 457 CALL iom_get( numror, jpdom_autoglo, 'sshb', sshb(:,:) ) 458 CALL iom_get( numror, jpdom_autoglo, 'sshn', sshn(:,:) ) 459 459 IF( neuler == 0 ) THEN 460 460 sshb(:,:) = sshn(:,:) -
trunk/NEMO/OPA_SRC/DYN/dynspg_rl.F90
r508 r683 56 56 !!---------------------------------------------------------------------- 57 57 !! OPA 9.0 , LOCEAN-IPSL (2005) 58 !! $Header $58 !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/DYN/dynspg_rl.F90,v 1.11 2007/06/05 10:38:27 opalod Exp $ 59 59 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 60 60 !!---------------------------------------------------------------------- … … 517 517 ! Caution : extra-hallow 518 518 ! gcx and gcxb are defined as: DIMENSION(1-jpr2di:jpi+jpr2di,1-jpr2dj:jpj+jpr2dj) 519 CALL iom_get( numror, jpdom_ local, 'gcx' , gcx (1:jpi,1:jpj) )520 CALL iom_get( numror, jpdom_ local, 'gcxb', gcxb(1:jpi,1:jpj) )521 CALL iom_get( numror, jpdom_ local, 'bsfb', bsfb(:,:) )522 CALL iom_get( numror, jpdom_ local, 'bsfn', bsfn(:,:) )523 CALL iom_get( numror, jpdom_ local, 'bsfd', bsfd(:,:) )519 CALL iom_get( numror, jpdom_autoglo, 'gcx' , gcx (1:jpi,1:jpj) ) 520 CALL iom_get( numror, jpdom_autoglo, 'gcxb', gcxb(1:jpi,1:jpj) ) 521 CALL iom_get( numror, jpdom_autoglo, 'bsfb', bsfb(:,:) ) 522 CALL iom_get( numror, jpdom_autoglo, 'bsfn', bsfn(:,:) ) 523 CALL iom_get( numror, jpdom_autoglo, 'bsfd', bsfd(:,:) ) 524 524 IF( neuler == 0 ) THEN 525 525 gcxb(:,:) = gcx (:,:) -
trunk/NEMO/OPA_SRC/DYN/dynspg_ts.F90
r661 r683 51 51 !!---------------------------------------------------------------------- 52 52 !! OPA 9.0 , LOCEAN-IPSL (2005) 53 !! $Header $53 !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/DYN/dynspg_ts.F90,v 1.16 2007/06/05 10:38:27 opalod Exp $ 54 54 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 55 55 !!---------------------------------------------------------------------- … … 627 627 IF( TRIM(cdrw) == 'READ' ) THEN 628 628 IF( iom_varid( numror, 'sshn' ) > 0 ) THEN 629 CALL iom_get( numror, jpdom_ local, 'sshb' , sshb(:,:) )630 CALL iom_get( numror, jpdom_ local, 'sshn' , sshn(:,:) )629 CALL iom_get( numror, jpdom_autoglo, 'sshb' , sshb(:,:) ) 630 CALL iom_get( numror, jpdom_autoglo, 'sshn' , sshn(:,:) ) 631 631 IF( neuler == 0 ) sshb(:,:) = sshn(:,:) 632 632 ELSE … … 637 637 ENDIF 638 638 IF( iom_varid( numror, 'sshn_b' ) > 0 ) THEN 639 CALL iom_get( numror, jpdom_ local, 'sshb_b', sshb_b(:,:) ) ! free surface issued640 CALL iom_get( numror, jpdom_ local, 'sshn_b', sshn_b(:,:) ) ! from time-splitting loop641 CALL iom_get( numror, jpdom_ local, 'un_b' , un_b (:,:) ) ! horizontal transports issued642 CALL iom_get( numror, jpdom_ local, 'vn_b' , vn_b (:,:) ) ! from barotropic loop639 CALL iom_get( numror, jpdom_autoglo, 'sshb_b', sshb_b(:,:) ) ! free surface issued 640 CALL iom_get( numror, jpdom_autoglo, 'sshn_b', sshn_b(:,:) ) ! from time-splitting loop 641 CALL iom_get( numror, jpdom_autoglo, 'un_b' , un_b (:,:) ) ! horizontal transports issued 642 CALL iom_get( numror, jpdom_autoglo, 'vn_b' , vn_b (:,:) ) ! from barotropic loop 643 643 IF( neuler == 0 ) sshb_b(:,:) = sshn_b(:,:) 644 644 ELSE -
trunk/NEMO/OPA_SRC/SBC/flx_core.h90
r670 r683 47 47 !!---------------------------------------------------------------------- 48 48 !! OPA 9.0 , LOCEAN-IPSL (2006) 49 !! $Header $49 !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/SBC/flx_core.h90,v 1.5 2007/06/05 10:41:37 opalod Exp $ 50 50 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 51 51 !!---------------------------------------------------------------------- … … 1105 1105 IF( TRIM(cdrw) == 'READ' ) THEN 1106 1106 IF( ln_rstart ) THEN 1107 CALL iom_get( numror, jpdom_ local, 'gsss', gsss )1108 CALL iom_get( numror, jpdom_ local, 'gu', gu )1109 CALL iom_get( numror, jpdom_ local, 'gv', gv )1107 CALL iom_get( numror, jpdom_autoglo, 'gsss', gsss ) 1108 CALL iom_get( numror, jpdom_autoglo, 'gu', gu ) 1109 CALL iom_get( numror, jpdom_autoglo, 'gv', gv ) 1110 1110 ENDIF ! gsss, gu, gv are initialized in the routine ( may be changed ) 1111 1111 ELSEIF( TRIM(cdrw) == 'WRITE' ) THEN -
trunk/NEMO/OPA_SRC/SOL/solisl.F90
r473 r683 62 62 !!---------------------------------------------------------------------- 63 63 !! OPA 9.0 , LOCEAN-IPSL (2005) 64 !! $Header $64 !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/SOL/solisl.F90,v 1.8 2007/06/05 10:40:06 opalod Exp $ 65 65 !! This software is governed by the CeCILL licence see modipsl/doc/NEMO_CeCILL.txt 66 66 !!---------------------------------------------------------------------- … … 793 793 WRITE(clisl,'("island",I3)') jni 794 794 ENDIF 795 CALL iom_get( inum, jpdom_ local, clisl, bsfisl(:,:,jni))795 CALL iom_get( inum, jpdom_autoglo, clisl, bsfisl(:,:,jni)) 796 796 END DO 797 797 ENDIF -
trunk/NEMO/OPA_SRC/TRD/trdmld_rst.F90
r580 r683 26 26 !!--------------------------------------------------------------------------------- 27 27 !! OPA 9.0 , LOCEAN-IPSL (2006) 28 !! $Header $28 !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/TRD/trdmld_rst.F90,v 1.7 2007/06/05 10:40:59 opalod Exp $ 29 29 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 30 30 !!--------------------------------------------------------------------------------- … … 135 135 IF( ln_trdmld_instant ) THEN 136 136 !-- Temperature 137 CALL iom_get( inum, jpdom_ local, 'tmlbb' , tmlbb )138 CALL iom_get( inum, jpdom_ local, 'tmlbn' , tmlbn )139 CALL iom_get( inum, jpdom_ local, 'tmlatfb' , tmlatfb )137 CALL iom_get( inum, jpdom_autoglo, 'tmlbb' , tmlbb ) 138 CALL iom_get( inum, jpdom_autoglo, 'tmlbn' , tmlbn ) 139 CALL iom_get( inum, jpdom_autoglo, 'tmlatfb' , tmlatfb ) 140 140 141 141 !-- Salinity 142 CALL iom_get( inum, jpdom_ local, 'smlbb' , smlbb )143 CALL iom_get( inum, jpdom_ local, 'smlbn' , smlbn )144 CALL iom_get( inum, jpdom_ local, 'smlatfb' , smlatfb )142 CALL iom_get( inum, jpdom_autoglo, 'smlbb' , smlbb ) 143 CALL iom_get( inum, jpdom_autoglo, 'smlbn' , smlbn ) 144 CALL iom_get( inum, jpdom_autoglo, 'smlatfb' , smlatfb ) 145 145 ELSE 146 CALL iom_get( inum, jpdom_ local, 'rmldbn' , rmldbn ) ! needed for rmld_sum146 CALL iom_get( inum, jpdom_autoglo, 'rmldbn' , rmldbn ) ! needed for rmld_sum 147 147 148 148 !-- Temperature 149 CALL iom_get( inum, jpdom_ local, 'tmlbn' , tmlbn ) ! needed for tml_sum150 CALL iom_get( inum, jpdom_ local, 'tml_sumb' , tml_sumb )149 CALL iom_get( inum, jpdom_autoglo, 'tmlbn' , tmlbn ) ! needed for tml_sum 150 CALL iom_get( inum, jpdom_autoglo, 'tml_sumb' , tml_sumb ) 151 151 DO jk = 1, jpltrd 152 152 IF( jk < 10 ) THEN … … 155 155 WRITE(charout,FMT="('tmltrd_csum_ub_', I2)") jk 156 156 ENDIF 157 CALL iom_get( inum, jpdom_ local, charout, tmltrd_csum_ub(:,:,jk) )157 CALL iom_get( inum, jpdom_autoglo, charout, tmltrd_csum_ub(:,:,jk) ) 158 158 ENDDO 159 CALL iom_get( inum, jpdom_ local, 'tmltrd_atf_sumb' , tmltrd_atf_sumb)159 CALL iom_get( inum, jpdom_autoglo, 'tmltrd_atf_sumb' , tmltrd_atf_sumb) 160 160 161 161 !-- Salinity 162 CALL iom_get( inum, jpdom_ local, 'smlbn' , smlbn ) ! needed for sml_sum163 CALL iom_get( inum, jpdom_ local, 'sml_sumb' , sml_sumb )162 CALL iom_get( inum, jpdom_autoglo, 'smlbn' , smlbn ) ! needed for sml_sum 163 CALL iom_get( inum, jpdom_autoglo, 'sml_sumb' , sml_sumb ) 164 164 DO jk = 1, jpltrd 165 165 IF( jk < 10 ) THEN … … 168 168 WRITE(charout,FMT="('smltrd_csum_ub_', I2)") jk 169 169 ENDIF 170 CALL iom_get( inum, jpdom_ local, charout, smltrd_csum_ub(:,:,jk) )170 CALL iom_get( inum, jpdom_autoglo, charout, smltrd_csum_ub(:,:,jk) ) 171 171 ENDDO 172 CALL iom_get( inum, jpdom_ local, 'smltrd_atf_sumb' , smltrd_atf_sumb)172 CALL iom_get( inum, jpdom_autoglo, 'smltrd_atf_sumb' , smltrd_atf_sumb) 173 173 174 174 CALL iom_close( inum ) -
trunk/NEMO/OPA_SRC/ZDF/zdftke.F90
r552 r683 81 81 !!---------------------------------------------------------------------- 82 82 !! OPA 9.0 , LOCEAN-IPSL (2006) 83 !! $Header $83 !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/ZDF/zdftke.F90,v 1.16 2007/06/05 10:39:27 opalod Exp $ 84 84 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 85 85 !!---------------------------------------------------------------------- … … 800 800 IF( ln_rstart ) THEN 801 801 IF( iom_varid( numror, 'en' ) > 0 .AND. .NOT.(ln_rstke) ) THEN 802 CALL iom_get( numror, jpdom_ local, 'en', en )802 CALL iom_get( numror, jpdom_autoglo, 'en', en ) 803 803 ELSE 804 804 IF(lwp .AND. iom_varid(numror,'en') > 0 ) WRITE(numout,*) ' ===>>>> : previous run without tke scheme' -
trunk/NEMO/OPA_SRC/restart.F90
r632 r683 43 43 !!---------------------------------------------------------------------- 44 44 !! OPA 9.0 , LOCEAN-IPSL (2006) 45 !! $Header $45 !! $Header: /home/opalod/NEMOCVSROOT/NEMO/OPA_SRC/restart.F90,v 1.27 2007/06/05 10:35:19 opalod Exp $ 46 46 !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 47 47 !!---------------------------------------------------------------------- … … 276 276 ! 277 277 ! ! Read prognostic variables 278 CALL iom_get( numror, jpdom_ local, 'ub' , ub ) ! before i-component velocity279 CALL iom_get( numror, jpdom_ local, 'vb' , vb ) ! before j-component velocity280 CALL iom_get( numror, jpdom_ local, 'tb' , tb ) ! before temperature281 CALL iom_get( numror, jpdom_ local, 'sb' , sb ) ! before salinity282 CALL iom_get( numror, jpdom_ local, 'rotb' , rotb ) ! before curl283 CALL iom_get( numror, jpdom_ local, 'hdivb', hdivb ) ! before horizontal divergence284 CALL iom_get( numror, jpdom_ local, 'un' , un ) ! now i-component velocity285 CALL iom_get( numror, jpdom_ local, 'vn' , vn ) ! now j-component velocity286 IF( lk_vvl ) CALL iom_get( numror, jpdom_ local, 'wn' , wn ) ! now k-component velocity287 CALL iom_get( numror, jpdom_ local, 'tn' , tn ) ! now temperature288 CALL iom_get( numror, jpdom_ local, 'sn' , sn ) ! now salinity289 CALL iom_get( numror, jpdom_ local, 'rotn' , rotn ) ! now curl290 CALL iom_get( numror, jpdom_ local, 'hdivn', hdivn ) ! now horizontal divergence278 CALL iom_get( numror, jpdom_autoglo, 'ub' , ub ) ! before i-component velocity 279 CALL iom_get( numror, jpdom_autoglo, 'vb' , vb ) ! before j-component velocity 280 CALL iom_get( numror, jpdom_autoglo, 'tb' , tb ) ! before temperature 281 CALL iom_get( numror, jpdom_autoglo, 'sb' , sb ) ! before salinity 282 CALL iom_get( numror, jpdom_autoglo, 'rotb' , rotb ) ! before curl 283 CALL iom_get( numror, jpdom_autoglo, 'hdivb', hdivb ) ! before horizontal divergence 284 CALL iom_get( numror, jpdom_autoglo, 'un' , un ) ! now i-component velocity 285 CALL iom_get( numror, jpdom_autoglo, 'vn' , vn ) ! now j-component velocity 286 IF( lk_vvl ) CALL iom_get( numror, jpdom_autoglo, 'wn' , wn ) ! now k-component velocity 287 CALL iom_get( numror, jpdom_autoglo, 'tn' , tn ) ! now temperature 288 CALL iom_get( numror, jpdom_autoglo, 'sn' , sn ) ! now salinity 289 CALL iom_get( numror, jpdom_autoglo, 'rotn' , rotn ) ! now curl 290 CALL iom_get( numror, jpdom_autoglo, 'hdivn', hdivn ) ! now horizontal divergence 291 291 292 292 … … 306 306 IF( iom_varid( numror, 'nfice' ) > 0 ) then 307 307 CALL iom_get( numror , 'nfice' , znfice ) ! ice computation frequency 308 CALL iom_get( numror, jpdom_ local, 'sst_io' , sst_io )309 CALL iom_get( numror, jpdom_ local, 'sss_io' , sss_io )310 CALL iom_get( numror, jpdom_ local, 'u_io' , u_io )311 CALL iom_get( numror, jpdom_ local, 'v_io' , v_io )308 CALL iom_get( numror, jpdom_autoglo, 'sst_io' , sst_io ) 309 CALL iom_get( numror, jpdom_autoglo, 'sss_io' , sss_io ) 310 CALL iom_get( numror, jpdom_autoglo, 'u_io' , u_io ) 311 CALL iom_get( numror, jpdom_autoglo, 'v_io' , v_io ) 312 312 # if defined key_coupled 313 CALL iom_get( numror, jpdom_ local, 'alb_ice', alb_ice )313 CALL iom_get( numror, jpdom_autoglo, 'alb_ice', alb_ice ) 314 314 # endif 315 315 IF( znfice /= REAL( nfice, wp ) ) THEN ! if nfice changed between 2 runs … … 343 343 IF( iom_varid( numror, 'nfbulk' ) > 0 ) THEN 344 344 CALL iom_get( numror , 'nfbulk', znfbulk ) ! bulk computation frequency 345 CALL iom_get( numror, jpdom_ local, 'gsst' , gsst )345 CALL iom_get( numror, jpdom_autoglo, 'gsst' , gsst ) 346 346 IF( znfbulk /= REAL(nfbulk, wp) ) THEN ! if you change nfbulk between 2 runs 347 347 zcoef = REAL( nfbulk-1, wp ) / znfbulk … … 359 359 360 360 IF( iom_varid( numror, 'rhd' ) > 0 ) THEN 361 CALL iom_get( numror, jpdom_ local, 'rhd' , rhd )362 CALL iom_get( numror, jpdom_ local, 'rhop', rhop )361 CALL iom_get( numror, jpdom_autoglo, 'rhd' , rhd ) 362 CALL iom_get( numror, jpdom_autoglo, 'rhop', rhop ) 363 363 ELSE 364 364 CALL eos( tb, sb, rhd, rhop ) ! before potential and in situ densities … … 366 366 IF( ln_zps .AND. .NOT. lk_cfg_1d ) THEN 367 367 IF( iom_varid( numror, 'gtu' ) > 0 ) THEN 368 CALL iom_get( numror, jpdom_ local, 'gtu' , gtu )369 CALL iom_get( numror, jpdom_ local, 'gsu' , gsu )370 CALL iom_get( numror, jpdom_ local, 'gru' , gru )371 CALL iom_get( numror, jpdom_ local, 'gtv' , gtv )372 CALL iom_get( numror, jpdom_ local, 'gsv' , gsv )373 CALL iom_get( numror, jpdom_ local, 'grv' , grv )368 CALL iom_get( numror, jpdom_autoglo, 'gtu' , gtu ) 369 CALL iom_get( numror, jpdom_autoglo, 'gsu' , gsu ) 370 CALL iom_get( numror, jpdom_autoglo, 'gru' , gru ) 371 CALL iom_get( numror, jpdom_autoglo, 'gtv' , gtv ) 372 CALL iom_get( numror, jpdom_autoglo, 'gsv' , gsv ) 373 CALL iom_get( numror, jpdom_autoglo, 'grv' , grv ) 374 374 ELSE 375 375 CALL zps_hde( nit000, tb , sb , rhd, & ! Partial steps: before Horizontal DErivative
Note: See TracChangeset
for help on using the changeset viewer.
