Changeset 871

Timestamp:

2008-03-27T17:32:35+01:00 (16 years ago)

Author:

ctlod

Message:

dev_001_SBC: modification to allow same results as the reference flxblk.F90, see ticket:#96

Location:

branches/dev_001_SBC/NEMO/OPA_SRC/SBC

Files:

• sbcblk_clio.F90 (modified) (10 diffs)
• sbcice_lim.F90 (modified) (2 diffs)

branches/dev_001_SBC/NEMO/OPA_SRC/SBC/sbcblk_clio.F90

@@ -38 +38 @@
    PRIVATE
 
-   PUBLIC sbc_blk_clio        ! routine called by flx.F90 
-   PUBLIC blk_ice_clio        ! routine called by flx.F90 
+   PUBLIC sbc_blk_clio        ! routine called by sbcmod.F90 
+   PUBLIC blk_ice_clio        ! routine called by sbcice_lim.F90 
 
    INTEGER , PARAMETER ::   jpfld   = 7           ! maximum number of files to read 
@@ -60 +60 @@
    INTEGER, PARAMETER  ::   jpintsr = 24          ! number of time step between sunrise and sunset
    !                                              ! uses for heat flux computation
-   LOGICAL ::   lbulk_init = .TRUE.   ! flag, bulk initialization done or not)
+   LOGICAL ::   lbulk_init = .TRUE.               ! flag, bulk initialization done or not)
 
    REAL(wp) ::   cai = 1.40e-3 ! best estimate of atm drag in order to get correct FS export in ORCA2-LIM
@@ -93 +93 @@
    SUBROUTINE sbc_blk_clio( kt )
       !!---------------------------------------------------------------------
-      !!                    ***  ROUTINE sbc_blk_core  ***
+      !!                    ***  ROUTINE sbc_blk_clio  ***
       !!                   
       !! ** Purpose :   provide at each time step the surface ocean fluxes
@@ -123 +123 @@
       INTEGER, INTENT( in  ) ::   kt   ! ocean time step
       !!
-      INTEGER  ::   jf       ! dummy indices
-      INTEGER  ::   ierror   ! return error code
+      INTEGER  ::   jf, ifpr, jfpr     ! dummy indices
+      INTEGER  ::   ierror             ! return error code
       !!
       CHARACTER(len=100) ::  cn_dir                            !   Root directory for location of CLIO files
@@ -131 +131 @@
       TYPE(FLD_N) ::   sn_humi, sn_ccov, sn_prec               !   "                                 "
       !!
-      NAMELIST/namsbc_core/ cn_dir, sn_wndi, sn_wndj, sn_wndm, sn_humi,   &
+      NAMELIST/namsbc_clio/ cn_dir, sn_wndi, sn_wndj, sn_wndm, sn_humi,   &
          &                          sn_ccov, sn_tair, sn_prec
       !!---------------------------------------------------------------------
@@ -152 +152 @@
          sn_prec = FLD_N( 'precip'  ,   -12.    ,  'precip'  ,  .TRUE.    ,    0   ,     0    ) 
 
-         REWIND( numnam )                    ! ... read in namlist namsbc_core
-         READ  ( numnam, namsbc_core )
+         REWIND( numnam )                    ! ... read in namlist namsbc_clio
+         READ  ( numnam, namsbc_clio )
 
          ! store namelist information in an array
@@ -179 +179 @@
             WRITE(numout,*) 'sbc_blk_clio : flux formulattion for ocean surface boundary condition'
             WRITE(numout,*) '~~~~~~~~~~~~ '
-            WRITE(numout,*) '          namsbc_core Namelist'
+            WRITE(numout,*) '          namsbc_clio Namelist'
             WRITE(numout,*) '          list of files and frequency (>0: in hours ; <0 in months)'
             DO jf = 1, jpfld
@@ -198 +198 @@
       CALL fld_read( kt, nn_fsbc, sf )                ! input fields provided at the current time-step
       !
