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 9576 for branches/2017/dev_merge_2017/NEMOGCM/CONFIG – NEMO

Ignore:
Timestamp:
2018-05-11T16:50:48+02:00 (6 years ago)
Author:
nicolasmartin
Message:

Global renaming for SETTE + fix for key_lim3 in MY_SRC: push remaining modifications in order to start from a clean checkout

Location:
branches/2017/dev_merge_2017/NEMOGCM/CONFIG
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SPITZ12/MY_SRC/sbcblk.F90

    r9552 r9576  
    4545   USE sbc_ice        ! Surface boundary condition: ice fields 
    4646   USE lib_fortran    ! to use key_nosignedzero 
    47 #if defined key_lim3 
     47#if defined key_si3 
    4848   USE ice     , ONLY :   u_ice, v_ice, jpl, a_i_b, at_i_b, tm_su, rn_cnd_s 
    4949   USE icethd_dh      ! for CALL ice_thd_snwblow 
     
    6565   PUBLIC   sbc_blk_init  ! called in sbcmod 
    6666   PUBLIC   sbc_blk       ! called in sbcmod 
    67 #if defined key_lim3 
     67#if defined key_si3 
    6868   PUBLIC   blk_ice_tau   ! routine called in iceforcing 
    6969   PUBLIC   blk_ice_flx   ! routine called in iceforcing 
     
    539539         &     * ( MIN( sf(jp_tair)%fnow(:,:,1), rt0_snow ) - rt0 ) * cpic * tmask(:,:,1) 
    540540      ! 
    541 #if defined key_lim3 
     541#if defined key_si3 
    542542      qns_oce(:,:) = zqlw(:,:) - zqsb(:,:) - zqla(:,:)                                ! non solar without emp (only needed by LIM3) 
    543543      qsr_oce(:,:) = qsr(:,:) 
     
    690690   END FUNCTION L_vap 
    691691 
    692 #if defined key_lim3 
     692#if defined key_si3 
    693693   !!---------------------------------------------------------------------- 
    694    !!   'key_lim3'                                       ESIM sea-ice model 
     694   !!   'key_si3'                                       ESIM sea-ice model 
    695695   !!---------------------------------------------------------------------- 
    696696   !!   blk_ice_tau : provide the air-ice stress 
  • branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/CANAL/MY_SRC/diawri.F90

    r9403 r9576  
    5151   USE ioipsl         !  
    5252 
    53 #if defined key_lim3 
     53#if defined key_si3 
    5454   USE icewri  
    5555#endif 
     
    10761076      ENDIF 
    10771077 
    1078 #if defined key_lim3 
     1078#if defined key_si3 
    10791079      IF( nn_ice == 2 ) THEN   ! condition needed in case agrif + ice-model but no-ice in child grid 
    10801080         CALL ice_wri_state( kt, id_i, nh_i ) 
  • branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/bdyini.F90

    r9168 r9576  
    344344        IF(lwp) WRITE(numout,*) 
    345345 
    346 #if defined key_lim3 
     346#if defined key_si3 
    347347        IF(lwp) WRITE(numout,*) 'Boundary conditions for sea ice:  ' 
    348348        SELECT CASE( cn_ice_lim(ib_bdy) )                   
  • branches/2017/dev_merge_2017/NEMOGCM/CONFIG/cfg.txt

    r9575 r9576  
    1515ORCA2_SAS_SI3_ST OCE_SRC ICE_SRC NST_SRC SAS_SRC 
    1616ORCA2_SI3_OBS_ST OCE_SRC ICE_SRC 
     17AGRIF_NORDIC_ST OCE_SRC ICE_SRC NST_SRC 
     18AGRIF_NORDIC_NOAGRIF_ST OCE_SRC ICE_SRC NST_SRC 
     19SPITZ12_ST OCE_SRC ICE_SRC 
Note: See TracChangeset for help on using the changeset viewer.