Changeset 3585

Timestamp:

Oct 15, 2019, 12:38:46 PM (5 years ago)

Author:

Ehouarn Millour

Message:

Follow-up of r3579 (update of iniaqua) for the unstructured case, along with some code cleanup (use getin_p instead of getin+broadcasts).
EM

File:

• LMDZ6/trunk/libf/phylmd/create_etat0_limit_unstruct.F90 (modified) (5 diffs)

LMDZ6/trunk/libf/phylmd/create_etat0_limit_unstruct.F90

@@ -11 +11 @@
   SUBROUTINE init_etat0_limit_unstruct
 #ifdef CPP_XIOS
-  USE xios
-  USE mod_phys_lmdz_para
-  USE mod_grid_phy_lmdz
-  USE ioipsl, ONLY : getin, ioget_year_len
+  USE xios, ONLY: xios_set_axis_attr, xios_set_fieldgroup_attr, &
+                  xios_set_filegroup_attr, xios_set_file_attr
+  USE mod_phys_lmdz_para, ONLY: is_omp_master
+  USE mod_grid_phy_lmdz, ONLY: grid_type, unstructured
+  USE ioipsl, ONLY : ioget_year_len
+  USE ioipsl_getin_p_mod, ONLY: getin_p
   USE time_phylmdz_mod, ONLY : annee_ref
-  USE create_etat0_unstruct_mod
+  USE create_etat0_unstruct_mod, ONLY: init_create_etat0_unstruct
   IMPLICIT NONE
   
@@ -24 +26 @@
     
       IF (grid_type==unstructured) THEN
-        IF (is_master) CALL getin("iflag_phys",iflag_phys)
-        CALL bcast(iflag_phys)
+        CALL getin_p("iflag_phys",iflag_phys)
         
-        IF (is_master) CALL getin('create_etat0_limit',create_etat0_limit) 
-        CALL bcast(create_etat0_limit)
+        CALL getin_p('create_etat0_limit',create_etat0_limit)
         
         ndays=ioget_year_len(annee_ref)
@@ -54 +54 @@
   SUBROUTINE create_etat0_limit_unstruct
 #ifdef CPP_XIOS
-  USE mod_grid_phy_lmdz
-  USE create_etat0_unstruct_mod
-  USE create_limit_unstruct_mod
-  USE phyaqua_mod
-  USE mod_phys_lmdz_para
-  USE ioipsl, ONLY : getin
-  USE dimphy
-  USE xios 
+  USE mod_grid_phy_lmdz, ONLY: grid_type, unstructured
+  USE create_etat0_unstruct_mod, ONLY: create_etat0_unstruct
+  USE create_limit_unstruct_mod, ONLY: create_limit_unstruct
+  USE phyaqua_mod, ONLY: iniaqua
+  USE phys_cal_mod, only: year_len
+  USE mod_phys_lmdz_para, ONLY: is_omp_master
+  USE ioipsl_getin_p_mod, ONLY: getin_p
+  USE dimphy, ONLY: klon
+  USE xios, ONLY: xios_context_finalize, xios_set_current_context, &
+                  xios_finalize
   USE print_control_mod, ONLY: lunout
   IMPLICIT NONE
@@ -71 +73 @@
       IF (grid_type==unstructured) THEN
   
-        IF (is_master) CALL getin("iflag_phys",iflag_phys)
-        CALL bcast(iflag_phys)
+        CALL getin_p("iflag_phys",iflag_phys)
 
         IF (iflag_phys<100) THEN
@@ -96 +97 @@
         ELSE
           IF (create_etat0_limit) THEN 
-            CALL iniaqua(klon,iflag_phys)
+            CALL iniaqua(klon,year_len,iflag_phys)
               IF (is_omp_master)  THEN
                 CALL xios_context_finalize()