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

Timestamp:

Oct 23, 2023, 6:42:21 PM (15 months ago)

Author:

jbclement

Message:

PEM:
Correction of a bug from r3088: "diagfi.nc" was not changed into "diagpem.nc" in the commited version of "writediagpem.F90"!
JBC

Location:

trunk/LMDZ.COMMON/libf/evolution

Files:

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

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

@@ -119 +119 @@
     - the files in deftank have been updated consequently.
 Following r3095, 'iniorbit' is now a subroutine of "planete_h.F90".
+Correction of a bug from r3088: "diagfi.nc" was not changed into "diagpem.nc" in the commited version of "writediagpem.F90"!

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

@@ -35 +35 @@
     write(ich1,'(i0)') i_myear
     write(ich2,'(i0)') n_myear
-    write(fch,'(f0.4)') convert_years ! 4 digits afetr to the right of the decimal point to respect the precision of Martian year in "launch_pem.sh"
+    write(fch,'(f0.4)') convert_years ! 4 digits to the right of the decimal point to respect the precision of Martian year in "launch_pem.sh"
     call execute_command_line('sed -i "1s/.*/'//trim(ich1)//' '//trim(ich2)//' '//trim(fch)//'/" info_PEM.txt',cmdstat = cstat)
     if (cstat > 0) then

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

@@ -10 +10 @@
 
 !  Ecriture de variables diagnostiques au choix dans la physique
-!  dans un fichier NetCDF nomme  'diagfi'. Ces variables peuvent etre
+!  dans un fichier NetCDF nomme  'diagpem'. Ces variables peuvent etre
 !  3d (ex : temperature), 2d (ex : temperature de surface), ou
 !  0d (pour un scalaire qui ne depend que du temps : ex : la longitude
@@ -27 +27 @@
 ! on ne leur a pas encore ajoute de la dissipation et de la physique !!!
 ! IL est  RECOMMANDE d'ajouter les tendance physique a ces variables
-! avant l'ecriture dans diagfi (cf. physiq.F)
+! avant l'ecriture dans diagpem (cf. physiq.F)
 !
 ! Modifs: Aug.2010 Ehouarn: enforce outputs to be real*4
@@ -86 +86 @@
 integer                 :: idim, varid
 integer                 :: nid
-character(*), parameter :: fichnom = "diagfi.nc"
+character(*), parameter :: fichnom = "diagpem.nc"
 integer, dimension(4)   :: id
 integer, dimension(4)   :: edges, corner
 
 ! Added to use diagpem.def to select output variable
-logical,                                  save :: diagfi_def
+logical,                                  save :: diagpem_def
 logical                                        :: getout
 integer,                                  save :: n_nom_def
@@ -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 diagpem.def
+!$OMP THREADPRIVATE(firstcall) !diagpem_def,n_nom_def,nom_def read in diagpem.def
 
 #ifdef CPP_PARA
@@ -133 +133 @@
 
         if (ierr2 == 0) then
-            diagfi_def=.true.
+            diagpem_def=.true.
             write(*,*) "*******************"
             write(*,*) "Reading diagpem.def"
@@ -139 +139 @@
             do n=1,n_nom_def_max
                 read(99,fmt='(a)',end=88) nom_def(n)
-                write(*,*) 'Output in diagfi: ', trim(nom_def(n))
+                write(*,*) 'Output in diagpem: ', trim(nom_def(n))
             enddo
  88         continue
@@ -149 +149 @@
             close(99)
         else
-            diagfi_def=.false.
+            diagpem_def=.false.
         endif
 !$OMP END MASTER
@@ -155 +155 @@
 ENDIF ! of IF (firstcall)
 
-! Get out of write_diagfi if there is diagpem.def AND variable not listed
-!  ----------------------------------------------------------------------
-if (diagfi_def) then
+! Get out of write_diagpem if there is diagpem.def AND variable not listed
+!  -----------------------------------------------------------------------
+if (diagpem_def) then
     getout=.true.
     do n=1,n_nom_def
@@ -165 +165 @@
 endif
 
-! Initialisation of 'firstnom' and create/open the "diagfi.nc" NetCDF file
-! ------------------------------------------------------------------------
+! Initialisation of 'firstnom' and create/open the "diagpem.nc" NetCDF file
+! -------------------------------------------------------------------------
 ! (at very first call to the subroutine, in accordance with diagpem.def)
 if (firstnom.eq.'1234567890') then ! .true. for the very first valid
@@ -287 +287 @@
             endif
 
-            write(6,*)'WRITEDIAGFI: date= ', date
+            write(6,*)'WRITEDIAGPEM: date= ', date
         endif ! of if (nom.eq.firstnom)
     endif ! of if (is_master)
@@ -340 +340 @@
 
 ! Create the variable if it doesn't exist yet
-                write (*,*) "=========================="
-                write (*,*) "DIAGFI: creating variable ",trim(nom)
+                write (*,*) "==========================="
+                write (*,*) "DIAGPEM: creating variable ",trim(nom)
                 call def_var(nid,nom,titre,unite,4,id,varid,ierr)
 
             else
                 if (ntime==0) then
-                    write(*,*) "DIAGFI Error: failed creating variable ",trim(nom)
+                    write(*,*) "DIAGPEM Error: failed creating variable ",trim(nom)
                     write(*,*) "it seems it already exists!"
                     call abort_physic("writediagpem",trim(nom)//" already exists",1)
@@ -437 +437 @@
 
 ! Create the variable if it doesn't exist yet
-                write (*,*) "=========================="
-                write (*,*) "DIAGFI: creating variable ",trim(nom)
+                write (*,*) "==========================="
+                write (*,*) "DIAGPEM: creating variable ",trim(nom)
 
                 call def_var(nid,nom,titre,unite,3,id,varid,ierr)
@@ -444 +444 @@
             else
                 if (ntime==0) then
-                    write(*,*) "DIAGFI Error: failed creating variable ",trim(nom)
+                    write(*,*) "DIAGPEM Error: failed creating variable ",trim(nom)
                     write(*,*) "it seems it already exists!"
                     call abort_physic("writediagpem",trim(nom)//" already exists",1)
@@ -502 +502 @@
 ! Create the variable if it doesn't exist yet
 
-            write (*,*) "=========================="
-            write (*,*) "DIAGFI: creating variable ",trim(nom)
+            write (*,*) "==========================="
+            write (*,*) "DIAGPEM: creating variable ",trim(nom)
 
             call def_var(nid,nom,titre,unite,2,id,varid,ierr)
@@ -509 +509 @@
         else
             if (ntime==0) then
-                write(*,*) "DIAGFI Error: failed creating variable ",trim(nom)
+                write(*,*) "DIAGPEM Error: failed creating variable ",trim(nom)
                 write(*,*) "it seems it already exists!"
                 call abort_physic("writediagpem",trim(nom)//" already exists",1)
@@ -546 +546 @@
 
 ! Create the variable if it doesn't exist yet
-                write (*,*) "=========================="
-                write (*,*) "DIAGFI: creating variable ",trim(nom)
+                write (*,*) "==========================="
+                write (*,*) "DIAGPEM: creating variable ",trim(nom)
                 call def_var(nid,nom,titre,unite,1,id,varid,ierr)
 
             else
                 if (ntime==0) then
-                    write(*,*) "DIAGFI Error: failed creating variable ",trim(nom)
+                    write(*,*) "DIAGPEM Error: failed creating variable ",trim(nom)
                     write(*,*) "it seems it already exists!"
                     call abort_physic("writediagpem",trim(nom)//" already exists",1)