Changeset 7355 for branches/2016/dev_CNRS_2016/NEMOGCM/NEMO/OPA_SRC/USR

Timestamp:

2016-11-28T18:21:42+01:00 (7 years ago)

Author:

flavoni

Message:

merge branch dev_CNRS_2016 & dev_CNRS_AGRIF_LIM3

File:

• branches/2016/dev_CNRS_2016/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_sbc.F90 (modified) (6 diffs)

branches/2016/dev_CNRS_2016/NEMOGCM/NEMO/OPA_SRC/USR/usrdef_sbc.F90

@@ -11 +11 @@
 
    !!----------------------------------------------------------------------
-   !!   usr_def_sbc    : user defined surface bounday conditions in GYRE case
+   !!   usrdef_sbc    : user defined surface bounday conditions in GYRE case
    !!----------------------------------------------------------------------
    USE oce             ! ocean dynamics and tracers
@@ -26 +26 @@
    PRIVATE
 
-   PUBLIC   usr_def_sbc    ! routine called in sbcmod module
+   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
 
    !! * Substitutions
@@ -37 +39 @@
 CONTAINS
 
-   SUBROUTINE usr_def_sbc( kt )
+   SUBROUTINE usrdef_sbc_oce( kt )
       !!---------------------------------------------------------------------
-      !!                    ***  ROUTINE usr_def_sbc  ***
+      !!                    ***  ROUTINE usrdef_sbc  ***
       !!              
       !! ** Purpose :   provide at each time-step the GYRE surface boundary
@@ -133 +135 @@
 !!    Commented here as they change the GYRE results 
 !#if !defined key_mpp_rep
-!      CALL ctl_stop( 'usr_def_sbc: key_mpp_rep is required to run GYRE configuration')
+!      CALL ctl_stop( 'usrdef_sbc_oce: key_mpp_rep is required to run GYRE configuration')
 !#endif
 !!gm
@@ -198 +200 @@
       IF( kt == nit000 .AND. lwp ) THEN 
          WRITE(numout,*)
-         WRITE(numout,*)'usr_def_sbc : analytical surface fluxes for GYRE configuration'               
+         WRITE(numout,*)'usrdef_sbc_oce : analytical surface fluxes for GYRE configuration'               
          WRITE(numout,*)'~~~~~~~~~~~ ' 
          WRITE(numout,*)'           nyear      = ', nyear
@@ -228 +230 @@
       ENDIF
       !
-   END SUBROUTINE usr_def_sbc
+   END SUBROUTINE usrdef_sbc_oce
+
+   SUBROUTINE usrdef_sbc_ice_tau( kt )
+      INTEGER, INTENT(in) ::   kt   ! ocean time step
+   END SUBROUTINE usrdef_sbc_ice_tau
+
+   SUBROUTINE usrdef_sbc_ice_flx( kt )
+      INTEGER, INTENT(in) ::   kt   ! ocean time step
+   END SUBROUTINE usrdef_sbc_ice_flx
 
    !!======================================================================