Changeset 2408 for LMDZ5/branches/testing/libf/phylmd/iostart.F90

Timestamp:

Dec 14, 2015, 11:43:09 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2298:2396 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/iostart.F90 (modified) (8 diffs)

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

@@ -41 +41 @@
         write(6,*)' Pb d''ouverture du fichier '//filename
         write(6,*)' ierr = ', ierr
-        CALL ABORT_GCM("", "", 1)
+        CALL abort_physic("", "", 1)
       ENDIF
     ENDIF
@@ -166 +166 @@
       IF (.NOT. tmp_found) THEN
         PRINT*, 'phyetat0: Le champ <'//field_name//'> est absent'
-        call abort_gcm("", "", 1)
+        call abort_physic("", "", 1)
       ENDIF
     ENDIF
@@ -186 +186 @@
               IF (ierr/=NF90_NOERR) THEN
                  PRINT*, 'phyetat0: Lecture echouee aussi en 2D pour <'//field_name//'>'
-                 call abort_gcm("", "", 1)
+                 call abort_physic("", "", 1)
               ELSE
                  PRINT*, 'phyetat0: La variable <'//field_name//'> lu sur surface seulement'!, selon ancien format, le reste mis a zero'
               END IF
            ELSE
-              call abort_gcm("", "", 1)
+              call abort_physic("", "", 1)
            ENDIF
          ENDIF
@@ -282 +282 @@
         IF (ierr/=NF90_NOERR) THEN
           PRINT*, 'phyetat0: Lecture echouee pour <'//var_name//'>'
-          call abort_gcm("", "", 1)
+          call abort_physic("", "", 1)
         ENDIF
         tmp_found=.TRUE.
@@ -302 +302 @@
       IF (.NOT. tmp_found) THEN
         PRINT*, 'phyetat0: La variable champ <'//var_name//'> est absente'
-        call abort_gcm("", "", 1)
+        call abort_physic("", "", 1)
       ENDIF
     ENDIF
@@ -323 +323 @@
         write(6,*)' Pb d''ouverture du fichier '//filename
         write(6,*)' ierr = ', ierr
-        CALL ABORT_GCM("", "", 1)
+        CALL abort_physic("", "", 1)
       ENDIF
 
@@ -410 +410 @@
       ELSE
         PRINT *, "erreur phyredem : probleme de dimension"
-        CALL ABORT_GCM("", "", 1)
+        CALL abort_physic("", "", 1)
       ENDIF
          
@@ -487 +487 @@
       IF (var_size/=length) THEN
         PRINT *, "erreur phyredem : probleme de dimension"
-        call abort_gcm("", "", 1)
+        call abort_physic("", "", 1)
       ENDIF