Changeset 3389 for trunk/LMDZ.COMMON

Timestamp:

Jun 25, 2024, 10:24:25 AM (5 months ago)

Author:

jbclement

Message:

PEM:
Correction to r3387 for the time limit stopping criterion.
JBC

Location:

trunk/LMDZ.COMMON/libf/evolution

Files:

• changelog.txt (modified) (1 diff)
• pem.F90 (modified) (1 diff)

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

@@ -389 +389 @@
 == 20/06/2024 == JBC
 Correction due to a wrong line introduced with r3387.
+
+== 25/06/2024 == JBC
+Correction to r3387 for the time limit stopping criterion.

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

@@ -997 +997 @@
 !    II_g Checking the stopping criterion
 !------------------------
+
+    write(*,*) "Checking the stopping criteria..."
+    call stopping_crit_h2o_ice(cell_area,h2oice_ini_surf,ini_h2oice_sublim,h2o_ice,stopPEM,ngrid)
+    call stopping_crit_co2(cell_area,co2ice_ini_surf,ini_co2ice_sublim,co2_ice,stopPEM,ngrid,global_avg_press_PCM,global_avg_press_new,nslope)
+    year_iter = year_iter + dt_pem
+    i_myear = i_myear + dt_pem
+    if (year_iter >= year_iter_max) stopPEM = 5
+    if (i_myear >= n_myear) stopPEM = 6
     call system_clock(c2)
     if (real((c2 - c1)/cr) >= timelimit - antetime) stopPEM = 7
-    call stopping_crit_h2o_ice(cell_area,h2oice_ini_surf,ini_h2oice_sublim,h2o_ice,stopPEM,ngrid)
-    call stopping_crit_co2(cell_area,co2ice_ini_surf,ini_co2ice_sublim,co2_ice,stopPEM,ngrid,global_avg_press_PCM,global_avg_press_new,nslope)
-
-    year_iter = year_iter + dt_pem
-    i_myear = i_myear + dt_pem
-
-    write(*,*) "Checking the stopping criteria..."
-    if (year_iter >= year_iter_max) stopPEM = 5
-    if (i_myear >= n_myear) stopPEM = 6
     if (stopPEM > 0) then
         select case (stopPEM)