Changeset 5682 for LMDZ6/trunk

Timestamp:

May 26, 2025, 4:07:59 PM (12 days ago)

Author:

fhourdin

Message:

Reintroduction bug dans la convection (JYG&FH)

Sous flag

Location:

LMDZ6/trunk/libf/phylmd

Files:

• cv3_routines.f90 (modified) (5 diffs)
• lmdz_cv_ini.f90 (modified) (2 diffs)

LMDZ6/trunk/libf/phylmd/cv3_routines.f90

@@ -12 +12 @@
   USE conema3_mod_h
   USE lmdz_cv_ini, ONLY : alpha,alpha1,beta,betad,coef_peel,cv_flag_feed,delta,dpbase,dtcrit,dtovsh,dttrig,ejectice,ejectliq,elcrit,flag_epkeorig,flag_wb,minorig,nl,nlm,nlp,noconv_stop,noff,omtrain,pbcrit,ptcrit,sigdz,spfac,t_top_max,tau,tau_stop,tlcrit,wbmax
-  USE lmdz_cv_ini, ONLY : keep_bug_indices_cv3_tracer
+  USE lmdz_cv_ini, ONLY : keep_bug_indices_cv3_tracer,restore_bug_cvdn
 
 
@@ -142 +142 @@
      keep_bug_indices_cv3_tracer = .FALSE.
      CALL getin_p('keep_bug_indices_cv3_tracer', keep_bug_indices_cv3_tracer)
+     restore_bug_cvdn=.false.
+     CALL getin_p('restore_bug_cvdn',restore_bug_cvdn)
 
 
@@ -169 +171 @@
     WRITE (*, *) 'keepbug_ice_frac =', keepbug_ice_frac 
     WRITE (*, *) 'keep_bug_indices_cv3_tracer =', keep_bug_indices_cv3_tracer 
+    WRITE (*, *) 'restore_bug_cvdn=',restore_bug_cvdn
 
     first = .FALSE.
@@ -3457 +3460 @@
     USE cvflag_mod_h
    USE lmdz_cv_ini, ONLY : grav,minorig,nl,nlp,rowl,rrd,nl,ci,cl,cpd,cpv
+   USE lmdz_cv_ini, ONLY : restore_bug_cvdn
+
   IMPLICIT NONE
 
@@ -4032 +4037 @@
            IF (ok_optim_yield) THEN                       !|
 !-----------------------------------------------------------
+
+    ! Restoring a bug that was found and corrected in svn release
+    ! 5544; which appears to have a much stronger impact than initially
+    ! thought
+
+    if ( restore_bug_cvdn ) then
+      print*,'DOWND BUG'
+      DO il = 1, ncum
+         amp1(il) = upwd(il,i+1)
+         ad(il) = dnwd(il,i)
+      ENDDO
+    else
+      print*,'DOWND NO BUG'
       DO il = 1, ncum
          amp1(il) = upwd(il,i+1)
          ad(il) = - dnwd(il,i)
       ENDDO
+    endif
 !-----------------------------------------------------------
         ELSE !(ok_optim_yield)                            !|

LMDZ6/trunk/libf/phylmd/lmdz_cv_ini.f90

@@ -14 +14 @@
           nl, nlp, nlm
   PUBLIC cpd, cpv, cl, ci, rrv, rrd, lv0, lf0, g, rowl, t0, clmcpv, clmcpd, cpdmcp, cpvmcpd, cpvmcl,  &
-          clmci, eps, epsi, epsim1, ginv, hrd, grav, keep_bug_indices_cv3_tracer
+          clmci, eps, epsi, epsim1, ginv, hrd, grav, keep_bug_indices_cv3_tracer, restore_bug_cvdn
+
 
 
@@ -69 +70 @@
   !$OMP          , dtmax, cu, damp)
 
-LOGICAL keep_bug_indices_cv3_tracer
- !$OMP THREADPRIVATE( keep_bug_indices_cv3_tracer)
+LOGICAL keep_bug_indices_cv3_tracer,restore_bug_cvdn
+ !$OMP THREADPRIVATE( keep_bug_indices_cv3_tracer,restore_bug_cvdn)
 
 END MODULE lmdz_cv_ini