Changeset 3093 for trunk/LMDZ.COMMON/libf/evolution

Timestamp:

Oct 18, 2023, 3:40:56 PM (14 months ago)

Author:

jbclement

Message:

PEM:
The optional file to define the wanted outputs in "diagpem.nc" is now "diagpem.def" (instead of "diagfi.def") + Some updates in the files of deftank.
JBC

Location:

trunk/LMDZ.COMMON/libf/evolution

Files:

• changelog.txt (modified) (1 diff)
• writediagpem.F90 (modified) (6 diffs)

trunk/LMDZ.COMMON/libf/evolution/changelog.txt

@@ -108 +108 @@
     - Gathering of all "diagpem.nc" outputs at the same place at the end of the main PEM loop;
     - Update of "launch_pem.sh", "README" and "modify_startfi_orbit.sh" in the deftank.
+
+== 18/10/2023 == JBC
+The optional file to define the wanted outputs in "diagpem.nc" is now "diagpem.def" (instead of "diagfi.def") + Some updates in the files of deftank.

trunk/LMDZ.COMMON/libf/evolution/writediagpem.F90

@@ -30 +30 @@
 !
 ! Modifs: Aug.2010 Ehouarn: enforce outputs to be real*4
-!         Oct 2011 Francois: enable having a 'diagfi.def' file to select
+!         Oct 2011 Francois: enable having a 'diagpem.def' file to select
 !                            at runtime, which variables to put in file
 !         Oct 2023 JB: conversion into Fortran 90 with module for the PEM
@@ -90 +90 @@
 integer, dimension(4)   :: edges, corner
 
-! Added to use diagfi.def to select output variable
+! Added to use diagpem.def to select output variable
 logical,                                  save :: diagfi_def
 logical                                        :: getout
@@ -98 +98 @@
 character(120), dimension(n_nom_def_max), save :: nom_def
 logical,                                  save :: firstcall = .true.
-!$OMP THREADPRIVATE(firstcall) !diagfi_def,n_nom_def,nom_def read in diagfi.def
+!$OMP THREADPRIVATE(firstcall) !diagfi_def,n_nom_def,nom_def read in diagpem.def
 
 #ifdef CPP_PARA
@@ -123 +123 @@
 
 !***************************************************************
-! At very first call, check if there is a "diagfi.def" to use and read it
-! -----------------------------------------------------------------------
+! At very first call, check if there is a "diagpem.def" to use and read it
+! ------------------------------------------------------------------------
 IF (firstcall) THEN
     firstcall=.false.
 
 !$OMP MASTER
-    ! Open diagfi.def definition file if there is one:
-        open(99,file="diagfi.def",status='old',form='formatted',iostat=ierr2)
+    ! Open diagpem.def definition file if there is one:
+        open(99,file="diagpem.def",status='old',form='formatted',iostat=ierr2)
 
         if (ierr2 == 0) then
             diagfi_def=.true.
-            write(*,*) "******************"
-            write(*,*) "Reading diagfi.def"
-            write(*,*) "******************"
+            write(*,*) "*******************"
+            write(*,*) "Reading diagpem.def"
+            write(*,*) "*******************"
             do n=1,n_nom_def_max
                 read(99,fmt='(a)',end=88) nom_def(n)
@@ -155 +155 @@
 ENDIF ! of IF (firstcall)
 
-! Get out of write_diagfi if there is diagfi.def AND variable not listed
-!  ---------------------------------------------------------------------
+! Get out of write_diagfi if there is diagpem.def AND variable not listed
+!  ----------------------------------------------------------------------
 if (diagfi_def) then
     getout=.true.
@@ -167 +167 @@
 ! Initialisation of 'firstnom' and create/open the "diagfi.nc" NetCDF file
 ! ------------------------------------------------------------------------
-! (at very first call to the subroutine, in accordance with diagfi.def)
+! (at very first call to the subroutine, in accordance with diagpem.def)
 if (firstnom.eq.'1234567890') then ! .true. for the very first valid
     ! call to this subroutine; now set 'firstnom'