Changeset 1374 for LMDZ4

Timestamp:

May 4, 2010, 2:46:58 PM (14 years ago)

Author:

musat

Message:

Add logical flags ok_histNMC(3) to manage output of the
standard pressure files hist*NMC.nc
IM

Location:

LMDZ4/trunk/libf/phylmd

Files:

• clesphys.h (modified) (2 diffs)
• conf_phys.F90 (modified) (4 diffs)
• ini_histdayNMC.h (modified) (2 diffs)
• ini_histhfNMC.h (modified) (2 diffs)
• ini_histmthNMC.h (modified) (2 diffs)
• write_histdayNMC.h (modified) (2 diffs)
• write_histhfNMC.h (modified) (2 diffs)
• write_histmthNMC.h (modified) (2 diffs)

LMDZ4/trunk/libf/phylmd/clesphys.h

@@ -48 +48 @@
        INTEGER lev_histdayNMC
        Integer lev_histins, lev_histLES  
+!IM ok_histNMC  : sortie fichiers niveaux de pression (histmthNMC, histdayNMC, histhfNMC)
 !IM freq_outNMC : frequences de sortie fichiers niveaux de pression (histmthNMC, histdayNMC, histhfNMC)
 !IM freq_calNMC : frequences de calcul fis. hist*NMC.nc
 !IM pasphys : pas de temps de physique (secondes)
        REAL pasphys
+       LOGICAL ok_histNMC(3)
        REAL freq_outNMC(3) , freq_calNMC(3)
        CHARACTER(len=4) type_run
@@ -77 +79 @@
      &     , lev_histhf, lev_histday, lev_histmth                       &
      &     , lev_histins, lev_histLES, lev_histdayNMC                   &
-     &     , pasphys, freq_outNMC, freq_calNMC                          &
+     &     , pasphys, ok_histNMC, freq_outNMC, freq_calNMC              &
      &     , type_run, ok_isccp, ok_regdyn, ok_cosp                     &
      &     , ok_mensuelCOSP,ok_journeCOSP,ok_hfCOSP                     &

LMDZ4/trunk/libf/phylmd/conf_phys.F90

@@ -139 +139 @@
   Integer, save :: lev_histins_omp, lev_histLES_omp 
   INTEGER, SAVE :: lev_histdayNMC_omp
+  LOGICAL, SAVE :: ok_histNMC_omp(3)
   REAL, SAVE :: freq_outNMC_omp(3), freq_calNMC_omp(3)
   CHARACTER*4, SAVE :: type_run_omp
@@ -1089 +1090 @@
 !
 !histNMC BEG
+!Config Key  = ok_histNMC
+!Config Desc = ok_histNMC(1) = frequence de sortie fichiers histmthNMC
+!Config Desc = ok_histNMC(2) = frequence de sortie fichiers histdayNMC
+!Config Desc = ok_histNMC(3) = frequence de sortie fichiers histhfNMC
+!Config Def  = n, n, n
+!Config Help =
+!
+  ok_histNMC_omp(1) = .false.
+  ok_histNMC_omp(2) = .false.
+  ok_histNMC_omp(3) = .false.
+  call getin('ok_histNMC',ok_histNMC_omp)
+!
 !Config Key  = freq_outNMC
 !Config Desc = freq_outNMC(1) = frequence de sortie fichiers histmthNMC
@@ -1476 +1489 @@
     lev_histLES = lev_histLES_omp
     lev_histdayNMC = lev_histdayNMC_omp
+    ok_histNMC(:) = ok_histNMC_omp(:)
     freq_outNMC(:) = freq_outNMC_omp(:)
     freq_calNMC(:) = freq_calNMC_omp(:)
@@ -1663 +1677 @@
   write(numout,*)' lev_histLES = ',lev_histLES
   write(numout,*)' lev_histdayNMC = ',lev_histdayNMC
+  write(numout,*)' ok_histNMC = ',ok_histNMC
   write(numout,*)' freq_outNMC = ',freq_outNMC
   write(numout,*)' freq_calNMC = ',freq_calNMC

LMDZ4/trunk/libf/phylmd/ini_histdayNMC.h

@@ -3 +3 @@
 !
 c$OMP MASTER
-
+      IF (ok_histNMC(2)) THEN
+c
        zstophy = dtime
        zstohf = ecrit_hf
@@ -133 +134 @@
          CALL histend(nid_daynmc)
 c
+      ENDIF !(ok_histNMC(2)) THEN
 c$OMP END MASTER

LMDZ4/trunk/libf/phylmd/ini_histhfNMC.h

@@ -3 +3 @@
 !
 c$OMP MASTER
-
+c
+      IF (ok_histNMC(3)) THEN
+c
        zstophy = dtime
        zstohf = ecrit_hf
@@ -142 +144 @@
          CALL histend(nid_hfnmc)
 c
+      ENDIF !(ok_histNMC(2)) THEN
+c
 c$OMP END MASTER
-

LMDZ4/trunk/libf/phylmd/ini_histmthNMC.h

@@ -3 +3 @@
 !
 c$OMP MASTER
+c
+      IF (ok_histNMC(1)) THEN
+c
        zout = freq_outNMC(1)
 c
@@ -139 +142 @@
          CALL histend(nid_mthnmc)
 c
+      ENDIF !(ok_histNMC(1)) THEN
+c
 c$OMP END MASTER

LMDZ4/trunk/libf/phylmd/write_histdayNMC.h

@@ -2 +2 @@
 ! $Header$
 !
-c     IF (ok_mensuel) THEN
+      IF (ok_histNMC(2)) THEN
 c
        ndex3d = 0
@@ -39 +39 @@
 c$OMP END MASTER
       endif
-
-c     ENDIF
+c
+      ENDIF ! (ok_histNMC(2)) THEN

LMDZ4/trunk/libf/phylmd/write_histhfNMC.h

@@ -2 +2 @@
 ! $Header$
 !
+      IF (ok_histNMC(3)) THEN
+c
        ndex3d = 0
        itau_w = itau_phy + itap
@@ -65 +67 @@
 c$OMP END MASTER
       endif
-
-c     ENDIF
+c
+      ENDIF !      (ok_histNMC(3)) THEN

LMDZ4/trunk/libf/phylmd/write_histmthNMC.h

@@ -2 +2 @@
 ! $Header$
 !
+      IF (ok_histNMC(1)) THEN
 c
        ndex3d = 0
@@ -64 +65 @@
 c$OMP END MASTER
       endif
+c
+      ENDIF !(ok_histNMC(1)) THEN