Changeset 8240 for branches/2017/dev_r8183_ICEMODEL

Timestamp:

2017-06-28T18:09:58+02:00 (7 years ago)

Author:

clem

Message:

correct some bugs for compilation

Location:

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3

Files:

• ice.F90 (modified) (2 diffs)
• limwri.F90 (modified) (2 diffs)
• thd_ice.F90 (modified) (1 diff)

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

@@ -333 +333 @@
 
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   wfx_snw_dyn !: dynamical component of wfx_snw    [kg.m-2.s-1]
-   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   wfx_snw_sum !: surface melt component of wfx_snw [kg.m-2.s-1]
 
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   wfx_ice     !: ice-ocean mass exchange                   [kg.m-2.s-1]
@@ -546 +545 @@
          &      wfx_ice(jpi,jpj) , wfx_sub    (jpi,jpj) , wfx_ice_sub(jpi,jpj) , wfx_lam    (jpi,jpj) ,  &
          ! MV MP 2016
-         &      wfx_pnd(jpi,jpj) , wfx_snw_sum(jpi,jpj) ,                                       &
+         &      wfx_pnd(jpi,jpj) ,                                                              &
          ! END MV MP 2016
          &      wfx_bog(jpi,jpj) , wfx_dyn(jpi,jpj) , wfx_bom(jpi,jpj) , wfx_sum(jpi,jpj) ,     &

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

@@ -325 +325 @@
       IF ( iom_use( "NH_icearea" ) .OR. iom_use( "NH_icevolu" ) .OR. iom_use( "NH_iceextt" ) )   THEN   ! NH integrated diagnostics
  
-         WHERE( fcor > 0._wp ); zswi(:,:) = 1.0e-12
+         WHERE( ff_t > 0._wp ); zswi(:,:) = 1.0e-12
          ELSEWHERE            ; zswi(:,:) = 0.
          END WHERE 
 
-         zdiag_area_nh = glob_sum( at_i(:,:) * zswi(:,:) * e12t(:,:) )
-         zdiag_volu_nh = glob_sum( vt_i(:,:) * zswi(:,:) * e12t(:,:) )
-
-         WHERE( fcor > 0._wp .AND. at_i > 0.15 ); zswi(:,:) = 1.0e-12
+         zdiag_area_nh = glob_sum( at_i(:,:) * zswi(:,:) * e1e2t(:,:) )
+         zdiag_volu_nh = glob_sum( vt_i(:,:) * zswi(:,:) * e1e2t(:,:) )
+
+         WHERE( ff_t > 0._wp .AND. at_i > 0.15 ); zswi(:,:) = 1.0e-12
          ELSEWHERE                              ; zswi(:,:) = 0.
          END WHERE 
 
-         zdiag_extt_nh = glob_sum( zswi(:,:) * e12t(:,:) )
+         zdiag_extt_nh = glob_sum( zswi(:,:) * e1e2t(:,:) )
 
          IF ( iom_use( "NH_icearea" ) ) CALL iom_put( "NH_icearea" ,  zdiag_area_nh  )
@@ -346 +346 @@
       IF ( iom_use( "SH_icearea" ) .OR. iom_use( "SH_icevolu" ) .OR. iom_use( "SH_iceextt" ) )   THEN   ! SH integrated diagnostics
 
-         WHERE( fcor < 0._wp ); zswi(:,:) = 1.0e-12; 
+         WHERE( ff_t < 0._wp ); zswi(:,:) = 1.0e-12; 
          ELSEWHERE            ; zswi(:,:) = 0.
          END WHERE 
 
-         zdiag_area_sh = glob_sum( at_i(:,:) * zswi(:,:) * e12t(:,:) ) 
-         zdiag_volu_sh = glob_sum( vt_i(:,:) * zswi(:,:) * e12t(:,:) )
-
-         WHERE( fcor < 0._wp .AND. at_i > 0.15 ); zswi(:,:) = 1.0e-12
+         zdiag_area_sh = glob_sum( at_i(:,:) * zswi(:,:) * e1e2t(:,:) ) 
+         zdiag_volu_sh = glob_sum( vt_i(:,:) * zswi(:,:) * e1e2t(:,:) )
+
+         WHERE( ff_t < 0._wp .AND. at_i > 0.15 ); zswi(:,:) = 1.0e-12
          ELSEWHERE                              ; zswi(:,:) = 0.
          END WHERE 
 
-         zdiag_extt_sh = glob_sum( zswi(:,:) * e12t(:,:) )
+         zdiag_extt_sh = glob_sum( zswi(:,:) * e1e2t(:,:) )
 
          IF ( iom_use( "SH_icearea" ) ) CALL iom_put( "SH_icearea", zdiag_area_sh )

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

@@ -162 +162 @@
          &      sfx_bri_1d (jpij) , sfx_bog_1d (jpij) , sfx_bom_1d (jpij) , sfx_sum_1d (jpij),  &
          &      sfx_sni_1d (jpij) , sfx_opw_1d (jpij) , sfx_res_1d (jpij) , sfx_sub_1d (jpij),  &
-         &      dsm_i_fl_1d(jpij) , dsm_i_gd_1d(jpij) , dsm_i_se_1d(jpij) ,                     &     
-         &      dsm_i_si_1d(jpij) , hicol_1d    (jpij)                     , STAT=ierr(ii) )
+         &      hicol_1d   (jpij)                     , STAT=ierr(ii) )
       !
       ii = ii + 1