+      IF(lwp .AND. nitend-nit000 <= 100 ) THEN
+         IF( MOD( kt-1, nn_fsbc ) == 0 ) THEN
+            WRITE(numout,*)
+            WRITE(numout,*) ' read monthly CLIO fluxes: ok, kt: ', kt
+            WRITE(numout,*)
+            ifpr = INT(jpi/8)      ;      jfpr = INT(jpj/10)
+            WRITE(numout,*) TRIM(sf(jp_wndi)%clvar),' day: ',ndastp
+            CALL prihre( sf(jp_wndi)%fnow,jpi,jpj,1,jpi,ifpr,1,jpj,jfpr,0.,numout )
+            WRITE(numout,*)
+            WRITE(numout,*) TRIM(sf(jp_wndj)%clvar),' day: ',ndastp
+            CALL prihre( sf(jp_wndj)%fnow,jpi,jpj,1,jpi,ifpr,1,jpj,jfpr,0.,numout )
+            WRITE(numout,*)
+            WRITE(numout,*) TRIM(sf(jp_humi)%clvar),' day: ',ndastp
+            CALL prihre( sf(jp_humi)%fnow,jpi,jpj,1,jpi,ifpr,1,jpj,jfpr,0.,numout )
+            WRITE(numout,*)
+            WRITE(numout,*) TRIM(sf(jp_wndm)%clvar),' day: ',ndastp
+            CALL prihre( sf(jp_wndm)%fnow,jpi,jpj,1,jpi,ifpr,1,jpj,jfpr,0.,numout )
+            WRITE(numout,*)
+            WRITE(numout,*) TRIM(sf(jp_ccov)%clvar),' day: ',ndastp
+            CALL prihre( sf(jp_ccov)%fnow,jpi,jpj,1,jpi,ifpr,1,jpj,jfpr,0.,numout )
+            WRITE(numout,*)
+            WRITE(numout,*) TRIM(sf(jp_prec)%clvar),' day: ',ndastp
+            CALL prihre( sf(jp_prec)%fnow,jpi,jpj,1,jpi,ifpr,1,jpj,jfpr,0.,numout )
+            WRITE(numout,*)
+            WRITE(numout,*) TRIM(sf(jp_tair)%clvar),' day: ',ndastp
+            CALL prihre( sf(jp_tair)%fnow,jpi,jpj,1,jpi,ifpr,1,jpj,jfpr,0.,numout )
+            WRITE(numout,*)
+         ENDIF
+      ENDIF
+
       IF( MOD( kt - 1, nn_fsbc ) == 0 ) THEN
           CALL blk_oce_clio( sst_m, ssu_m, ssv_m )    ! compute the surface ocean fluxes using CLIO bulk formulea
@@ -261 +291 @@
       DO jj = 1 , jpj
          DO ji = 1, jpi
-            zcoef = 1.3 * cao * SQRT(  sf(jp_wndi)%fnow(ji,jj)*sf(jp_wndi)%fnow(ji,jj)   &
-               &                     + sf(jp_wndj)%fnow(ji,jj)*sf(jp_wndj)%fnow(ji,jj) )
-            utau(ji,jj) = 1.3 * cao * zcoef * sf(jp_wndi)%fnow(ji,jj)
-            vtau(ji,jj) = 1.3 * cao * zcoef * sf(jp_wndj)%fnow(ji,jj)
+            utau(ji,jj) = sf(jp_wndi)%fnow(ji,jj)
+            vtau(ji,jj) = sf(jp_wndj)%fnow(ji,jj)
          END DO
       END DO
@@ -615 +643 @@
          p_dqla(:,:,jl) = p_dqla(:,:,jl) * tmask(:,:,1)
       END DO
+
    END SUBROUTINE blk_ice_clio
 

branches/dev_001_SBC/NEMO/OPA_SRC/SBC/sbcice_lim.F90

@@ -120 +120 @@
          CALL blk_albedo( alb_ice_os , alb_oce_os , alb_ice_cs , alb_oce_cs )
 
-
          ! ... surface ice boundary condition (stress at I-point, latente, sensible, etc....
          !!gm preciser la list exacte
@@ -142 +141 @@
             CALL prt_ctl( tab2d_1=tprecip  ,clinfo1=' precip   : ', tab2d_2=sprecip  , clinfo2=' Snow     : ' )
             CALL prt_ctl( tab2d_1=utaui_ice,clinfo1=' utaui_ice: ', tab2d_2=vtaui_ice, clinfo2=' vtaui_ice: ' )
+            CALL prt_ctl( tab2d_1=sst_m    ,clinfo1=' sst      : ', tab2d_2=sss_m    , clinfo2=' sss      : ' )
+            CALL prt_ctl( tab2d_1=ui_oce   ,clinfo1=' u_io     : ', tab2d_2=vi_oce   , clinfo2=' v_io     : ' )
             CALL prt_ctl( tab2d_1=hsnif    ,clinfo1=' hsnif  1 : ', tab2d_2=hicif    , clinfo2=' hicif    : ' )
             CALL prt_ctl( tab2d_1=frld     ,clinfo1=' frld   1 : ', tab2d_2=sist     , clinfo2=' sist     : ' )