Changeset 4695

Timestamp:

Sep 19, 2023, 3:46:23 PM (8 months ago)

Author:

jyg

Message:

Bug fix in lmdz_wake.F90 and associated flag ok_bug_gfl

Location:

LMDZ6/trunk/libf/phylmd

Files:

• lmdz_wake.F90 (modified) (2 diffs)
• lmdz_wake_ini.F90 (modified) (2 diffs)

LMDZ6/trunk/libf/phylmd/lmdz_wake.F90

@@ -31 +31 @@
   USE lmdz_wake_ini , ONLY : stark, wdens_ref, coefgw, alpk, wk_pupper
   USE lmdz_wake_ini , ONLY : crep_upper, crep_sol, tau_cv, rzero, aa0, flag_wk_check_trgl
+  USE lmdz_wake_ini , ONLY : ok_bug_gfl
   USE lmdz_wake_ini , ONLY : iflag_wk_act, iflag_wk_check_trgl, iflag_wk_pop_dyn, wdensmin
   USE lmdz_wake_ini , ONLY : sigmad, hwmin, wapecut, cstart, sigmaw_max, dens_rate, epsilon_loc
@@ -942 +943 @@
     END DO
 
+    IF (ok_bug_gfl) THEN
+!!--------------------------------------------------------
+!!Bug : computing gfl and rad_wk before changing sigmaw
+!!--------------------------------------------------------
+      DO i = 1, klon
+        IF (wk_adv(i)) THEN
+          gfl(i) = 2.*sqrt(3.14*wdens(i)*sigmaw(i))
+          rad_wk(i) = sqrt(sigmaw(i)/(3.14*wdens(i)))
+        END IF
+      END DO
+    ENDIF   ! (ok_bug_gfl)
+
     DO i = 1, klon
       IF (wk_adv(i)) THEN
-        gfl(i) = 2.*sqrt(3.14*wdens(i)*sigmaw(i))
-        rad_wk(i) = sqrt(sigmaw(i)/(3.14*wdens(i)))
-!jyg<
-!!        sigmaw(i) = amin1(sigmaw(i), sigmaw_max)
         sigmaw_targ = min(sigmaw(i), sigmaw_max)
         d_sig_bnd2(i) = d_sig_bnd2(i) + sigmaw_targ - sigmaw(i)
         d_sigmaw2(i) = d_sigmaw2(i) + sigmaw_targ - sigmaw(i)
-!  print *,'XXXX3 d_sigmaw2(i), sigmaw(i) ', d_sigmaw2(i), sigmaw(i)
         sigmaw(i) = sigmaw_targ
-!>jyg
-      END IF
-    END DO
+      END IF
+    END DO
+
+    IF (.NOT.ok_bug_gfl) THEN
+!!--------------------------------------------------------
+!!Fix : computing gfl and rad_wk after changing sigmaw
+!!--------------------------------------------------------
+      DO i = 1, klon
+        IF (wk_adv(i)) THEN
+          gfl(i) = 2.*sqrt(3.14*wdens(i)*sigmaw(i))
+          rad_wk(i) = sqrt(sigmaw(i)/(3.14*wdens(i)))
+        END IF
+      END DO
+    ENDIF   ! (.NOT.ok_bug_gfl)
 
     IF (iflag_wk_pop_dyn == 1) THEN

LMDZ6/trunk/libf/phylmd/lmdz_wake_ini.F90

@@ -35 +35 @@
   !$OMP THREADPRIVATE(rzero, aa0)
 
+  LOGICAL, SAVE, PROTECTED                                         :: ok_bug_gfl
+  !$OMP THREADPRIVATE(ok_bug_gfl)
   LOGICAL, SAVE, PROTECTED                                         :: flag_wk_check_trgl
   !$OMP THREADPRIVATE(flag_wk_check_trgl)
@@ -135 +137 @@
   crep_sol = 1.0
 
+  ! Flag concerning the bug in gfl computation
+  ok_bug_gfl = .True.
+  call getin_p('ok_bug_gfl', ok_bug_gfl)
+
   ! Get wapecut from parameter file
   wapecut = 1.