Changeset 3599 for trunk/LMDZ.COMMON

Timestamp:

Jan 23, 2025, 4:28:27 PM (12 hours ago)

Author:

jbclement

Message:

PEM:
Few small optimizations.
JBC

Location:

trunk/LMDZ.COMMON/libf/evolution

Files:

• changelog.txt (modified) (1 diff)
• pem.F90 (modified) (5 diffs)
• read_data_PCM_mod.F90 (modified) (2 diffs)

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

@@ -554 +554 @@
 == 23/01/2025 == JBC
 Correction of typos and minor bugs.
+
+== 23/01/2025 == JBC
+Few small optimizations

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

@@ -285 +285 @@
 ! Loop variables
 integer :: i, l, ig, nnq, t, islope, ig_loop, islope_loop, isoil, icap
+logical :: num_str
 
 ! Elapsed time with system clock
@@ -291 +292 @@
 timewall = .true.
 timelimit = 86400 ! 86400 seconds = 24 h by default
-timewall = .false.
 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 ! This is the job id
+    num_str = .true.
+    do i = 1,len_trim(arg)
+        if (arg(i:i) < '0' .or. arg(i:i) > '9') then
+            num_str = .false.
+            exit
+        endif
+    enddo
+    
+    if (num_str) then ! This is a numeric sting so we considerer this is the job id
            ! Execute the system command
             call execute_command_line('squeue -j '//trim(adjustl(arg))//' -h --Format TimeLimit > tmp_cmdout.txt',cmdstat = cstat)
@@ -330 +334 @@
                 timelimit = minutes*60 + seconds
             endif
-    end select
+    else ! Arg is not a numeric string
+        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
+else
+    timewall = .false.
 endif
 
@@ -528 +542 @@
 allocate(min_co2_ice(ngrid,nslope,2),min_h2o_ice(ngrid,nslope,2))
 allocate(tsurf_avg_yr1(ngrid,nslope),tsurf_avg(ngrid,nslope))
-allocate(tsoil_avg(ngrid,nsoilmx,nslope),tsoil_timeseries(ngrid,nsoilmx,nslope,timelen),tsoil_PEM_timeseries(ngrid,nsoilmx_PEM,nslope,timelen))
+allocate(tsoil_avg(ngrid,nsoilmx,nslope),tsoil_timeseries(ngrid,nsoilmx,nslope,timelen))
 allocate(watersurf_density_avg(ngrid,nslope),watersoil_density_timeseries(ngrid,nsoilmx,nslope,timelen))
 
@@ -551 +565 @@
 call ini_ice_table(ngrid,nslope,nsoilmx_PEM)
 
-allocate(watersoil_density_PEM_avg(ngrid,nsoilmx_PEM,nslope),watersoil_density_PEM_timeseries(ngrid,nsoilmx_PEM,nslope,timelen))
+allocate(tsoil_PEM_timeseries(ngrid,nsoilmx_PEM,nslope,timelen),watersoil_density_PEM_avg(ngrid,nsoilmx_PEM,nslope),watersoil_density_PEM_timeseries(ngrid,nsoilmx_PEM,nslope,timelen))
 if (soil_pem) then
     call soil_settings_PEM(ngrid,nslope,nsoilmx_PEM,nsoilmx,inertiesoil,TI_PEM)

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

@@ -102 +102 @@
         write(num,'(i2.2)') islope
         call get_var3("co2ice_slope"//num,co2_ice_slope_dyn(:,:,islope,:))
-    enddo
-    write(*,*) "Data for co2_ice downloaded."
-
-    do islope = 1,nslope
-        write(num,'(i2.2)') islope
+        write(*,*) "Data for co2_ice_slope"//num//" downloaded."
         call get_var3("h2o_ice_s_slope"//num,h2o_ice_s_dyn(:,:,islope,:))
-    enddo
-    write(*,*) "Data for h2o_ice_s downloaded."
-
-    do islope = 1,nslope
-        write(num,'(i2.2)') islope
+        write(*,*) "Data for h2o_ice_s_slope"//num//" downloaded."
         call get_var3("tsurf_slope"//num,tsurf_dyn(:,:,islope,:))
-    enddo
-    write(*,*) "Data for tsurf downloaded."
-
+        write(*,*) "Data for tsurf_slope"//num//" downloaded."
 #ifndef CPP_STD
-    do islope = 1,nslope
-        write(num,'(i2.2)') islope
         call get_var3("watercap_slope"//num,watercap(:,:,islope,:))
-    enddo
-    write(*,*) "Data for watercap downloaded."
-
-    do islope = 1,nslope
-        write(num,'(i2.2)') islope
+        write(*,*) "Data for watercap_slope"//num//" downloaded."
         call get_var3("perennial_co2ice_slope"//num,perennial_co2ice(:,:,islope,:))
-    enddo
-    write(*,*) "Data for perennial_co2ice downloaded."
-#endif
+        write(*,*) "Data for perennial_co2ice_slope"//num//" downloaded."
+#endif
+    enddo
 endif
 
@@ -209 +193 @@
         write(num,'(i2.2)') islope
         call get_var3("co2ice_slope"//num,co2_ice_slope_dyn(:,:,islope,:))
-    enddo
-    write(*,*) "Data for co2_ice downloaded."
-
-    do islope = 1,nslope
-        write(num,'(i2.2)') islope
+        write(*,*) "Data for co2_ice_slope"//num//" downloaded."
         call get_var3("h2o_ice_s_slope"//num,h2o_ice_s_dyn(:,:,islope,:))
-    enddo
-    write(*,*) "Data for h2o_ice_s downloaded."
-
-    do islope = 1,nslope
-        write(num,'(i2.2)') islope
+        write(*,*) "Data for h2o_ice_s_slope"//num//" downloaded."
         call get_var3("tsurf_slope"//num,tsurf_dyn(:,:,islope,:))
-    enddo
-    write(*,*) "Data for tsurf downloaded."
-
+        write(*,*) "Data for tsurf_slope"//num//" downloaded."
 #ifndef CPP_STD
-    do islope = 1,nslope
-        write(num,'(i2.2)') islope
         call get_var3("watercap_slope"//num,watercap(:,:,islope,:))
-    enddo
-    write(*,*) "Data for watercap downloaded."
-
-    do islope = 1,nslope
-        write(num,'(i2.2)') islope
+        write(*,*) "Data for watercap_slope"//num//" downloaded."
         call get_var3("perennial_co2ice_slope"//num,perennial_co2ice(:,:,islope,:))
-    enddo
-    write(*,*) "Data for perennial_co2ice downloaded."
-
-    if (soil_pem) then
-        do islope = 1,nslope
-            write(num,'(i2.2)') islope
+        write(*,*) "Data for perennial_co2ice_slope"//num//" downloaded."
+        if (soil_pem) then
             call get_var4("soiltemp_slope"//num,tsoil_dyn(:,:,:,islope,:))
-        enddo
-        write(*,*) "Data for soiltemp downloaded."
-
-        do islope = 1,nslope
-            write(num,'(i2.2)') islope
+            write(*,*) "Data for soiltemp_slope"//num//" downloaded."
             call get_var4("waterdensity_soil_slope"//num,watersoil_density_dyn(:,:,:,islope,:))
-        enddo
-        write(*,*) "Data for waterdensity_soil downloaded."
-
-        do islope = 1,nslope
-            write(num,'(i2.2)') islope
+            write(*,*) "Data for waterdensity_soil_slope"//num//" downloaded."
             call get_var3("waterdensity_surface"//num,watersurf_density_dyn(:,:,islope,:))
-        enddo
-        write(*,*) "Data for waterdensity_surface downloaded."
-    endif !soil_pem
-#endif
+            write(*,*) "Data for waterdensity_surface_slope"//num//" downloaded."
+        endif
+#endif
+    enddo
 endif