Changeset 3908

Timestamp:

Sep 2, 2025, 4:07:53 PM (3 months ago)

Author:

emillour

Message:

Generic PCM:
Fix some missing initializations in newstart and add
option "Lmodif=2" when calling tabi from newstart to skip some checks
which only make sense when called during a regular GCM run.
EM

Location:

trunk/LMDZ.GENERIC

Files:

• changelog.txt (modified) (1 diff)
• libf/dynphy_lonlat/phystd/newstart.F (modified) (22 diffs)
• libf/phystd/tabfi_mod.F90 (modified) (5 diffs)

trunk/LMDZ.GENERIC/changelog.txt

@@ -2098 +2098 @@
 == 13/08/2025 == GM
 Remove all "call abort" and "stop" statement in LMDZ.GENERIC and replacing them by call abort_physic().
+
+== 02/09/2025 == EM
+Fix some missing initializations in newstart and add 
+option "Lmodif=2" when calling tabi from newstart to skip some checks
+which only make sense when called during a regular GCM run.

trunk/LMDZ.GENERIC/libf/dynphy_lonlat/phystd/newstart.F

@@ -28 +28 @@
       use datafile_mod, only: datadir, surfdir
       use ioipsl_getin_p_mod, only: getin_p
-      use control_mod, only: day_step, iphysiq, anneeref, planet_type
+      use control_mod, only: day_step, iphysiq, anneeref, planet_type,
+     &                       timestart
       use phyredem, only: physdem0, physdem1
       use iostart, only: nid_start, open_startphy
@@ -42 +43 @@
       USE ener_mod, ONLY: etot0,ptot0,ztot0,stot0,ang0
       use tabfi_mod, only: tabfi
+      use time_phylmdz_mod, only: init_time
       use dimphy, only: init_dimphy
       use iniphysiq_mod, only: iniphysiq
@@ -149 +151 @@
 !      REAL dteta(ip1jmp1,llm)
 
-c Variable de l'ancienne grille 
-c------------------------------
       real time
       real tab_cntrl(100)
       real tab_cntrl_bis(100)
 
-c variables diverses
+c other variables
 c-------------------
-      real choix_1,pp
+      integer :: infile_type
+      integer,parameter :: start_archive_file = 0
+      integer,parameter :: start_startfi_files = 1
+      real pp
       character*80      fichnom
       character*250  filestring
@@ -243 +246 @@
 
       DO
-         read(*,*,iostat=ierr) choix_1
-         if ((choix_1 /= 0).OR.(choix_1 /=1)) EXIT
+         read(*,*,iostat=ierr) infile_type
+         if ((infile_type /= start_archive_file).OR.
+     &       (infile_type /= start_startfi_files)) EXIT
       ENDDO
 
 c     Open start_archive
 c     ~~~~~~~~~~~~~~~~~~~~~~~~~~
-      if (choix_1.eq.0) then
+      if (infile_type.eq.start_archive_file) then
 
         write(*,*) 'Creating start files from:'
@@ -296 +300 @@
 
 c=======================================================================
-c  INITIALISATIONS DIVERSES
+c  VARIOUS INITIALIZATIONS
 c=======================================================================
 
@@ -313 +317 @@
 c Lecture du tableau des parametres du run (pour la dynamique)
 c-----------------------------------------------------------------------
-      if (choix_1.eq.0) then
+      if (infile_type.eq.start_archive_file) then
 
         write(*,*) 'reading tab_cntrl START_ARCHIVE'
@@ -324 +328 @@
 #endif
 c
-      else if (choix_1.eq.1) then
+      else if (infile_type.eq.start_startfi_files) then
 
         write(*,*) 'reading tab_cntrl START'
@@ -354 +358 @@
         write(*,*) 'Reading file START'
         fichnom = 'start.nc'
+        ! initialization required for dynetat0:
+        timestart=-9999 ! default value; if <0, use last stored time
         CALL dynetat0(fichnom,vcov,ucov,teta,q,masse,
      .       ps,phis,time)
@@ -430 +436 @@
         read(*,*) pa
       endif
-c-----------------------------------------------------------------------
-c   Lecture du tab_cntrl et initialisation des constantes physiques
-c  - pour start:  Lmodif = 0 => pas de modifications possibles
-c                  (modif dans le tabfi de readfi + loin)
-c  - pour start_archive:  Lmodif = 1 => modifications possibles
-c-----------------------------------------------------------------------
-      if (choix_1.eq.0) then
+!-----------------------------------------------------------------------
+!   Load tab_cntrl array and initialize physics constants
+!  - with Lmodif == 0 => values cannot be modified
+!  - with Lmodif == 1 => values can be modified
+!  - with Lmodif == 2 => values can be modified ; remove some extra 
+!                        checks/tests done in tabfi not valid when 
+!-----------------------------------------------------------------------
+      if (infile_type.eq.start_archive_file) then
          ! tabfi requires that input file be first opened by open_startphy(fichnom)
          fichnom = 'start_archive.nc'
          call open_startphy(fichnom,nid_start)
+         ! let tabfi know it is called from newstart
+         Lmodif=2
          call tabfi (ngridmx,nid,Lmodif,tab0,day_ini,lllm,p_rad,
      .            p_omeg,p_g,p_cpp,p_mugaz,p_daysec,time)
-      else if (choix_1.eq.1) then
+      else if (infile_type.eq.start_startfi_files) then
          fichnom = 'startfi.nc'
          call open_startphy(fichnom,nid_start)
@@ -482 +491 @@
 
 ! Initialize the physics for start_archive only
