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

Timestamp:

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

Author:

Laurent Fairhead

Message:

Merged trunk changes r1920:1997 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/phyredem.F90 (modified) (11 diffs)

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

@@ -129 +129 @@
      ELSE
         PRINT*, "Trop de sous-mailles"
-        CALL abort
+        call abort_gcm("phyredem", "", 1)
      ENDIF
   ENDDO
@@ -141 +141 @@
         ELSE
            PRINT*, "Trop de couches"
-           CALL abort
+           call abort_gcm("phyredem", "", 1)
         ENDIF
      ENDDO
@@ -153 +153 @@
      ELSE
         PRINT*, "Trop de sous-mailles"
-        CALL abort
+        call abort_gcm("phyredem", "", 1)
      ENDIF
   END DO
@@ -166 +166 @@
      ELSE
         PRINT*, "Trop de sous-mailles"
-        CALL abort
+        call abort_gcm("phyredem", "", 1)
      ENDIF
   ENDDO
@@ -177 +177 @@
      ELSE
         PRINT*, "Trop de sous-mailles"
-        CALL abort
+        call abort_gcm("phyredem", "", 1)
      ENDIF
   ENDDO
@@ -188 +188 @@
      ELSE
         PRINT*, "Trop de sous-mailles"
-        CALL abort
+        call abort_gcm("phyredem", "", 1)
      ENDIF
   ENDDO
@@ -199 +199 @@
      ELSE
         PRINT*, "Trop de sous-mailles"
-        CALL abort
+        call abort_gcm("phyredem", "", 1)
      ENDIF
   ENDDO
@@ -222 +222 @@
      ELSE
         PRINT*, "Trop de sous-mailles"
-        CALL abort
+        call abort_gcm("phyredem", "", 1)
      ENDIF
   ENDDO
@@ -234 +234 @@
      ELSE
         PRINT*, "Trop de sous-mailles"
-        CALL abort
+        call abort_gcm("phyredem", "", 1)
      ENDIF
   ENDDO
@@ -285 +285 @@
         ELSE
            PRINT*, "Trop de sous-mailles"
-           CALL abort
+           call abort_gcm("phyredem", "", 1)
         ENDIF
      ENDDO
@@ -340 +340 @@
   END IF
 
+  if (ok_gwd_rando) then
+     call put_field("du_gwd_rando", &
+          "tendency on zonal wind due to gravity waves", &
+          du_gwd_rando)
+     call put_field("dv_gwd_rando", &
+          "tendency on meriodional wind due to gravity waves", &
+          dv_gwd_rando)
+  end if
+
   CALL close_restartphy
   !$OMP BARRIER