Changeset 3836 for trunk/LMDZ.MARS/libf

Timestamp:

Jul 7, 2025, 2:46:43 PM (8 days ago)

Author:

jbclement

Message:

COMMON:
Rework related to the command-line parsing:

• Replace ad-hoc argument parsing with a unified 'parse_args' subroutine, allowing easier extension to other programs and options across models;;
• Use of '--version' (with ab optional output file) to print compilation/version details;
• Addition of 'job_timelimit_mod' module to handle SLURM/PBS job time-limit via '--jobid' (currently only used in the PEM), allowing easier extension to other programs;
• Replace manual SSO handling with 'parse_args' for the Mars start2archive;
• Clean-up related legacy code in the programs supporting the version option.

JBC

Location:

trunk/LMDZ.MARS/libf

Files:

• dynphy_lonlat/phymars/newstart.F (modified) (2 diffs)
• dynphy_lonlat/phymars/start2archive.F (modified) (3 diffs)
• phymars/dyn1d/testphys1d.F90 (modified) (3 diffs)

trunk/LMDZ.MARS/libf/dynphy_lonlat/phymars/newstart.F

@@ -61 +61 @@
      &             ini_paleoclimate_h, end_paleoclimate_h
       use subslope_mola_mod, ONLY: subslope_mola
-      use version_info_mod, only: print_version_info
+      use parse_args_mod, only: parse_args
       
       implicit none
@@ -213 +213 @@
 
 
-      if (command_argument_count() > 0) then ! Get the number of command-line arguments
-          call get_command_argument(1,txt) ! Read the argument given to the program
-          select case (trim(adjustl(txt)))
-              case('version')
-                  call print_version_info()
-                  stop
-              case default
-                  error stop 'The argument given to the program is '
-     &//'unknown!'
-          end select
-      endif
+      ! Parse command-line options
+      call parse_args()
 
 c sortie visu pour les champs dynamiques

trunk/LMDZ.MARS/libf/dynphy_lonlat/phymars/start2archive.F

@@ -41 +41 @@
       USE surfdat_h, ONLY: phisfi, albedodat, z0, z0_default,
      &    zmea, zstd, zsig, zgam, zthe, hmons, summit, base
-      use version_info_mod, only: print_version_info
+      use parse_args_mod, only: parse_args, add_sso_fields
 
       implicit none
@@ -117 +117 @@
       REAL baseS(ip1jmp1)
 
-      logical :: add_sso_fields=.false. ! default, don't include SSO fields
-
 
 c Variables intermediaires : vent naturel, mais pas coord scalaire
@@ -149 +147 @@
       INTEGER nid,nid1
 
-C get command line arguments
-C here we assume and check that if there is an argument #1 then
-C it should be --add-sso to signal adding SSO fileds to start_archive.nc
-      CALL get_command_argument(1,txt,j,ierr)
-      ! will return ierr==0 if there is an argument #1 to command line
-      IF (ierr==0) THEN
-        ! Check that argument is indeed "--add-sso" or signal the error
-        IF (trim(txt)=="--add-sso") THEN
-          add_sso_fields=.true.
-          write(*,*) "SSO fields will be included in start_archive"
-        ELSE IF (trim(txt) == 'version') then
-            call print_version_info()
-            stop
-        ELSE
-          write(*,*) "start2archive error: unexpected command line "//
-     &    "argument: ",trim(txt)
-          write(*,*) " (only --add-sso currently accepted)"
-          write(*,*) "Might as well stop here."
-          stop
-        ENDIF
-      ENDIF ! of IF (ierr==0)
+      ! Parse command-line options
+      ! Option "--add-sso" adds SSO fields to "start_archive.nc"
+      call parse_args()
 
 c-----------------------------------------------------------------------

trunk/LMDZ.MARS/libf/phymars/dyn1d/testphys1d.F90

@@ -18 +18 @@
 use init_testphys1d_mod, only: init_testphys1d
 use writerestart1D_mod,  only: writerestart1D
-! Mostly for XIOS outputs:
+use parse_args_mod,      only: parse_args
+use callkeys_mod,        only: water
+! Mostly for XIOS outputs
 use mod_const_mpi,       only: init_const_mpi
 use parallel_lmdz,       only: init_parallel
-use version_info_mod,    only: print_version_info
-use callkeys_mod, only: water
 
 implicit none
@@ -68 +68 @@
 real, dimension(:,:,:), allocatable :: q             ! tracer mixing ratio (e.g. kg/kg)
 real, dimension(1)                  :: wstar = 0.    ! Thermals vertical velocity
-character(100)                      :: arg           ! To read command-line arguments
 
 ! Physical and dynamical tendencies (e.g. m.s-2, K/s, Pa/s)
@@ -94 +93 @@
 ! INITIALISATION
 !=======================================================================
-if (command_argument_count() > 0) then ! Get the number of command-line arguments
-    call get_command_argument(1,arg) ! Read the argument given to the program
-    select case (trim(adjustl(arg)))
-        case('version')
-            call print_version_info()
-            stop
-        case default
-            error stop 'The argument given to the program is unknown!'
-    end select
-endif
+! Parse command-line options
+call parse_args()
 
 #ifdef CPP_XIOS