Changeset 5130 for LMDZ6/branches/Amaury_dev

Timestamp:

Jul 25, 2024, 7:41:04 PM (4 months ago)

Author:

abarral

Message:

Correct arguments order in abort_gcm
Remove now unused key from makelmdz_fcm

Location:

LMDZ6/branches/Amaury_dev

Files:

• libf/misc/lmdz_NOMODULE_abort_gcm.f90 (modified) (1 diff)
• makelmdz_fcm (modified) (1 diff)

LMDZ6/branches/Amaury_dev/libf/misc/lmdz_NOMODULE_abort_gcm.f90

@@ -3 +3 @@
 ! /!\ We can't put this in a module right away with FCM1, as this creates a circular dependency e.g. with wxios through lmdz_iniprint
 
-SUBROUTINE abort_gcm(modname, ierr, message)
+SUBROUTINE abort_gcm(modname, message, ierr)
   !END
   ! Stops the simulation cleanly, closing files and printing various

LMDZ6/branches/Amaury_dev/makelmdz_fcm

@@ -445 +445 @@
 
   if [[ $io = "ioipsl" ]]; then
-     CPP_KEY="$CPP_KEY CPP_IOIPSL"
+     CPP_KEY="$CPP_KEY"
      INCLUDE="$INCLUDE ${IOIPSL_INCDIR}"
      LIB="$LIB ${IOIPSL_LIBDIR} ${IOIPSL_LIB}"
   elif [[ $io = "mix" ]]; then
-     CPP_KEY="$CPP_KEY CPP_IOIPSL CPP_XIOS"
+     CPP_KEY="$CPP_KEY CPP_XIOS"
      INCLUDE="$INCLUDE ${IOIPSL_INCDIR} ${XIOS_INCDIR}"
      LIB="$LIB ${IOIPSL_LIBDIR} ${IOIPSL_LIB} ${XIOS_LIBDIR} ${XIOS_LIB}"
   elif [[ $io = "xios" ]]; then
-     CPP_KEY="$CPP_KEY CPP_IOIPSL CPP_XIOS CPP_IOIPSL_NO_OUTPUT"
+     CPP_KEY="$CPP_KEY CPP_XIOS CPP_IOIPSL_NO_OUTPUT"
      INCLUDE="$INCLUDE ${IOIPSL_INCDIR} ${XIOS_INCDIR}"
      LIB="$LIB ${IOIPSL_LIBDIR} ${IOIPSL_LIB} ${XIOS_LIBDIR} ${XIOS_LIB}"