Changeset 1259 for LMDZ4/branches/LMDZ4-dev

Timestamp:

Nov 10, 2009, 11:24:15 AM (15 years ago)

Author:

idelkadi

Message:

-Rajout de la cles fortran ok_cosp pour tourner avec ou sans calcul cosp
-Declaration de ok_cosp dans clesphys.h
-Lecture dans physiq.def via conf_phys.F90
-Menage dans newmicro.F

Location:

LMDZ4/branches/LMDZ4-dev/libf/phylmd

Files:

• clesphys.h (modified) (2 diffs)
• conf_phys.F90 (modified) (4 diffs)
• newmicro.F (modified) (1 diff)
• physiq.F (modified) (2 diffs)

LMDZ4/branches/LMDZ4-dev/libf/phylmd/clesphys.h

@@ -55 +55 @@
        REAL freq_ISCCP, ecrit_ISCCP
        REAL freq_COSP
+       LOGICAL :: ok_cosp
        INTEGER :: ip_ebil_phy, iflag_rrtm
        LOGICAL :: ok_strato
@@ -68 +69 @@
      &     , lev_histhf, lev_histday, lev_histmth                       &
      &     , lev_histins, lev_histLES                                   &
-     &     , type_run, ok_isccp, ok_regdyn                              &
+     &     , type_run, ok_isccp, ok_regdyn, ok_cosp                     &
      &     , lonmin_ins, lonmax_ins, latmin_ins, latmax_ins             &
      &     , ecrit_ins, ecrit_hf, ecrit_hf2mth, ecrit_day               &

LMDZ4/branches/LMDZ4-dev/libf/phylmd/conf_phys.F90

@@ -135 +135 @@
   CHARACTER*4, SAVE :: type_run_omp
   LOGICAL,SAVE :: ok_isccp_omp
+  LOGICAL,SAVE :: ok_cosp_omp
   REAL,SAVE :: lonmin_ins_omp, lonmax_ins_omp, latmin_ins_omp, latmax_ins_omp
   REAL,SAVE :: ecrit_hf_omp, ecrit_day_omp, ecrit_mth_omp, ecrit_reg_omp
@@ -1066 +1067 @@
   ok_isccp_omp = .false.
   call getin('ok_isccp',ok_isccp_omp)
+
+!
+!Config Key  = ok_cosp
+!Config Desc =
+!Config Def  = .false.
+!Config Help =
+!
+  ok_cosp_omp = .false.
+  call getin('ok_cosp',ok_cosp_omp)
 
 !
@@ -1414 +1424 @@
     type_run = type_run_omp
     ok_isccp = ok_isccp_omp
+    ok_cosp = ok_cosp_omp
     seuil_inversion=seuil_inversion_omp
     lonmin_ins = lonmin_ins_omp
@@ -1554 +1565 @@
   write(numout,*)' type_run = ',type_run 
   write(numout,*)' ok_isccp = ',ok_isccp 
+  write(numout,*)' ok_cosp = ',ok_cosp
   write(numout,*)' solarlong0 = ', solarlong0
   write(numout,*)' qsol0 = ', qsol0

LMDZ4/branches/LMDZ4-dev/libf/phylmd/newmicro.F

@@ -304 +304 @@
               reliq(i,k)=rel
               reice(i,k)=rei 
-              if (i.eq.1) then
-              print*,'Dans newmicro rel, rei :',rel, rei
-              print*,'Dans newmicro reliq, reice :',
-     $             reliq(i,k),reice(i,k)
-              endif
+!              if (i.eq.1) then
+!              print*,'Dans newmicro rel, rei :',rel, rei
+!              print*,'Dans newmicro reliq, reice :',
+!     $             reliq(i,k),reice(i,k)
+!              endif
 
             ENDDO

LMDZ4/branches/LMDZ4-dev/libf/phylmd/physiq.F

@@ -3178 +3178 @@
 ! Abderrahmane 24.08.09
 
-!      IF (ok_cosp) THEN
+      IF (ok_cosp) THEN
 ! adeclarer 
 #ifdef CPP_COSP
@@ -3204 +3204 @@
 !     I          tauisccp,albisccp,meantbisccp,meantbclrisccp)
 
-        ENDIF
-
-!      ENDIF
+         ENDIF
+
 #endif
+       ENDIF  !ok_cosp
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 cAA