Changeset 3887 for dynamico_lmdz/aquaplanet/ICOSAGCM

Timestamp:

Jan 25, 2016, 10:18:35 AM (9 years ago)

Author:

ymipsl

Message:

• Initial state from file in dynamico can be properly generated by switching flag in run_icosa.def
• bug fix for openMP when generate initial state from file

YM

Location:

dynamico_lmdz/aquaplanet/ICOSAGCM/src

Files:

• etat0.f90 (modified) (1 diff)
• etat0_database.f90 (modified) (7 diffs)
• icosagcm.f90 (modified) (1 diff)

dynamico_lmdz/aquaplanet/ICOSAGCM/src/etat0.f90

@@ -8 +8 @@
     REAL(rstd) :: etat0_temp
 
-    PUBLIC :: etat0, etat0_type
+    PUBLIC :: etat0, init_etat0, etat0_type
 
 CONTAINS
+
+  SUBROUTINE Init_etat0
+  USE etat0_database_mod
+  IMPLICIT NONE
+
+    CALL getin("etat0",etat0_type)
+
+    SELECT CASE (TRIM(etat0_type))
+      CASE ('isothermal')
+      CASE ('temperature_profile')
+      CASE ('jablonowsky06')
+      CASE ('dcmip5')
+      CASE ('williamson91.6')
+      CASE ('start_file')
+      CASE ('database')
+        CALL init_etat0_database
+      CASE ('academic')
+      CASE ('held_suarez')
+      CASE ('venus')
+      CASE ('dcmip1')
+      CASE ('dcmip2_mountain','dcmip2_schaer_noshear','dcmip2_schaer_shear')
+      CASE ('dcmip3')
+      CASE ('dcmip4')
+      CASE DEFAULT
+         PRINT*, 'Bad selector for variable etat0 <',etat0_type, &
+            '> options are <jablonowsky06>, <academic>, <dcmip[1-4]> '
+         STOP
+    END SELECT
+  
+  END SUBROUTINE Init_etat0
   
   SUBROUTINE etat0(f_ps,f_mass,f_phis,f_theta_rhodz,f_u, f_q)

dynamico_lmdz/aquaplanet/ICOSAGCM/src/etat0_database.f90

@@ -3 +3 @@
 
 CONTAINS
+
+  SUBROUTINE init_etat0_database
+  USE xios
+  IMPLICIT NONE
+  
+    CALL xios_set_fieldgroup_attr("read_fields",enabled=.TRUE.)
+    CALL xios_set_filegroup_attr("read_files",enabled=.TRUE.)
+
+  END SUBROUTINE init_etat0_database
 
   SUBROUTINE etat0(f_ps,f_phis,f_theta_rhodz,f_u, f_q)
@@ -18 +27 @@
   USE pression_mod
   USE write_etat0_mod
+  USE omp_para
   IMPLICIT NONE
     TYPE(t_field),POINTER :: f_ps(:)
@@ -25 +35 @@
     TYPE(t_field),POINTER :: f_q(:)
 
-    TYPE(t_field),POINTER :: f_ulon_reg(:)
-    TYPE(t_field),POINTER :: f_ulat_reg(:)
-    TYPE(t_field),POINTER :: f_temp_reg(:)
-    TYPE(t_field),POINTER :: f_q_reg(:)
+    TYPE(t_field),POINTER,SAVE :: f_ulon_reg(:)
+    TYPE(t_field),POINTER,SAVE :: f_ulat_reg(:)
+    TYPE(t_field),POINTER,SAVE :: f_temp_reg(:)
+    TYPE(t_field),POINTER,SAVE :: f_q_reg(:)
 
-    TYPE(t_field),POINTER :: f_ts(:)
-    TYPE(t_field),POINTER :: f_z(:)
-    TYPE(t_field),POINTER :: f_ulon(:)
-    TYPE(t_field),POINTER :: f_ulat(:)
-    TYPE(t_field),POINTER :: f_temp(:)
-    TYPE(t_field),POINTER :: f_q1(:)
-    TYPE(t_field),POINTER :: f_qsat(:)
-    TYPE(t_field),POINTER :: f_p(:)
+    TYPE(t_field),POINTER,SAVE :: f_ts(:)
+    TYPE(t_field),POINTER,SAVE :: f_z(:)
+    TYPE(t_field),POINTER,SAVE :: f_ulon(:)
+    TYPE(t_field),POINTER,SAVE :: f_ulat(:)
+    TYPE(t_field),POINTER,SAVE :: f_temp(:)
+    TYPE(t_field),POINTER,SAVE :: f_q1(:)
+    TYPE(t_field),POINTER,SAVE :: f_qsat(:)
+    TYPE(t_field),POINTER,SAVE :: f_p(:)
     INTEGER :: nb_level
     REAL,ALLOCATABLE:: levels(:)
@@ -43 +53 @@
 
     CALL xios_read_field("relief",f_phis)
+    
     CALL writeField("relief_out",f_phis,once=.TRUE.)
+
     DO ind=1,ndomain
       IF (.NOT. assigned_domain(ind)) CYCLE
@@ -50 +62 @@
 
 
-    CALL xios_get_axis_attr("lev_ecdyn",n_glo=nb_level)
+    IF (is_omp_master) CALL xios_get_axis_attr("lev_ecdyn",n_glo=nb_level)
+    CALL bcast_omp(nb_level)
     ALLOCATE(levels(nb_level))
-    CALL xios_get_axis_attr("lev_ecdyn",value=levels)
+
+    IF (is_omp_master) CALL xios_get_axis_attr("lev_ecdyn",value=levels)
+    CALL bcast_omp(levels)
+    
     levels=levels*100  ! hectoPascal -> Pascal
  
@@ -73 +89 @@
     CALL xios_read_field("ts",f_ts)
     CALL writeField("ps_out",f_ps)
+
+!$OMP BARRIER
+    
 !    CALL writeField("phis_out",f_phis,once=.TRUE.)
 !    CALL writeField("ts_out",f_ts,once=.TRUE.)
@@ -124 +143 @@
     CALL writeField("f_q",f_q,once=.TRUE.)
     CALL write_etat0(0,f_ps,f_phis,f_theta_rhodz,f_u, f_q)
-       
+    
+
+
+    CALL deallocate_field(f_ts)
+    CALL deallocate_field(f_z)
+    CALL deallocate_field(f_ulon_reg)
+    CALL deallocate_field(f_ulat_reg)
+    CALL deallocate_field(f_temp_reg)
+    CALL deallocate_field(f_q_reg)
+    
+    CALL deallocate_field(f_q1)
+    CALL deallocate_field(f_qsat)
+    CALL deallocate_field(f_p)
+    CALL deallocate_field(f_temp)
+    CALL deallocate_field(f_ulon)
+    CALL deallocate_field(f_ulat)   
+ 
   END SUBROUTINE etat0
 

dynamico_lmdz/aquaplanet/ICOSAGCM/src/icosagcm.f90

@@ -30 +30 @@
     CALL compute_domain
     CALL init_transfert
+    CALL init_etat0
     CALL init_writefield
     CALL init_trace