Changeset 1999 for LMDZ5/branches/testing/libf/phylmd/oasis.F90

Timestamp:

Mar 20, 2014, 10:57:19 AM (11 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r1920:1997 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/oasis.F90 (modified) (4 diffs)

LMDZ5/branches/testing/libf/phylmd/oasis.F90

@@ -15 +15 @@
 
 #ifdef CPP_COUPLE
+! Use of Oasis-MCT coupler 
+#if defined CPP_OMCT
+  USE mod_prism
+! Use of Oasis3 coupler 
+#else 
   USE mod_prism_proto
   USE mod_prism_def_partition_proto
   USE mod_prism_get_proto
   USE mod_prism_put_proto
+#endif
 #endif
   
@@ -107 +113 @@
     CHARACTER (len = 20)               :: modname = 'inicma'
     CHARACTER (len = 80)               :: abort_message 
-    LOGICAL                            :: cpl_current_omp
+    LOGICAL, SAVE                      :: cpl_current_omp
 
 !*    1. Initializations
@@ -337 +343 @@
     
     DO i = 1, maxrecv
-      IF (inforecv(i)%action) THEN
+      IF (inforecv(i)%action .AND. inforecv(i)%nid .NE. -1) THEN
           field(:) = -99999.
           CALL prism_get_proto(inforecv(i)%nid, ktime, field(istart:iend), ierror)
@@ -421 +427 @@
 
     DO i = 1, maxsend
-      IF (infosend(i)%action) THEN
+      IF (infosend(i)%action .AND. infosend(i)%nid .NE. -1 ) THEN
           field = RESHAPE(tab_put(:,:,i),(/iim*jj_nb/))
           CALL prism_put_proto(infosend(i)%nid, ktime, field(istart:iend), ierror)