Changeset 2399 for trunk

Timestamp:

Jul 6, 2020, 2:57:50 PM (4 years ago)

Author:

emillour

Message:

Mars GCM:
More code cleanup: use "call abort_physic()" instead of "stop" or "call abort"
EM

Location:

trunk/LMDZ.MARS/libf/phymars

Files:

• co2condens_mod.F (modified) (2 diffs)
• def_var.F90 (modified) (4 diffs)
• getslopes.F90 (modified) (1 diff)
• inistats.F (modified) (2 diffs)
• iostart.F90 (modified) (22 diffs)
• nonoro_gwd_ran_mod.F90 (modified) (1 diff)

trunk/LMDZ.MARS/libf/phymars/co2condens_mod.F

@@ -448 +448 @@
                PRINT*,'Ps = ',pplev(ig,1)
                PRINT*,'d Ps = ',pdpsrf(ig)
-               STOP
+               CALL abort_physic('co2condens',
+     &              'condensing more than total mass', 1)
             ENDIF
          END IF ! if there is condensation/sublimation
@@ -806 +807 @@
                 w(l+1) = Mtot
                 qm(l+1) = Mqtot / Mtot
-                write(*,*) 'top layer is disapearing !'
-                stop
+                CALL abort_physic('co2condens',
+     &               'top layer is disapearing !', 1)
              end if
           else      ! if(w(l+1).lt.0) 

trunk/LMDZ.MARS/libf/phymars/def_var.F90

@@ -13 +13 @@
 implicit none
 
-#include "netcdf.inc"
+include "netcdf.inc"
 
 integer,intent(in) :: nid ! NetCDF file ID
@@ -37 +37 @@
    write(*,*) "def_var: Failed defining variable "//trim(name)
    write(*,*) NF_STRERROR(ierr)
-   stop ""
+   call abort_physic("def_var",'netcdf definition problem',1)
 endif
 
@@ -46 +46 @@
    write(*,*) "def_var: Failed writing title attribute for "//trim(name)
    write(*,*) NF_STRERROR(ierr)
-   stop ""
+   call abort_physic("def_var",'netcdf title attribute problem',1)
 endif
 
@@ -54 +54 @@
    write(*,*) "def_var: Failed writing units attribute for "//trim(name)
    write(*,*) NF_STRERROR(ierr)
-   stop ""
+   call abort_physic("def_var",'netcdf units attribute problem',1)
 endif
 

trunk/LMDZ.MARS/libf/phymars/getslopes.F90

@@ -29 +29 @@
   ! This routine only works in serial mode so stop now.
   write(*,*) "getslopes Error: this routine is not designed to run in parallel"
-  stop
+  call abort_physic("getslopes",'cannot be run in parallel',1)
 endif
 

trunk/LMDZ.MARS/libf/phymars/inistats.F

@@ -38 +38 @@
       nsteppd=nint(daysec/dtphys)
       write (*,*) 'nsteppd=',nsteppd
-      if (abs(float(nsteppd)-daysec/dtphys).gt.1.e-8*daysec)
-     &   stop'Dans Instat:  1jour .ne. n pas physiques'
+      if (abs(float(nsteppd)-daysec/dtphys).gt.1.e-8*daysec) then
+        call abort_physic("inistats",
+     &                    '1 sol .ne. n physics steps',1)
+      endif
 
-      if(mod(nsteppd,istime).ne.0)
-     &   stop'Dans Instat:  1jour .ne. n*istime pas physiques'
+      if(mod(nsteppd,istime).ne.0) then
+        call abort_physic("inistats",
+     &                    '1 sol .ne. n*istime physics steps',1)
+      endif
 
       istats=nsteppd/istime
@@ -68 +72 @@
       if (ierr.ne.NF_NOERR) then
          write (*,*) NF_STRERROR(ierr)
-         stop ""
+        call abort_physic("inistats",
+     &                    'failed creating stats.nc',1)
       endif
 

trunk/LMDZ.MARS/libf/phymars/iostart.F90

@@ -53 +53 @@
         write(*,*)'open_startphy: problem opening file '//trim(filename)
         write(*,*)trim(nf90_strerror(ierr))
-        CALL ABORT
+        CALL abort_physic("open_startphy","Cannot open file",1)
       ENDIF
     ENDIF
@@ -117 +117 @@
                   //trim(field_name)
         write(*,*)trim(nf90_strerror(ierr))
-        CALL ABORT
+        CALL abort_physic("inquire_field_ndims","Failed to get ndims",1)
       ENDIF
     ENDIF
@@ -168 +168 @@
                   //trim(field_name)
         write(*,*)trim(nf90_strerror(ierr))
-        CALL ABORT
+        CALL abort_physic("inquire_field_ndims","Failed to get length",1)
       ENDIF
     ENDIF
@@ -307 +307 @@
       IF (.NOT. tmp_found) THEN
         PRINT*, 'get_field_rgen: Field <'//field_name//'> not found'
-        CALL abort
+        CALL abort_physic("get_field_rgen","Failed to get field",1)
       ENDIF
     ENDIF
@@ -332 +332 @@
 !              END IF
 !           ELSE
-              CALL abort
+              CALL abort_physic("get_field_rgen","Failed to read field",1)
 !           ENDIF
          ENDIF
