Changeset 9659 for NEMO/trunk/tests/WAD/MY_SRC

Timestamp:

2018-05-28T12:29:16+02:00 (6 years ago)

Author:

clem

Message:

complete last commit with the test cases

Location:

NEMO/trunk/tests/WAD/MY_SRC

Files:

• bdyini.F90 (modified) (3 diffs)
• usrdef_sbc.F90 (modified) (1 diff)

NEMO/trunk/tests/WAD/MY_SRC/bdyini.F90

@@ -68 +68 @@
          &             cn_dyn3d, nn_dyn3d_dta, cn_tra, nn_tra_dta,             &
          &             ln_tra_dmp, ln_dyn3d_dmp, rn_time_dmp, rn_time_dmp_out, &
-         &             cn_ice_lim, nn_ice_lim_dta,                             &
+         &             cn_ice, nn_ice_dta,                                     &
          &             rn_ice_tem, rn_ice_sal, rn_ice_age,                     &
          &             ln_vol, nn_volctl, nn_rimwidth, nb_jpk_bdy
@@ -346 +346 @@
 #if defined key_si3
         IF(lwp) WRITE(numout,*) 'Boundary conditions for sea ice:  '
-        SELECT CASE( cn_ice_lim(ib_bdy) )                  
+        SELECT CASE( cn_ice(ib_bdy) )                  
           CASE('none')
              IF(lwp) WRITE(numout,*) '      no open boundary condition'        
@@ -357 +357 @@
              dta_bdy(ib_bdy)%ll_ht_i = .true.
              dta_bdy(ib_bdy)%ll_ht_s = .true.
-          CASE DEFAULT   ;   CALL ctl_stop( 'unrecognised value for cn_ice_lim' )
+          CASE DEFAULT   ;   CALL ctl_stop( 'unrecognised value for cn_ice' )
         END SELECT
-        IF( cn_ice_lim(ib_bdy) /= 'none' ) THEN 
-           SELECT CASE( nn_ice_lim_dta(ib_bdy) )                   ! 
+        IF( cn_ice(ib_bdy) /= 'none' ) THEN 
+           SELECT CASE( nn_ice_dta(ib_bdy) )                   ! 
               CASE( 0 )      ;   IF(lwp) WRITE(numout,*) '      initial state used for bdy data'        
               CASE( 1 )      ;   IF(lwp) WRITE(numout,*) '      boundary data taken from file'
-              CASE DEFAULT   ;   CALL ctl_stop( 'nn_ice_lim_dta must be 0 or 1' )
+              CASE DEFAULT   ;   CALL ctl_stop( 'nn_ice_dta must be 0 or 1' )
            END SELECT
         ENDIF

NEMO/trunk/tests/WAD/MY_SRC/usrdef_sbc.F90

@@ -27 +27 @@
    PRIVATE
 
-   PUBLIC   usrdef_sbc_oce    ! routine called in sbcmod module
-   PUBLIC   usrdef_sbc_ice_tau  ! routine called by sbcice_lim.F90 for ice dynamics
-   PUBLIC   usrdef_sbc_ice_flx  ! routine called by sbcice_lim.F90 for ice thermo
+   PUBLIC   usrdef_sbc_oce      ! routine called in sbcmod module
+   PUBLIC   usrdef_sbc_ice_tau  ! routine called by icestp.F90 for ice dynamics
+   PUBLIC   usrdef_sbc_ice_flx  ! routine called by icestp.F90 for ice thermo
 
    !! * Substitutions