-      IF (choix_1.eq.0) THEN
+      IF (infile_type.eq.start_archive_file) THEN
          CALL iniphysiq(iim,jjm,llm,
      &                  (jjm-1)*iim+2,comm_lmdz,
@@ -495 +504 @@
 c=======================================================================
 
-      if (choix_1.eq.0) then  ! for start_archive files, 
+      if (infile_type.eq.start_archive_file) then  ! for start_archive files, 
                               ! where an external "surface.nc" file is needed
 
@@ -565 +574 @@
         CALL gr_dyn_fi(1,iip1,jjp1,ngridmx,ztheS,zthe)
 
-      endif ! of if (choix_1.eq.0)
+      endif ! of if (infile_type.eq.start_archive_file)
 
 
@@ -572 +581 @@
 c=======================================================================
 
-      if (choix_1.eq.0) then
+      if (infile_type.eq.start_archive_file) then
 
         write(*,*) 'Reading file START_ARCHIVE'
@@ -587 +596 @@
         ierr= NF_CLOSE(nid)
 
-      else if (choix_1.eq.1) then 
+      else if (infile_type.eq.start_startfi_files) then 
          !do nothing, start and startfi have already been read
       else 
@@ -1584 +1593 @@
 
 
-      if ((choix_1.eq.0).and.(.not.flagps0)) then
+      if ((infile_type.eq.start_archive_file).and.(.not.flagps0)) then
         r = 1000.*8.31/mugaz
 
@@ -1595 +1604 @@
         end do
 
-c periodicite de ps en longitude
+c  ps periodicity in longitude
         do j=1,jjp1
           ps(1,j) = ps(iip1,j)
@@ -1606 +1615 @@
 
 c=======================================================================
-c    Initialisation de la physique / ecriture de newstartfi :
+c    Initialize / write the new start files :
 c=======================================================================
 
@@ -1618 +1627 @@
 
       CALL exner_hyb(ip1jmp1, ps, p3d, pks, pk, pkf)
-! Calcul de la temperature potentielle teta
+! Compute potential temperature teta
 
       if (flagtset) then
@@ -1629 +1638 @@
              ENDDO
           ENDDO
-      else if (choix_1.eq.0) then
+      else if (infile_type.eq.start_archive_file) then
          DO l=1,llm
             DO j=1,jjp1
@@ -1642 +1651 @@
 C Calcul intermediaire
 c
-      if (choix_1.eq.0) then
+      if (infile_type.eq.start_archive_file) then
          CALL massdair( p3d, masse  )
 c
@@ -1663 +1672 @@
 
       itau=0
-      if (choix_1.eq.0) then
+      if (infile_type.eq.start_archive_file) then
          day_ini=int(date)
       endif
@@ -1676 +1685 @@
       CALL dynredem1("restart.nc",0.0,vcov,ucov,teta,q,masse,ps) 
 C
-C Ecriture etat initial physique
+C Write physics initial state
 C
 

trunk/LMDZ.GENERIC/libf/phystd/tabfi_mod.F90

@@ -76 +76 @@
 ! Arguments
 ! ---------
-      INTEGER,INTENT(IN) :: ngrid,nid,tab0
+      INTEGER,INTENT(IN) :: ngrid
+      INTEGER,INTENT(IN) :: nid ! 0: no file to read controle array from
+                                ! /= 0 : read controle array from file
+      INTEGER,INTENT(IN) :: tab0
       INTEGER*4,INTENT(OUT) :: day_ini
-      INTEGER,INTENT(IN) :: Lmodif
+      INTEGER,INTENT(IN) :: Lmodif ! 0: do not modifications
+                                   ! 1: enable modifications
+                                   ! 2: enable modifications but no sanity test
+                                   !    (needed when called from newstart)
       INTEGER,INTENT(OUT) :: lmax
       REAL,INTENT(OUT) :: p_rad,p_omeg,p_g,p_cpp,p_mugaz,p_daysec,time
@@ -208 +214 @@
       volcapa = tab_cntrl(tab0+35) ! volumetric heat capacity
 ! warn user if there has been a change in daysec or dtphys
-      if (daysec.ne.cntrl_daysec) then
+      if (Lmodif < 2) then
+       ! this is meaningful if called in PCM, but not when called from newstart
+       if (daysec.ne.cntrl_daysec) then
         write(*,*) modname//" Warning: lenght of day daysec changed from ", &
                    cntrl_daysec," to ",daysec
-      endif
-      if (dtphys.ne.cntrl_dtphys) then
+       endif
+       if (dtphys.ne.cntrl_dtphys) then
         write(*,*) modname//" Warning: time step dtphys changed from ", &
                    cntrl_dtphys," to ",dtphys
-      endif
+       endif
+      else
+        ! set dtphys and daysec to those from controle
+        daysec=cntrl_daysec
+        dtphys=cntrl_dtphys
+      endif ! of if (Lmodif < 2)
+
 !-----------------------------------------------------------------------
 !       Save some constants for later use (as routine arguments)
@@ -273 +287 @@
 !        Modifications...
 ! NB: Modifying controls should only be done by newstart, and in seq mode
-      if ((Lmodif.eq.1).and.is_parallel) then
+      if ((Lmodif >= 1).and.is_parallel) then
         write(*,*) "tabfi: Error modifying tab_control should", &
                    " only happen in serial mode (eg: by newstart)"
@@ -280 +294 @@
 !-----------------------------------------------------------------------
 
-      IF(Lmodif.eq.1) then
+      IF(Lmodif >= 1) then
 
       write(*,*)
@@ -557 +571 @@
       write(*,*) 
 
-      ENDIF ! of if (Lmodif == 1)
+      ENDIF ! of if (Lmodif >= 1)
 
 !-----------------------------------------------------------------------