@@ -427 +427 @@
         IF (ierr/=NF90_NOERR) THEN
           PRINT*, 'phyetat0: Failed loading <'//trim(var_name)//'>'
-          CALL abort
+          CALL abort_physic("get_var_rgen","Failed to read variable",1)
         ENDIF
         tmp_found=.TRUE.
@@ -447 +447 @@
       IF (.NOT. tmp_found) THEN
         PRINT*, 'phyetat0: Variable <'//trim(var_name)//'> not found'
-        CALL abort
+        CALL abort_physic("get_var_rgen","Failed to read variable",1)
       ENDIF
     ENDIF
@@ -479 +479 @@
           write(*,*)'open_restartphy: problem creating file '//trim(filename)
           write(*,*)trim(nf90_strerror(ierr))
-          CALL ABORT
+          CALL abort_physic("open_restartphy","Failed creating file",1)
         ENDIF
         already_created=.true.
@@ -488 +488 @@
           write(*,*)'open_restartphy: problem opening file '//trim(filename)
           write(*,*)trim(nf90_strerror(ierr))
-          CALL ABORT
+          CALL abort_physic("open_restartphy","Failed opening file",1)
         ENDIF
         return
@@ -504 +504 @@
         write(*,*)'open_restartphy: problem defining index dimension '
         write(*,*)trim(nf90_strerror(ierr))
-        CALL ABORT
+        CALL abort_physic("open_restartphy","Failed defining index",1)
       ENDIF
       
@@ -511 +511 @@
         write(*,*)'open_restartphy: problem defining physical_points dimension '
         write(*,*)trim(nf90_strerror(ierr))
-        CALL ABORT
+        CALL abort_physic("open_restartphy","Failed defining physical_points",1)
       ENDIF
       
@@ -518 +518 @@
         write(*,*)'open_restartphy: problem defining subsurface_layers dimension '
         write(*,*)trim(nf90_strerror(ierr))
-        CALL ABORT
+        CALL abort_physic("open_restartphy","Failed defining subsurface_layers",1)
       ENDIF
       
@@ -525 +525 @@
         write(*,*)'open_restartphy: problem defining nlayer_plus_1 dimension '
         write(*,*)trim(nf90_strerror(ierr))
-        CALL ABORT
+        CALL abort_physic("open_restartphy","Failed defining nlayer_plus_1",1)
       ENDIF
       
@@ -537 +537 @@
         write(*,*)'open_restartphy: problem defining number_of_advected_fields dimension '
         write(*,*)trim(nf90_strerror(ierr))
-        CALL ABORT
+        CALL abort_physic("open_restartphy","Failed defining number_of_advected_fields",1)
       ENDIF
 
@@ -544 +544 @@
         write(*,*)'open_restartphy: problem defining nlayer dimension '
         write(*,*)trim(nf90_strerror(ierr))
-        CALL ABORT
+        CALL abort_physic("open_restartphy","Failed defining nlayer",1)
       ENDIF
       
@@ -551 +551 @@
         write(*,*)'open_restartphy: problem defining Time dimension '
         write(*,*)trim(nf90_strerror(ierr))
-        CALL ABORT
+        CALL abort_physic("open_restartphy","Failed defining Time",1)
       ENDIF
 
@@ -558 +558 @@
         write(*,*)'open_restartphy: problem ending definition mode '
         write(*,*)trim(nf90_strerror(ierr))
-        CALL ABORT
+        CALL abort_physic("open_restartphy","Failed ending definition mode",1)
       ENDIF
     ENDIF
@@ -822 +822 @@
         PRINT *, "Error phyredem(put_field_rgen) : wrong dimension for ",trim(field_name)
         write(*,*) "  field_size =",field_size
-        CALL ABORT
+        CALL abort_physic("put_field_rgen","wrong field dimension",1)
       ENDIF
 
@@ -829 +829 @@
         write(*,*) " Error phyredem(put_field_rgen) : failed writing ",trim(field_name)
         write(*,*)trim(nf90_strerror(ierr))
-        call abort
+        CALL abort_physic("put_field_rgen","Failed writing field",1)
       endif
 
@@ -932 +932 @@
           write(*,*)'put_var_rgen: problem writing Time'
           write(*,*)trim(nf90_strerror(ierr))
-          CALL ABORT
+          CALL abort_physic("get_var_rgen","Failed to write Time",1)
         ENDIF
         return ! nothing left to do
@@ -944 +944 @@
         PRINT *, "put_var_rgen error : wrong dimension"
         write(*,*) "  var_size =",var_size
-        CALL abort
+        CALL abort_physic("get_var_rgen","Wrong variable dimension",1)
 
       ENDIF ! of IF (var_size==length) THEN
@@ -965 +965 @@
         write(*,*)'put_var_rgen: problem writing '//trim(var_name)
         write(*,*)trim(nf90_strerror(ierr))
-        CALL ABORT
+        CALL abort_physic("get_var_rgen","Failed writing variable",1)
       ENDIF
     ENDIF ! of IF (is_master)

trunk/LMDZ.MARS/libf/phymars/nonoro_gwd_ran_mod.F90

@@ -469 +469 @@
        end DO
        CLOSE(11)
-       stop
+       CALL abort_physic("nonoro_gwd_ran","stop here, the work is done",0)
     endif