Changeset 8518 for branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceadv.F90

Timestamp:

2017-09-13T18:46:56+02:00 (7 years ago)

Author:

clem

Message:

changes in style - part6 - commits of the day

File:

• branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceadv.F90 (modified) (4 diffs)

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceadv.F90

@@ -41 +41 @@
    INTEGER, PARAMETER ::   np_advPRA = 1   ! Prather scheme
    INTEGER, PARAMETER ::   np_advUMx = 2   ! Ultimate-Macho scheme
-
+   !
+   ! ** namelist (namice_adv) **
+   LOGICAL ::   ln_adv_Pra   ! Prather        advection scheme
+   LOGICAL ::   ln_adv_UMx   ! Ultimate-Macho advection scheme
+   INTEGER ::   nn_UMx       ! order of the UMx advection scheme   
+   !
    !! * Substitution
 #  include "vectopt_loop_substitute.h90"
@@ -85 +90 @@
       CASE( np_advUMx )                ! ULTIMATE-MACHO scheme !
          !                             !-----------------------!
-         CALL ice_adv_umx( kt, u_ice, v_ice,  &
+         CALL ice_adv_umx( nn_UMx, kt, u_ice, v_ice,  &
             &              ato_i, v_i, v_s, smv_i, oa_i, a_i, a_ip, v_ip, e_s, e_i )
       !                                !-----------------------!
@@ -107 +112 @@
       IF( iom_use('deitrp') )   CALL iom_put( "deitrp" , diag_trp_ei         )         ! advected ice enthalpy (W/m2)
       IF( iom_use('destrp') )   CALL iom_put( "destrp" , diag_trp_es         )         ! advected snw enthalpy (W/m2)
+
+      IF( lrst_ice ) THEN                       !* write Prather fields in the restart file
+         IF( ln_adv_Pra )   CALL adv_pra_rst( 'WRITE', kt )
+      ENDIF
                
       ! controls
@@ -158 +167 @@
       IF( ioptio /= 1 )   CALL ctl_stop( 'ice_adv_init: choose one and only one ice advection scheme (ln_adv_Pra or ln_adv_UMx)' )
       !
+      IF( ln_adv_Pra )   CALL adv_pra_rst( 'READ' )  !* read or initialize all required files
+      !
    END SUBROUTINE ice_adv_init