Changeset 5111 for LMDZ6/branches/Amaury_dev/libf/phy_common

Timestamp:

Jul 24, 2024, 12:17:33 PM (2 months ago)

Author:

abarral

Message:

Put abort_physic into a module
Remove -g option from makelmdz_fcm, since that option is linked to a header file that isn't included anywhere.
(lint) light lint on traversed files

Location:

LMDZ6/branches/Amaury_dev/libf/phy_common

Files:

• lmdz_abort_physic.F90 (moved) (moved from LMDZ6/branches/Amaury_dev/libf/phy_common/abort_physic.F90) (1 diff)
• lmdz_phys_omp_data.F90 (modified) (1 diff)

LMDZ6/branches/Amaury_dev/libf/phy_common/lmdz_abort_physic.F90

@@ -1 @@
-! $Id: $
-      SUBROUTINE abort_physic(modname, message, ierr)
-     
-      USE IOIPSL
-      USE lmdz_phys_para
-      USE print_control_mod, ONLY: lunout
-      IMPLICIT NONE
+MODULE lmdz_abort_physic
+  IMPLICIT NONE; PRIVATE
+  PUBLIC abort_physic
+CONTAINS
 
-! Stops the simulation cleanly, closing files and printing various
-! comments
+  SUBROUTINE abort_physic(modname, message, ierr)
 
-!  Input: modname = name of calling program
-!         message = stuff to print
-!         ierr    = severity of situation ( = 0 normal )
+    USE IOIPSL
+    USE lmdz_phys_para
+    USE print_control_mod, ONLY: lunout
+    IMPLICIT NONE
 
-      character(len=*), intent(in):: modname
-      integer ierr, ierror_mpi
-      character(len=*), intent(in):: message
+    ! Stops the simulation cleanly, closing files and printing various
+    ! comments
 
-      write(lunout,*) 'in abort_physic'
-!$OMP MASTER
-      CALL histclo
-      CALL restclo
-      if (mpi_rank .eq. 0) then
-         CALL getin_dump
+    !  Input: modname = name of calling program
+    !         message = stuff to print
+    !         ierr    = severity of situation ( = 0 normal )
+
+    character(len = *), intent(in) :: modname
+    integer ierr, ierror_mpi
+    character(len = *), intent(in) :: message
+
+    write(lunout, *) 'in abort_physic'
+    !$OMP MASTER
+    CALL histclo
+    CALL restclo
+    if (mpi_rank == 0) then
+      CALL getin_dump
+    endif
+    !$OMP END MASTER
+
+    write(lunout, *) 'Stopping in ', modname
+    write(lunout, *) 'Reason = ', message
+    if (ierr == 0) then
+      write(lunout, *) 'Everything is cool'
+      if (using_mpi) then
+        !$OMP CRITICAL (MPI_ABORT_PHYSIC)
+        CALL MPI_ABORT(COMM_LMDZ_PHY, 0, ierror_mpi)
+        !$OMP END CRITICAL (MPI_ABORT_PHYSIC)
+      else
+        stop 0
       endif
-!$OMP END MASTER
+    else
+      write(lunout, *) 'Houston, we have a problem, ierr = ', ierr
+      if (using_mpi) then
+        !$OMP CRITICAL (MPI_ABORT_PHYSIC)
+        CALL MPI_ABORT(COMM_LMDZ_PHY, 1, ierror_mpi)
+        !$OMP END CRITICAL (MPI_ABORT_PHYSIC)
+      else
+        stop 1
+      endif
+    endif
+  END
 
-      write(lunout,*) 'Stopping in ', modname
-      write(lunout,*) 'Reason = ',message
-      if (ierr == 0) then
-        write(lunout,*) 'Everything is cool'
-        if (using_mpi) then
-          !$OMP CRITICAL (MPI_ABORT_PHYSIC)
-          CALL MPI_ABORT(COMM_LMDZ_PHY, 0, ierror_mpi)
-          !$OMP END CRITICAL (MPI_ABORT_PHYSIC)
-        else
-          stop 0
-        endif          
-      else
-        write(lunout,*) 'Houston, we have a problem, ierr = ', ierr
-        if (using_mpi) then
-          !$OMP CRITICAL (MPI_ABORT_PHYSIC)
-          CALL MPI_ABORT(COMM_LMDZ_PHY, 1, ierror_mpi)
-          !$OMP END CRITICAL (MPI_ABORT_PHYSIC)
-        else
-          stop 1
-        endif          
-      endif
-      END
+END MODULE lmdz_abort_physic

LMDZ6/branches/Amaury_dev/libf/phy_common/lmdz_phys_omp_data.F90

@@ -26 +26 @@
     USE dimphy 
     USE lmdz_phys_mpi_data, ONLY: is_north_pole_dyn, is_south_pole_dyn
+    USE lmdz_abort_physic, ONLY: abort_physic
     IMPLICIT NONE
     INTEGER, INTENT(in) :: klon_mpi