Changeset 3515


Ignore:
Timestamp:
2012-10-24T14:52:01+02:00 (8 years ago)
Author:
charris
Message:

Some of the changes from the dev_3352_UKMO8_CICE branch already had to be merged into this branch, so it no longer seems sensible to maintain these other minor changes in a separate branch (so dev_3352_UKMO8_CICE is now redundant). These changes have no impact on configurations not using CICE.

Location:
branches/2012/dev_r3385_NOCS04_HAMF/NEMOGCM/NEMO/OPA_SRC
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/2012/dev_r3385_NOCS04_HAMF/NEMOGCM/NEMO/OPA_SRC/IOM/prtctl.F90

    r3332 r3515  
    88   !!---------------------------------------------------------------------- 
    99   USE dom_oce          ! ocean space and time domain variables 
     10#if defined key_nemocice_decomp 
     11   USE ice_domain_size, only: nx_global, ny_global 
     12#endif 
    1013   USE in_out_manager   ! I/O manager 
    1114   USE lib_mpp          ! distributed memory computing 
     
    431434      !  array (cf. par_oce.F90). 
    432435 
     436#if defined key_nemocice_decomp 
     437      ijpi = ( nx_global+2-2*jpreci + (isplt-1) ) / isplt + 2*jpreci 
     438      ijpj = ( ny_global+2-2*jprecj + (jsplt-1) ) / jsplt + 2*jprecj  
     439#else 
    433440      ijpi = ( jpiglo-2*jpreci + (isplt-1) ) / isplt + 2*jpreci 
    434 #if defined key_nemocice_decomp 
    435       ijpj = ( jpjglo+1-2*jprecj + (jsplt-1) ) / jsplt + 2*jprecj  
    436 #else 
    437441      ijpj = ( jpjglo-2*jprecj + (jsplt-1) ) / jsplt + 2*jprecj 
    438442#endif 
  • branches/2012/dev_r3385_NOCS04_HAMF/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

    r3508 r3515  
    161161      IF( nn_ice == 4 .AND. .NOT.( ln_blk_core .OR. lk_cpl ) )   & 
    162162         &   CALL ctl_stop( 'CICE sea-ice model requires ln_blk_core or lk_cpl' ) 
    163       IF( nn_ice == 4 .AND. ( .NOT. ( cp_cfg == 'orca' ) .OR. lk_agrif ) )   & 
    164          &   CALL ctl_stop( 'CICE sea-ice model currently only available in a global ORCA configuration without AGRIF' ) 
     163      IF( nn_ice == 4 .AND. lk_agrif )   & 
     164         &   CALL ctl_stop( 'CICE sea-ice model not currently available with AGRIF' ) 
    165165      IF( ( nn_ice == 3 .OR. nn_ice == 4 ) .AND. nn_ice_embd == 0 )   & 
    166166         &   CALL ctl_stop( 'LIM3 and CICE sea-ice models require nn_ice_embd = 2 or 3' ) 
  • branches/2012/dev_r3385_NOCS04_HAMF/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

    r3488 r3515  
    4646   USE mppini          ! shared/distributed memory setting (mpp_init routine) 
    4747   USE domain          ! domain initialization             (dom_init routine) 
     48#if defined key_nemocice_decomp 
     49   USE ice_domain_size, only: nx_global, ny_global 
     50#endif 
    4851   USE obcini          ! open boundary cond. initialization (obc_ini routine) 
    4952   USE bdyini          ! open boundary cond. initialization (bdy_init routine) 
     
    255258      ! than variables 
    256259      IF( Agrif_Root() ) THEN 
     260#if defined key_nemocice_decomp 
     261         jpi = ( nx_global+2-2*jpreci + (jpni-1) ) / jpni + 2*jpreci ! first  dim. 
     262         jpj = ( ny_global+2-2*jprecj + (jpnj-1) ) / jpnj + 2*jprecj ! second dim.  
     263#else 
    257264         jpi = ( jpiglo-2*jpreci + (jpni-1) ) / jpni + 2*jpreci   ! first  dim. 
    258 #if defined key_nemocice_decomp 
    259          jpj = ( jpjglo+1-2*jprecj + (jpnj-1) ) / jpnj + 2*jprecj ! second dim.  
    260 #else 
    261265         jpj = ( jpjglo-2*jprecj + (jpnj-1) ) / jpnj + 2*jprecj   ! second dim. 
    262266#endif 
Note: See TracChangeset for help on using the changeset viewer.