Changeset 4649 for branches/2013/dev_r4028_CNRS_LIM3/NEMOGCM/NEMO/LIM_SRC_3/limwri.F90

Timestamp:

2014-05-27T11:28:12+02:00 (10 years ago)

Author:

clem

Message:

finalizing LIM3 heat budget conservation + multiple minor bugs corrections

File:

• branches/2013/dev_r4028_CNRS_LIM3/NEMOGCM/NEMO/LIM_SRC_3/limwri.F90 (modified) (6 diffs)

branches/2013/dev_r4028_CNRS_LIM3/NEMOGCM/NEMO/LIM_SRC_3/limwri.F90

@@ -102 +102 @@
       CALL iom_put( "isst"         , sst_m               )       ! sea surface temperature
       CALL iom_put( "isss"         , sss_m               )       ! sea surface salinity
-      CALL iom_put( "qt_oce"       , qns + qsr           )       ! total flux at ocean surface
       !
       DO jj = 2 , jpjm1
@@ -120 +119 @@
       CALL iom_put( "vice_ipa"     , z2db                )       ! ice velocity v component
       CALL iom_put( "icevel"       , z2d                 )       ! ice velocity module
-!!SF BE CAREFUL : qsr_oce qnd qns_oce are after penetration over ice
-      CALL iom_put( "qsr_oce"      , qsr                 )       ! solar flux at ocean surface
-      CALL iom_put( "qns_oce"      , qns                 )       ! non-solar flux at ocean surface
-!!SF end be careful
       CALL iom_put( "utau_ice"     , utau_ice            )       ! wind stress over ice along i-axis at I-point
       CALL iom_put( "vtau_ice"     , vtau_ice            )       ! wind stress over ice along j-axis at I-point
-!!SF commented because this computation is not ok
- !SF because qsr is not qsr_ocean but it contains already qsr_ice
-      !SF
-      !SF DO jj = 1 , jpj
-      !SF    DO ji = 1 , jpi
-      !SF       z2d(ji,jj)  = ( 1._wp - at_i(ji,jj) ) * qsr(ji,jj)
-      !SF   END DO
-      !SF END DO
-      !SF CALL iom_put( "qsr_io"       , z2d                 )        ! solar flux at ice/ocean surface
-      !SF DO jj = 1 , jpj
-      !SF    DO ji = 1 , jpi
-      !SF       z2d(ji,jj)  = ( 1._wp - at_i(ji,jj) ) * qns(ji,jj)
-      !SF   END DO
-      !SF END DO
-      !SF CALL iom_put( "qns_io"       , z2d                 )        ! non-solar flux at ice/ocean surface
       CALL iom_put( "snowpre"      , sprecip             )        ! snow precipitation 
       CALL iom_put( "micesalt"     , smt_i               )        ! mean ice salinity
@@ -211 +191 @@
       CALL iom_put( "vfxsnw"     , wfx_snw * rday / rhoic  )        ! total snw growth/melt 
       CALL iom_put( "vfxsub"     , wfx_sub * rday / rhoic  )        ! sublimation (snow) 
-
-       CALL iom_put ('hfxdhc1', diag_heat_dhc1(:,:) )          ! Heat content variation in snow and ice 
-       CALL iom_put ('hfxspr', hfx_spr(:,:) )          ! Heat content of snow precip 
-       CALL iom_put ('hfxqsr', qsr(:,:) )          !  solar fluxes used by snw/ice
-       CALL iom_put ('hfxqns', qns(:,:) )          !  non solar fluxes used by snw/ice
+      CALL iom_put( "vfxspr"     , wfx_spr * rday / rhoic  )        ! precip (snow) 
 
        CALL iom_put ('hfxthd', hfx_thd(:,:) )   !  
@@ -222 +198 @@
        CALL iom_put ('hfxout', hfx_out(:,:) )   !  
        CALL iom_put ('hfxin' , hfx_in(:,:) )   !  
-       CALL iom_put ('hfxtot', hfx_tot(:,:) )   !  
        CALL iom_put ('hfxsnw', hfx_snw(:,:) )   !  
        CALL iom_put ('hfxsub', hfx_sub(:,:) )   !  
        CALL iom_put ('hfxerr', hfx_err(:,:) )   !  
        CALL iom_put ('hfxerr_rem', hfx_err_rem(:,:) )   !  
+
+       CALL iom_put ('hfxsum', hfx_sum(:,:) )   !  
+       CALL iom_put ('hfxbom', hfx_bom(:,:) )   !  
+       CALL iom_put ('hfxbog', hfx_bog(:,:) )   !  
+       CALL iom_put ('hfxdif', hfx_dif(:,:) )   !  
+       CALL iom_put ('hfxopw', hfx_opw(:,:) )   !  
+       CALL iom_put ('hfxtur', fhtur(:,:) * at_i(:,:) )   ! turbulent heat flux at ice base 
+       CALL iom_put ('hfxdhc', diag_heat_dhc(:,:) )          ! Heat content variation in snow and ice 
+       CALL iom_put ('hfxspr', hfx_spr(:,:) )          ! Heat content of snow precip 
 
       !--------------------------------
@@ -327 +311 @@
       CALL histdef( kid, "iicebome", "Ice bottom melt"         , "m/s"      , jpi, jpj, kh_i, 1, 1, 1, -99, 32, "inst(x)", rdt, rdt )
       CALL histdef( kid, "iicesume", "Ice surface melt"        , "m/s"      , jpi, jpj, kh_i, 1, 1, 1, -99, 32, "inst(x)", rdt, rdt )
-      CALL histdef( kid, "iisfxthd", "Salt flux from thermo"   , ""      , jpi, jpj, kh_i, 1, 1, 1, -99, 32, "inst(x)", rdt, rdt )
       CALL histdef( kid, "iisfxdyn", "Salt flux from dynmics"  , ""      , jpi, jpj, kh_i, 1, 1, 1, -99, 32, "inst(x)", rdt, rdt )
       CALL histdef( kid, "iisfxres", "Salt flux from limupdate", ""      , jpi, jpj, kh_i, 1, 1, 1, -99, 32, "inst(x)", rdt, rdt )
@@ -354 +337 @@
       CALL histwrite( kid, "iicebome", kt, wfx_bom        , jpi*jpj, (/1/) )
       CALL histwrite( kid, "iicesume", kt, wfx_sum        , jpi*jpj, (/1/) )
-      !CALL histwrite( kid, "iisfxthd", kt, sfx_thd        , jpi*jpj, (/1/) )
       CALL histwrite( kid, "iisfxdyn", kt, sfx_dyn        , jpi*jpj, (/1/) )
       CALL histwrite( kid, "iisfxres", kt, sfx_res        , jpi*jpj, (/1/) )