Changeset 2488 for LMDZ5/branches/testing/libf/dyn3dmem/leapfrog_loc.F

Timestamp:

Apr 3, 2016, 12:09:34 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2457:2487 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dyn3dmem/leapfrog_loc.F (modified) (4 diffs)

LMDZ5/branches/testing/libf/dyn3dmem/leapfrog_loc.F

@@ -1603 +1603 @@
                ENDIF
 
+              ! Ehouarn: re-compute geopotential for outputs
+c$OMP BARRIER
+c$OMP MASTER
+              CALL geopot_loc(ip1jmp1,teta,pk,pks,phis,phi)
+c$OMP END MASTER
+c$OMP BARRIER
+
 #ifdef CPP_IOIPSL
              IF (ok_dynzon) THEN 
@@ -1638 +1645 @@
 #ifdef CPP_IOIPSL
              if (ok_dyn_ins) then
-                 CALL writehist_loc(itau,vcov,ucov,teta,phi,q,
+                 CALL writehist_loc(itau,vcov,ucov,teta,pk,phi,q,
      &                              masse,ps,phis)
              endif
@@ -1750 +1757 @@
 
 #ifdef CPP_IOIPSL
+              ! Ehouarn: re-compute geopotential for outputs
+c$OMP BARRIER
+c$OMP MASTER
+              CALL geopot_loc(ip1jmp1,teta,pk,pks,phis,phi)
+c$OMP END MASTER
+c$OMP BARRIER
+               
                IF (ok_dynzon) THEN
                CALL bilan_dyn_loc(2,dtvr*iperiod,dtvr*day_step*periodav,
@@ -1774 +1788 @@
 #ifdef CPP_IOIPSL
               if (ok_dyn_ins) then
-                 CALL writehist_loc(itau,vcov,ucov,teta,phi,q,
+                 CALL writehist_loc(itau,vcov,ucov,teta,pk,phi,q,
      &                              masse,ps,phis)
               endif ! of if (ok_dyn_ins)