Changeset 710

Timestamp:

07/20/18 11:14:21 (6 years ago)

Author:

ymipsl

Message:

Remove conflict with OpenMP for LMDZ physic initialization.

At this stage, LDZ physic initialization must be called outside a OpenMP parallel section.

YM

Location:

codes/icosagcm/trunk/src

Files:

• icosa_init.f90 (modified) (1 diff)
• physics/physics.f90 (modified) (3 diffs)

codes/icosagcm/trunk/src/icosa_init.f90

@@ -55 +55 @@
     CALL output_field_init
     CALL init_timeloop
+
+  !$OMP END PARALLEL
+
     CALL init_physics
 
+  !$OMP PARALLEL
+  
     CALL init_diagflux
     CALL zero_du_phys

codes/icosagcm/trunk/src/physics/physics.f90

@@ -39 +39 @@
     SELECT CASE(TRIM(physics_type))
     CASE ('none')
+
+!$OMP PARALLEL
        IF(is_mpi_root) PRINT*,"NO PHYSICAL PACKAGE USED"
        phys_type = phys_none
+!$OMP END PARALLEL
+
     CASE ('held_suarez')
+
+!$OMP PARALLEL
        phys_type = phys_HS94
+!$OMP END PARALLEL
+
     CASE ('Lebonnois2012')
+
+!$OMP PARALLEL
        phys_type = phys_LB2012
        CALL init_phys_venus
+!$OMP END PARALLEL
 
     CASE ('phys_lmdz_generic')
+
+!$OMP PARALLEL
        CALL init_physics_lmdz_generic
        phys_type=phys_lmdz_generic
+!$OMP END PARALLEL
+
     CASE ('phys_external')
+
        CALL init_physics_external
+!$OMP PARALLEL
        phys_type=phys_external
+!$OMP END PARALLEL
+
     CASE ('dcmip')
+
+!$OMP PARALLEL
        CALL allocate_field(f_dulon,field_t,type_real,llm, name='dulon')
        CALL allocate_field(f_dulat,field_t,type_real,llm, name='dulat')
@@ -65 +86 @@
        CALL init_pack_after ! Defines Ai, lon, lat in physics_inout
        phys_type = phys_DCMIP
+!$OMP END PARALLEL
+
     CASE ('dcmip2016')
+
+!$OMP PARALLEL
        CALL allocate_field(f_dulon,field_t,type_real,llm, name='dulon')
        CALL allocate_field(f_dulat,field_t,type_real,llm, name='dulat')
@@ -77 +102 @@
        CALL init_pack_after ! Defines Ai, lon, lat in physics_inout
        phys_type = phys_DCMIP2016
+!$OMP END PARALLEL
+
     CASE DEFAULT
        IF(is_mpi_root) PRINT*, 'init_physics : Bad selector for variable physics <',&