Changeset 1961

Timestamp:

Feb 8, 2014, 1:37:48 AM (10 years ago)

Author:

fhourdin

Message:

ocean_force_mod est mis à jour pour inclure en option le cas 1D, et éviter

de dupliquer la routine dans phy1d.

clesphys.h est modifié pour placer les réels avant les entiers et logiques

pour éviter des warnings à la compilation.

Location:

LMDZ5/trunk/libf/phylmd

Files:

• clesphys.h (modified) (2 diffs)
• ocean_forced_mod.F90 (modified) (4 diffs)

LMDZ5/trunk/libf/phylmd/clesphys.h

@@ -18 +18 @@
        REAL(kind=8) CH4_ppb, N2O_ppb, CFC11_ppt, CFC12_ppt
 !IM ajout CFMIP2/CMIP5
-       REAL co2_ppm_per
        LOGICAL ok_4xCO2atm
        REAL(kind=8) RCO2_per,RCH4_per,RN2O_per,RCFC11_per,RCFC12_per
@@ -78 +77 @@
        LOGICAL :: ok_hines, ok_gwd_rando
 
-       COMMON/clesphys/cycle_diurne, soil_model, new_oliq,              &
-     &     ok_orodr, ok_orolf, ok_limitvrai, nbapp_rad, iflag_con       &
-     &     , iflag_ener_conserv                                         &
-     &     , co2_ppm, solaire                                           &
+       COMMON/clesphys/                                                 &
+! REAL FIRST
+     &       co2_ppm, solaire                                           &
      &     , RCO2, RCH4, RN2O, RCFC11, RCFC12                           &
      &     , RCO2_act, RCH4_act, RN2O_act, RCFC11_act, RCFC12_act       &
-     &     , ok_4xCO2atm                                                & 
      &     , RCO2_per, RCH4_per, RN2O_per, RCFC11_per, RCFC12_per       &
      &     , CH4_ppb, N2O_ppb, CFC11_ppt, CFC12_ppt                     &
      &     , CH4_ppb_per, N2O_ppb_per, CFC11_ppt_per, CFC12_ppt_per     &
-     &     , top_height, overlap, cdmmax, cdhmax, ksta, ksta_ter        &
-     &     , ok_kzmin, fmagic, pmagic                                   &
+     &     , cdmmax, cdhmax, ksta, ksta_ter                             &
+     &     , fmagic, pmagic                                             &
      &     , f_cdrag_ter,f_cdrag_oce,f_rugoro                           &
+     &     , pasphys            , freq_outNMC, freq_calNMC              &
+     &     , lonmin_ins, lonmax_ins, latmin_ins, latmax_ins             &
+     &     , freq_ISCCP, ecrit_ISCCP, freq_COSP                         &
+     &     , cvl_corr                                                   &
+     &     , qsol0,albsno0,evap0                                        &
+     &     , co2_ppm0                                                   &
+     &     , ecrit_LES                                                  &
+     &     , ecrit_ins, ecrit_hf, ecrit_day                             &
+     &     , ecrit_mth, ecrit_tra, ecrit_reg                            &
+! THEN INTEGER AND LOGICALS
+     &     , top_height                                                 &
+     &     , cycle_diurne, soil_model, new_oliq                         &
+     &     ,ok_orodr, ok_orolf, ok_limitvrai, nbapp_rad, iflag_con      &
+     &     , iflag_ener_conserv                                         &
+     &     , ok_4xCO2atm                                                & 
+     &     , overlap                                                    &
+     &     , ok_kzmin                                                   &
      &     , lev_histhf, lev_histday, lev_histmth                       &
      &     , lev_histins, lev_histLES, lev_histdayNMC, levout_histNMC   &
-     &     , pasphys, ok_histNMC, freq_outNMC, freq_calNMC              &
+     &     , ok_histNMC                                                 &
      &     , type_run, ok_regdyn, ok_cosp                               &
      &     , ok_mensuelCOSP,ok_journeCOSP,ok_hfCOSP                     &
-     &     , lonmin_ins, lonmax_ins, latmin_ins, latmax_ins             &
-     &     , ecrit_ins, ecrit_hf, ecrit_day                             &
-     &     , ecrit_mth, ecrit_tra, ecrit_reg                            &
-     &     , freq_ISCCP, ecrit_ISCCP, freq_COSP, ip_ebil_phy            &
-     &     , ok_lic_melt, cvl_corr, aer_type                            &
-     &     , qsol0,albsno0,evap0                                        &
-     &     , iflag_rrtm, ok_strato,ok_hines,ecrit_LES                   &
-     &     , co2_ppm0, iflag_ice_thermo, ok_gwd_rando
+     &     , ip_ebil_phy                                                &
+     &     , ok_lic_melt,           aer_type                            &
+     &     , iflag_rrtm, ok_strato,ok_hines                             &
+     &     , iflag_ice_thermo, ok_gwd_rando
      
        save /clesphys/

LMDZ5/trunk/libf/phylmd/ocean_forced_mod.F90

@@ -30 +30 @@
     USE calcul_fluxs_mod
     USE limit_read_mod
+    USE mod_grid_phy_lmdz
     USE indice_sol_mod
-
     INCLUDE "YOMCST.h"
 
@@ -81 +81 @@
 !
 !****************************************************************************************
-    CALL limit_read_sst(knon,knindex,tsurf_lim)
+!--sb:
+!!jyg    if (knon.eq.1) then ! single-column model
+    if (klon_glo.eq.1) then ! single-column model
+      CALL read_tsurf1d(knon,tsurf_lim) ! new
+    else ! GCM
+      CALL limit_read_sst(knon,knindex,tsurf_lim)
+    endif ! knon
+!sb--
 
 !****************************************************************************************
@@ -140 +147 @@
     USE indice_sol_mod
 
+!    INCLUDE "indicesol.h"
     INCLUDE "dimsoil.h"
     INCLUDE "YOMCST.h"
@@ -260 +268 @@
 
   END SUBROUTINE ocean_forced_ice
-!
-!****************************************************************************************
+
+!************************************************************************
+! 1D case
+!************************************************************************
+  SUBROUTINE read_tsurf1d(knon,sst_out)
+
+! This subroutine specifies the surface temperature to be used in 1D simulations
+
+      USE dimphy, ONLY : klon
+
+      INTEGER, INTENT(IN)                  :: knon     ! nomber of points on compressed grid
+      REAL, DIMENSION(klon), INTENT(OUT)   :: sst_out  ! tsurf used to force the single-column model
+
+       INTEGER :: i
+! COMMON defined in lmdz1d.F:
+       real ts_cur
+       common /sst_forcing/ts_cur
+
+       DO i = 1, knon
+        sst_out(i) = ts_cur
+       ENDDO
+
+      END SUBROUTINE read_tsurf1d
+
+!
+!************************************************************************
 !
 END MODULE ocean_forced_mod