Changeset 2313

Timestamp:

May 7, 2020, 9:58:54 PM (5 years ago)

Author:

abierjon

Message:

Mars GCM:
Following r2303 and r2308 and truly truly resolving Ticket #46 on concatnc:
Improved ergonomics of the user interface, with no more request to the user
in the midst of computations

AB

Location:

trunk/LMDZ.MARS

Files:

• README (modified) (1 diff)
• util/concatnc.F90 (modified) (5 diffs)
• util/concatnc.def (modified) (2 diffs)

trunk/LMDZ.MARS/README

@@ -3009 +3009 @@
 For now, only functional with simplified cloud scheme (so microphys=.false. and activice=.false. also recommended).
 Initialisation of start files can be done with option 'inihdo' in newstart.
+
+== 07/05/2020 == AB
+Following r2303 and r2308 and truly truly resolving Ticket #46 on concatnc:
+Improved ergonomics of the user interface, with no more request to the user
+in the midst of computations

trunk/LMDZ.MARS/util/concatnc.F90

@@ -157 +157 @@
 write(*,*) "Starting day to be stored in the output file time axis?"
 write(*,*) "(e.g.: 100 if you want the output file to start at time=100 sols)"
-read(*,*) starttimeoffset
+write(*,*) "Your answer will bypass any starting day value stored in the 1st"
+write(*,*) "input file. Conversely, just type return if you want this 1st file's"
+write(*,*) "value to be kept for the output file starting day."
+read(*,*,iostat=ierr) starttimeoffset
+if (ierr.ne.0) then
+   ! if nothing or a character that is not a float is read
+   write(*,*) "1st input file's starting day will serve as starting day for the outfile."
+   firstsol='n'
+else ! if the user gave a number
+   write(*,*) "Your input day will serve as starting day for the outfile."
+   firstsol='y'
+endif
 
 !==============================================================================
@@ -287 +298 @@
 endif ! of if (tmpvar=="all")
 
-! Name of the new file
-!==========================================================
-!filename=var(1)
-!do i=2, nbvar
-!   filename=trim(adjustl(filename))//"_"//var(i)
-!enddo
-!filename=trim(adjustl(filename))//".nc"
 
 !==============================================================================
@@ -450 +454 @@
       ierr = NF_GET_VAR_REAL(nid,altvar,alt)
 #endif
-      firstsol = 'n' ! defaut value
       write(*,*)
       if (ctllen .ne. 0) then
          if (int(starttimeoffset) .ne. (int(ctlsol)+int(time(1))) ) then
            write(*,*) "WARNING: Starting day of the first file is not ",&
-                                int(starttimeoffset)," but ",int(ctlsol)+int(time(1)),"!"
-           write(*,*) "Answer:"
-           write(*,*) " y to use the starting day you have inputted"
-           write(*,*) " n to keep the starting day of the first file"
-           write(*,*) "as the starting day of the output file"
-           read(*,*) firstsol
+                       int(starttimeoffset)," but ",int(ctlsol)+int(time(1)),"!"
          endif
-         
+        
          if (firstsol.eq.'y') then
-           write(*,*) "The day given by the user is used as the starting day of the ouput file"
            starttimeoffset = float(int(ctlsol)+int(time(1))) + ctl(27) - starttimeoffset
-         else ! if firstsol.eq.'n' or other (default case, for retrocompatibility with previous concatnc.def)
-           write(*,*) "The starting day of the 1st file is used as the starting day of the ouput file"
+         else ! if firstsol.eq.'n'
            starttimeoffset = 0
          endif
-         
+
          memotime=float(int(ctlsol)+int(time(1))) + ctl(27)
          ctl(4) = 0.  ! values written in the output
@@ -478 +474 @@
          if (int(starttimeoffset) .ne. (int(time(1))) ) then
            write(*,*) "WARNING: Starting day of the first file is not ",&
-                                int(starttimeoffset)," but ",int(time(1)),"!"
-           write(*,*) "Answer:"
-           write(*,*) " y to use the starting day you have inputted"
-           write(*,*) " n to keep the starting day of the first file"
-           write(*,*) "as the starting day of the output file"
-           read(*,*) firstsol
+                       int(starttimeoffset)," but ",int(time(1)),"!"
          endif
-         
+
          if (firstsol.eq.'y') then
-           write(*,*) "The day given by the user is used as the starting day of the ouput file"
            starttimeoffset = int(time(1)) - starttimeoffset
-         else ! if firstsol.eq.'n' or other (default case, for retrocompatibility with previous concatnc.def)
-           write(*,*) "The starting day of the 1st file is used as the starting day of the ouput file"
+         else ! if firstsol.eq.'n'
            starttimeoffset = 0
          endif
@@ -499 +488 @@
    ! Initialize output file's lat,lon,alt and time dimensions
       write(*,*)
-      call initiate (filename,lat,lon,alt,ctl,GCM_layers,nout,&
+      call initiate(filename,lat,lon,alt,ctl,GCM_layers,nout,&
        latdimout,londimout,altdimout,timedimout,&
        layerdimout,interlayerdimout,timevarout,axis)

trunk/LMDZ.MARS/util/concatnc.def

@@ -8 +8 @@
 ps
 
-n
 
 -----------------------------------------------------------------------
@@ -16 +15 @@
 1) List of N files to be read  (N lines)
 2) blank line at the end
-3) Starting sol of the run stored in the first input file?
+3) Starting sol of the output file?
+(or a blank if you want to use the first file's
+ starting sol = time(1)+controle(4) )
 4) Output timescale ("sol" or "ls")
 5) List of X variables to be kept (X lines) or 'all'
 6) blank line at the end
-7) Use:
-  - the sol given in 3) (answer "y")
-  - or the starting sol of the first input file (answer "n") (default)
-  as the starting sol of the output file ?
 
 The use is :