Changeset 900 for trunk/NEMO/OPA_SRC/SBC/sbcice_lim.F90

Timestamp:

2008-04-22T20:13:41+02:00 (16 years ago)

Author:

rblod

Message:

Update 1D configuration according to SBC and LIM3, see ticket #117

File:

• trunk/NEMO/OPA_SRC/SBC/sbcice_lim.F90 (modified) (6 diffs)

trunk/NEMO/OPA_SRC/SBC/sbcice_lim.F90

@@ -18 +18 @@
    !!----------------------------------------------------------------------
    USE oce             ! ocean dynamics and tracers
+   USE c1d             ! 1d configuration
    USE dom_oce         ! ocean space and time domain
    USE par_ice         ! sea-ice parameters
@@ -135 +136 @@
 
          ! ... masked sea surface freezing temperature [Kelvin] (set to rt0 over land)
-!old fashion         zsss_m (:,:) = SQRT( sss_m(:,:) )
-!old fashion         zsss2_m(:,:) = sss_m(:,:) * sss_m(:,:)
-!old fashion         zsss3_m(:,:) = zsss_m(:,:) * zsss_m(:,:) * zsss_m(:,:)
-!old fashion
-!old fashion         DO jj = 1, jpj
-!old fashion            DO ji = 1, jpi
-!old fashion               t_bo(ji,jj)  = ABS ( rt0 - 0.0575      * sss_m(ji,jj)      &
-!old fashion                  &                    + 1.710523e-03 * zsss3_m(ji,jj)    &
-!old fashion                  &                    - 2.154996e-04 * zsss2_m(ji,jj) )  &
-!old fashion                            * tms(ji,jj)
-!old fashion            END DO
-!old fashion         END DO
          t_bo(:,:) = tfreez( sss_m ) +  rt0 
 
@@ -221 +210 @@
          d_oa_i_thd(:,:,:)  = 0.e0 ; d_oa_i_trp(:,:,:)  = 0.e0
 
-         emps(:,:)      = 0.e0     ; fseqv(:,:)     = 0.e0
+         fseqv(:,:)     = 0.e0
          fsbri(:,:)     = 0.e0     ; fsalt_res(:,:) = 0.e0
          fsalt_rpo(:,:) = 0.e0
@@ -251 +240 @@
          ! Dynamical processes |       
          !---------------------|
-                         CALL lim_dyn                    ! Ice dynamics    ( rheology/dynamics )
-                         CALL lim_trp                    ! Ice transport   ( Advection/diffusion )
-                         CALL lim_var_agg(1)             ! aggregate categories, requested
-                         CALL lim_var_glo2eqv            ! equivalent variables, requested for rafting
+         IF( .NOT. lk_c1d ) THEN                         ! Ice dynamics & transport (not in 1D case)
+                         CALL lim_dyn                         ! Ice dynamics    ( rheology/dynamics )
+                         CALL lim_trp                         ! Ice transport   ( Advection/diffusion )
+                         CALL lim_var_agg(1)                  ! aggregate categories, requested
+                         CALL lim_var_glo2eqv                 ! equivalent variables, requested for rafting
                          !+++++
                          WRITE(numout,*) ' - After ice dynamics and transport '
-                         CALL lim_inst_state(jiindx,jjindx,1)
-                         WRITE(numout,*) ' '
+                         CALL lim_inst_state( jiindx, jjindx, 1 )
                          WRITE(numout,*)
                          WRITE(numout,*) ' Mechanical Check ************** '
@@ -267 +256 @@
                          WRITE(numout,*) ' Sum of both minus 1     ', ato_i(jiindx,jjindx) + at_i(jiindx,jjindx) - 1.00
                          !+++++
-                         CALL lim_itd_me                 ! Mechanical redistribution ! (ridging/rafting)
+                         CALL lim_itd_me                      ! Mechanical redistribution ! (ridging/rafting)
+         ENDIF
          !--------------------|
          ! Ice thermodynamics |
@@ -317 +307 @@
          IF( lrst_ice )  CALL lim_rst_write( kt )        ! Ice restart file 
                          CALL lim_var_glo2eqv
-         !
-         ! Re-initialization of forcings
-         qsr     (:,:)   = 0.e0
-         qns     (:,:)   = 0.e0
-         tprecip (:,:)   = 0.e0 
-         sprecip (:,:)   = 0.e0
-         qsr_ice (:,:,:) = 0.e0
-         qns_ice (:,:,:) = 0.e0 
-         dqns_ice(:,:,:) = 0.e0 
-#if ! defined key_coupled 
-         qla_ice (:,:,:) = 0.e0
-         dqla_ice(:,:,:) = 0.e0
-         fr1_i0  (:,:)   = 0.e0
-         fr2_i0  (:,:)   = 0.e0
-#else
-         rrunoff (:,:)   = 0.e0
-         calving (:,:)   = 0.e0
-#endif
          !
          !-------------------------------|