Changeset 7792 for branches/ORCHIDEE_2_2

Timestamp:

2022-11-03T13:21:32+01:00 (2 years ago)

Author:

josefine.ghattas

Message:

Minimum of modifications to have PRINTLEV=1 functionnality(only master opens out_orchidee text file) as in the ticket #874

Location:

branches/ORCHIDEE_2_2/ORCHIDEE

Files:

• src_global/time.f90 (modified) (2 diffs)
• src_parameters/constantes.f90 (modified) (3 diffs)
• src_sechiba/intersurf.f90 (modified) (4 diffs)

branches/ORCHIDEE_2_2/ORCHIDEE/src_global/time.f90

@@ -38 +38 @@
   USE defprec
   USE constantes_var
-  USE mod_orchidee_para_var, ONLY : numout
+  USE mod_orchidee_para_var, ONLY : numout, is_mpi_root, is_omp_root
   USE ioipsl
   USE ioipsl_para
@@ -131 +131 @@
     printlev_loc=printlev
     CALL getin_p('PRINTLEV_time', printlev_loc)
+    IF (printlev_loc .EQ. 1) THEN
+       IF (is_mpi_root.AND.is_omp_root) THEN
+          ! Keep output level 1 only for the master processor
+          printlev_loc=1
+       ELSE
+          ! Change output level for all other processors
+          printlev_loc=0
+       END IF
+    END IF
+ 
+
 
     !! Save length of sechiba time step in module variable

branches/ORCHIDEE_2_2/ORCHIDEE/src_parameters/constantes.f90

@@ -35 +35 @@
   USE defprec
   USE ioipsl_para, ONLY : getin_p, ipslerr_p
-  USE mod_orchidee_para_var, ONLY : numout
+  USE mod_orchidee_para_var, ONLY : numout, is_mpi_root, is_omp_root
+  USE mod_orchidee_para, ONLY : Set_stdout_file 
   USE time, ONLY : one_day, dt_sechiba
 
@@ -2387 +2388 @@
     !! 1.0  Read the global PRINTLEV from run.def. This is only done at first call to this function. 
     IF (first) THEN
-       !Config Key   = PRINTLEV
-       !Config Desc  = Print level for text output
-       !Config If    = 
-       !Config Help  = Possible values are:
-       !Config         0    No output, 
-       !Config         1    Minimum writing for long simulations, 
-       !Config         2    More basic information for long simulations, 
-       !Config         3    First debug level, 
-       !Config         4    Higher debug level
-       !Config Def   = 2
-       !Config Units = [0, 1, 2, 3, 4]
-       ! Default value is set in constantes_var
-       CALL getin_p('PRINTLEV',printlev)
+       CALL Set_stdout_file('out_orchidee')
        first=.FALSE.
 
@@ -2417 +2406 @@
     CALL getin_p('PRINTLEV_'//modname, get_printlev)
 
+    IF (get_printlev .EQ. 1) THEN
+       IF (is_mpi_root.AND.is_omp_root) THEN
+          ! Keep output level 1 only for the master processor
+          get_printlev=1
+       ELSE
+          ! Change output level for all other processors
+          get_printlev=0
+       END IF
+    END IF
+
   END FUNCTION get_printlev
 

branches/ORCHIDEE_2_2/ORCHIDEE/src_sechiba/intersurf.f90

@@ -219 +219 @@
 
     ! Initialize specific write level
-    printlev_loc=get_printlev('instersurf')
+    printlev_loc=get_printlev('intersurf')
     
     OFF_LINE_MODE = .TRUE. 
@@ -740 +740 @@
     INTEGER,DIMENSION(kjpindex)  :: kindex_offset
 
+
     IF (printlev >= 1) WRITE(*,*) 'Start ORCHIDEE'
 
@@ -749 +750 @@
     CALL barrier2_omp()    
     CALL init_orchidee_data_para(kjpindex,kindex,orch_offset,orch_omp_size,orch_omp_rank,COMM)
-    CALL Set_stdout_file('out_orchidee')
+
+    ! Initialize specific write level and open text output file
+    printlev_loc=get_printlev('intersurf')
 
     IF (printlev >= 1) WRITE(numout,*) 'Start ORCHIDEE intitalization phase'
@@ -908 +911 @@
  
     ! Initialize specific write level
-    printlev_loc=get_printlev('instersurf')
+    printlev_loc=get_printlev('intersurf')
 
     IF (printlev_loc >= 1) WRITE(numout,*) 'Entering intersurf_initialize_gathered'