Changeset 3322

Timestamp:

May 4, 2018, 3:33:28 PM (6 years ago)

Author:

Laurent Fairhead

Message:

Continuing convergence between DYNAMICO and LMDZ new physics.
The xios stuff

Location:

LMDZ6/branches/DYNAMICO-conv/libf

Files:

• misc/wxios.F90 (modified) (2 diffs)
• phylmd/iophy.F90 (modified) (1 diff)
• phylmd/phyetat0.F90 (modified) (1 diff)
• phylmd/physiq_mod.F90 (modified) (3 diffs)

LMDZ6/branches/DYNAMICO-conv/libf/misc/wxios.F90

@@ -136 +136 @@
         g_ctx_name = xios_ctx_name
         
-        ! Si couple alors init fait dans cpl_init
-        IF (.not. PRESENT(type_ocean)) THEN
-            CALL wxios_context_init()
-        ENDIF
+!        ! Si couple alors init fait dans cpl_init
+!        IF (.not. PRESENT(type_ocean)) THEN
+!            CALL wxios_context_init()
+!        ENDIF
 
     END SUBROUTINE wxios_init
@@ -165 +165 @@
 !$OMP END MASTER
     END SUBROUTINE wxios_context_init
+
+
+    SUBROUTINE wxios_set_context()
+        IMPLICIT NONE
+        TYPE(xios_context) :: xios_ctx
+
+       !$OMP MASTER
+        CALL xios_get_handle(g_ctx_name, xios_ctx)    !Récupération
+        CALL xios_set_current_context(xios_ctx)            !Activation
+       !$OMP END MASTER
+
+    END SUBROUTINE wxios_set_context
 
     !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

LMDZ6/branches/DYNAMICO-conv/libf/phylmd/iophy.F90

@@ -70 +70 @@
     INTEGER :: data_ibegin, data_iend
 
-!#ifdef CPP_XIOS
-!      CALL wxios_context_init
-!#endif
+#ifdef CPP_XIOS
+      CALL wxios_context_init
+#endif
     
 

LMDZ6/branches/DYNAMICO-conv/libf/phylmd/phyetat0.F90

@@ -518 +518 @@
   ENDIF
 
-  CALL init_iophy_new(latitude_deg, longitude_deg)
+!  CALL init_iophy_new(latitude_deg, longitude_deg)
 
   ! Initilialize module fonte_neige_mod      

LMDZ6/branches/DYNAMICO-conv/libf/phylmd/physiq_mod.F90

@@ -1201 +1201 @@
        !IM 180608
 
-#ifdef CPP_XIOS
-       ! Get "missing_val" value from XML files (from temperature variable)
-       !$OMP MASTER
-       CALL xios_get_field_attr("temp",default_value=missing_val_omp)
-       !$OMP END MASTER
-       !$OMP BARRIER
-       missing_val=missing_val_omp
-#endif
 
        itau_con=0
@@ -1400 +1392 @@
        ENDIF
        ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+       CALL init_iophy_new(latitude_deg,longitude_deg)
+
 
        CALL phyetat0 ("startphy.nc",clesphy0,tabcntr0)
@@ -1612 +1606 @@
        !   Initialisation des sorties
        !=============================================================
+
+#ifdef CPP_XIOS
+       ! Get "missing_val" value from XML files (from temperature variable)
+       !$OMP MASTER
+       CALL xios_get_field_attr("temp",default_value=missing_val_omp)
+       !$OMP END MASTER
+       !$OMP BARRIER
+       missing_val=missing_val_omp
+#endif
 
 #ifdef CPP_XIOS