New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 10289 for NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/ICEDYN – NEMO

Ignore:
Timestamp:
2018-11-08T11:48:53+01:00 (5 years ago)
Author:
francesca
Message:

alignment to the current version of the trunk

Location:
NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/ICEDYN
Files:
8 edited
1 copied

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/ICEDYN/EXPREF/1_namelist_cfg

    r9794 r10289  
    11!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    2 !! NEMO/OPA  Configuration namelist : overwrite defaults values defined in SHARED/namelist_ref 
     2!! NEMO/OCE  Configuration namelist : overwrite defaults values defined in SHARED/namelist_ref 
    33!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    44!!               ICEDYN (SAS BIPERIODIC) configuration                !! 

  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/ICEDYN/EXPREF/context_nemo.xml

    r9572 r10289  
    4343    <domain_definition src="./domain_def_nemo.xml"/> 
    4444   
    45     <grid_definition>     
    46  
    47         <!--  --> 
    48        <grid id="grid_T_2D" > 
    49          <domain id="grid_T" /> 
    50        </grid> 
    51         <!--  --> 
    52        <grid id="grid_T_3D_ncatice" > 
    53          <domain id="grid_T" /> 
    54          <axis id="ncatice" /> 
    55        </grid> 
    56         <!--  --> 
    57        <grid id="grid_T_3D" > 
    58          <domain id="grid_T" /> 
    59          <axis id="deptht" /> 
    60        </grid> 
    61         <!--  --> 
    62        <grid id="grid_U_2D" > 
    63          <domain id="grid_U" /> 
    64        </grid> 
    65         <!--  --> 
    66        <grid id="grid_U_3D" > 
    67          <domain id="grid_U" /> 
    68          <axis id="depthu" /> 
    69        </grid> 
    70         <!--  --> 
    71        <grid id="grid_V_2D" > 
    72          <domain id="grid_V" /> 
    73        </grid> 
    74         <!--  --> 
    75        <grid id="grid_V_3D" > 
    76          <domain id="grid_V" /> 
    77          <axis id="depthv" /> 
    78        </grid> 
    79         <!--  --> 
    80        <grid id="grid_W_2D" > 
    81          <domain id="grid_W" /> 
    82        </grid> 
    83         <!--  --> 
    84        <grid id="grid_W_3D" > 
    85          <domain id="grid_W" /> 
    86          <axis id="depthw" /> 
    87        </grid> 
    88         <!--  --> 
    89        <grid id="grid_1point" > 
    90          <domain domain_ref="1point"/> 
    91        </grid> 
    92         <!--  --> 
    93        <grid id="grid_T_nfloat" > 
    94          <domain id="grid_T" /> 
    95          <axis id="nfloat" /> 
    96        </grid> 
    97         <!--  --> 
    98        <grid id="grid_EqT" > 
    99          <domain domain_ref="EqT" /> 
    100        </grid> 
    101         <!--  --> 
    102        <grid id="grid_znl_T_2D"> 
    103          <domain id="gznl" /> 
    104        </grid> 
    105         <!--  --> 
    106        <grid id="grid_znl_T_3D"> 
    107          <domain id="gznl" /> 
    108          <axis id="deptht" /> 
    109        </grid> 
    110         <!--  --> 
    111        <grid id="grid_znl_W_3D"> 
    112          <domain id="gznl" /> 
    113          <axis id="depthw" /> 
    114        </grid> 
    115  
    116       <grid id="grid_ptr_T_2D"> 
    117        <domain id="ptr" /> 
    118       </grid> 
    119  
    120       <grid id="grid_ptr_T_3D"> 
    121        <domain id="ptr" /> 
    122          <axis id="deptht" /> 
    123        </grid> 
    124  
    125       <grid id="grid_ptr_W_3D"> 
    126        <domain id="ptr" /> 
    127          <axis id="depthw" /> 
    128       </grid> 
    129  
    130     </grid_definition>    
     45    <grid_definition src="./grid_def_nemo.xml"/> 
    13146 
    13247</context> 

  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/ICEDYN/EXPREF/namelist_cfg

    r9794 r10289  
    11!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    2 !! NEMO/OPA  Configuration namelist : overwrite default values defined in SHARED/namelist_ref 
     2!! NEMO/OCE  Configuration namelist : overwrite default values defined in SHARED/namelist_ref 
    33!!>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 
    44!!               ICEDYN (SAS BIPERIODIC) configuration                !! 

  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/ICEDYN/EXPREF/namelist_ice_cfg

    r9801 r10289  
    9595   sn_tmi = 'initice'                 , -12 ,'tmi'   ,  .false.  , .true., 'yearly'  , '' , '', '' 
    9696   sn_smi = 'initice'                 , -12 ,'smi'   ,  .false.  , .true., 'yearly'  , '' , '', '' 
    97    cn_dir='./' 
     97   cn_dir ='./' 
    9898/ 
    9999!------------------------------------------------------------------------------ 

  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/ICEDYN/MY_SRC/usrdef_hgr.F90

    • Property svn:keywords set to Id
    r9794 r10289  
    2727 
    2828   !!---------------------------------------------------------------------- 
    29    !! NEMO/OPA 4.0 , NEMO Consortium (2016) 
    30    !! $Id:$  
    31    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     29   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
     30   !! $Id$  
     31   !! Software governed by the CeCILL license (see ./LICENSE) 
    3232   !!---------------------------------------------------------------------- 
    3333CONTAINS 

  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/ICEDYN/MY_SRC/usrdef_nam.F90

    • Property svn:keywords set to Id
    r9794 r10289  
    3434 
    3535   !!---------------------------------------------------------------------- 
    36    !! NEMO/OPA 4.0 , NEMO Consortium (2016) 
     36   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3737   !! $Id$  
    38    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     38   !! Software governed by the CeCILL license (see ./LICENSE) 
    3939   !!---------------------------------------------------------------------- 
    4040CONTAINS 
    … …  
    6161      REAL(wp)::   zlx, zly  ! Local scalars 
    6262      !! 
    63       NAMELIST/namusr_def/ ln_zco, rn_dx, rn_dy, ln_corio, rn_ppgphi0 
     63      NAMELIST/namusr_def/ rn_dx, rn_dy, ln_corio, rn_ppgphi0 
    6464      !!---------------------------------------------------------------------- 
    6565      ! 

  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/ICEDYN/MY_SRC/usrdef_sbc.F90

    • Property svn:keywords set to Id
    r9789 r10289  
    3636#  include "vectopt_loop_substitute.h90" 
    3737   !!---------------------------------------------------------------------- 
    38    !! NEMO/OPA 4.0 , NEMO Consortium (2016) 
     38   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3939   !! $Id$ 
    40    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     40   !! Software governed by the CeCILL license (see ./LICENSE) 
    4141   !!---------------------------------------------------------------------- 
    4242CONTAINS 
    … …  
    132132      emp_oce  (:,:)   = emp_oce(:,:) - sprecip(:,:) * (1._wp - zsnw(:,:) ) 
    133133      qevap_ice(:,:,:) =   0._wp 
    134       qprec_ice(:,:)   =   rhosn * ( sst_m(:,:) * cpic - lfus ) * tmask(:,:,1) !  in J/m3 
     134      qprec_ice(:,:)   =   rhos * ( sst_m(:,:) * rcpi - rLfus ) * tmask(:,:,1) !  in J/m3 
    135135      qemp_oce (:,:)   = - emp_oce(:,:) * sst_m(:,:) * rcp 
    136       qemp_ice (:,:)   =   sprecip(:,:) * zsnw * ( sst_m(:,:) * cpic - lfus ) * tmask(:,:,1) ! solid precip (only) 
     136      qemp_ice (:,:)   =   sprecip(:,:) * zsnw * ( sst_m(:,:) * rcpi - rLfus ) * tmask(:,:,1) ! solid precip (only) 
    137137 
    138138      ! total fluxes 
    … …  
    146146      ! 
    147147      WHERE    ( phs(:,:,:) <= 0._wp .AND. phi(:,:,:) <  0.1_wp )       ! linear decrease from hi=0 to 10cm   
    148          qsr_ice_tr(:,:,:) = qsr_ice(:,:,:) * ( zfr1 + zfr2 * ( 1._wp - phi(:,:,:) * 10._wp ) ) 
     148         qtr_ice_top(:,:,:) = qsr_ice(:,:,:) * ( zfr1 + zfr2 * ( 1._wp - phi(:,:,:) * 10._wp ) ) 
    149149      ELSEWHERE( phs(:,:,:) <= 0._wp .AND. phi(:,:,:) >= 0.1_wp )       ! constant (zfr1) when hi>10cm 
    150          qsr_ice_tr(:,:,:) = qsr_ice(:,:,:) * zfr1 
     150         qtr_ice_top(:,:,:) = qsr_ice(:,:,:) * zfr1 
    151151      ELSEWHERE                                                         ! zero when hs>0 
    152          qsr_ice_tr(:,:,:) = 0._wp  
     152         qtr_ice_top(:,:,:) = 0._wp  
    153153      END WHERE 
    154154           

  • NEMO/branches/2018/dev_r9866_HPC_03_globcom/tests/ICEDYN/MY_SRC/usrdef_zgr.F90

    • Property svn:keywords set to Id
    r9789 r10289  
    2828#  include "vectopt_loop_substitute.h90" 
    2929   !!---------------------------------------------------------------------- 
    30    !! NEMO/OPA 4.0 , NEMO Consortium (2016) 
     30   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3131   !! $Id$ 
    32    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     32   !! Software governed by the CeCILL license (see ./LICENSE) 
    3333   !!---------------------------------------------------------------------- 
    3434CONTAINS              
Note: See TracChangeset for help on using the changeset viewer.