Changeset 635

Timestamp:

12/12/17 22:44:52 (6 years ago)

Author:

dubos

Message:

devel : set nb_threads to OMP_NUM_THREADS by default

File:

• codes/icosagcm/devel/src/unstructured/caldyn_unstructured.F90 (modified) (4 diffs)

codes/icosagcm/devel/src/unstructured/caldyn_unstructured.F90

@@ -24 +24 @@
        caldyn_vert_cons=1
   INTEGER(C_INT),  BIND(C) :: caldyn_thermo=thermo_theta, caldyn_eta=eta_lag, &
-       caldyn_vert_variant=caldyn_vert_cons, nb_threads=1
+       caldyn_vert_variant=caldyn_vert_cons, nb_threads=0
   LOGICAL(C_BOOL), BIND(C) :: hydrostatic=.TRUE., debug_hevi_solver=.TRUE., rigid=.TRUE.
 !
@@ -84 +84 @@
   INTEGER :: ij
 
-  !CALL CPU_TIME(time1)
+!  CALL CPU_TIME(time1)
   time1=OMP_GET_WTIME()
 
@@ -107 +107 @@
        CALL caldyn_vert(drhodz,rhodz,theta,u, dmass_col,wflux,dtheta_rhodz,du_slow,wwuu)
     END IF
-    !$OMP END PARALLEL
+!$OMP END PARALLEL
 
   ELSE ! NH
@@ -368 +368 @@
   PRINT *, MINVAL(right), MAXVAL(left)
   PRINT *,' ... Done.'
+  IF(nb_threads==0) nb_threads=OMP_GET_MAX_THREADS()
   PRINT *,'OpenMP : max_threads, num_procs, nb_threads', OMP_GET_MAX_THREADS(), omp_get_num_procs(), nb_threads