Changeset 1475

Timestamp:

Jan 21, 2011, 3:41:03 PM (14 years ago)

Author:

Ehouarn Millour

Message:

Bug fix: don't "stop" in abort_gcm if all ends well (just let the program end cleanly and finalize parallel processes).
EM

Location:

LMDZ5/branches/LMDZ5V2.0-dev/libf/dyn3dpar

Files:

• abort_gcm.F (modified) (1 diff)
• friction_p.F (modified) (1 diff)
• leapfrog_p.F (modified) (1 diff)

LMDZ5/branches/LMDZ5V2.0-dev/libf/dyn3dpar/abort_gcm.F

@@ -45 +45 @@
       if (ierr .eq. 0) then
         write(lunout,*) 'Everything is cool'
-        stop
       else
         write(lunout,*) 'Houston, we have a problem ', ierr

LMDZ5/branches/LMDZ5V2.0-dev/libf/dyn3dpar/friction_p.F

@@ -34 +34 @@
 
 ! arguments:
-      REAL,INTENT(out) :: ucov( iip1,jjp1,llm )
-      REAL,INTENT(out) :: vcov( iip1,jjm,llm )
+      REAL,INTENT(inout) :: ucov( iip1,jjp1,llm )
+      REAL,INTENT(inout) :: vcov( iip1,jjm,llm )
       REAL,INTENT(in) :: pdt ! time step
 

LMDZ5/branches/LMDZ5V2.0-dev/libf/dyn3dpar/leapfrog_p.F

@@ -996 +996 @@
           enddo
 !$OMP END DO
-!$OMP SINGLE
+!$OMP MASTER
           dpfi(ijb:ije)=0
-!$OMP END SINGLE
+!$OMP END MASTER
           ijb=ij_begin
           ije=ij_end