Changeset 351

Timestamp:

08/06/15 10:39:21 (9 years ago)

Author:

dubos

Message:

Thread safety fixes

Location:

codes/icosagcm/trunk/src

Files:

• domain_param.f90 (modified) (1 diff)
• omp_para.F90 (modified) (1 diff)
• write_field.f90 (modified) (3 diffs)

codes/icosagcm/trunk/src/domain_param.f90

@@ -1 +1 @@
 MODULE domain_param
+  IMPLICIT NONE
+  PRIVATE
+  INTEGER :: nsplit_i
+  INTEGER :: nsplit_j
+  INTEGER :: halo=1
 
-INTEGER :: nsplit_i
-INTEGER :: nsplit_j
-INTEGER :: halo=1
+  INTEGER, PARAMETER :: default_nsplit_i=1
+  INTEGER, PARAMETER :: default_nsplit_j=1
 
-INTEGER, PARAMETER :: default_nsplit_i=1
-INTEGER, PARAMETER :: default_nsplit_j=1
+  PUBLIC nsplit_i, nsplit_j, halo, init_domain_param
 
 CONTAINS
   
   SUBROUTINE init_domain_param
-  USE ioipsl
-  IMPLICIT NONE
+    USE ioipsl
+    !$OMP CRITICAL
     nsplit_i=default_nsplit_i
     nsplit_j=default_nsplit_j
     CALL getin('nsplit_i',nsplit_i)
     CALL getin('nsplit_j',nsplit_j)
+    !$OMP END CRITICAL
   END SUBROUTINE init_domain_param
   

codes/icosagcm/trunk/src/omp_para.F90

@@ -97 +97 @@
     ENDIF
 
-    omp_level_size=1 
+    !$OMP CRITICAL
+    omp_level_size=1
     CALL getin("omp_level_size",omp_level_size)
+    !$OMP END CRITICAL
+
     IF(is_mpi_master) PRINT *,'GETIN omp_level_size', ' = ', omp_level_size
 

codes/icosagcm/trunk/src/write_field.f90

@@ -1 +1 @@
 module write_field_mod
-USE genmod
-implicit none
+  USE genmod
+  IMPLICIT NONE
   PRIVATE  
   INTEGER,SAVE :: ncprec
@@ -24 +24 @@
   
     SUBROUTINE init_writeField
-    USE ioipsl
-    use netcdf_mod
-    IMPLICIT NONE
+      USE ioipsl
+      use netcdf_mod
       CHARACTER(LEN=255) :: netcdf_prec
-      
+      !$OMP CRITICAL
       netcdf_prec='float'
       CALL getin("netcdf_prec",netcdf_prec)
-      
       SELECT CASE(TRIM(netcdf_prec))
         CASE('float')
@@ -41 +39 @@
         STOP   
       END SELECT
+      !$OMP END CRITICAL
     END SUBROUTINE init_writeField