Changeset 5622 for LMDZ6/trunk/libf/phylmd/cv3_routines.f90

Timestamp:

Apr 16, 2025, 9:25:21 PM (8 weeks ago)

Author:

evignon

Message:

commission pour la conservation de l'eau dans la convection profonde.
1/ integre les corrections apportees par JYG dans cv3routines.
2/ par defaut, conserve dx*masse quand on appelle la convection tous les n pas de temps
Cette commission conduit à une perte de convergence

File:

• LMDZ6/trunk/libf/phylmd/cv3_routines.f90 (modified) (8 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, keep_bug_q_nocons_cv
+  USE lmdz_cv_ini, ONLY : keep_bug_indices_cv3_tracer
 
 
@@ -142 +142 @@
      keep_bug_indices_cv3_tracer = .FALSE.
      CALL getin_p('keep_bug_indices_cv3_tracer', keep_bug_indices_cv3_tracer)
-     keep_bug_q_nocons_cv = .TRUE.
-     CALL getin_p('keep_bug_q_nocons_cv', keep_bug_q_nocons_cv)
 
 
@@ -171 +169 @@
     WRITE (*, *) 'keepbug_ice_frac =', keepbug_ice_frac 
     WRITE (*, *) 'keep_bug_indices_cv3_tracer =', keep_bug_indices_cv3_tracer 
-    WRITE (*, *) 'keep_bug_q_nocons_cv =', keep_bug_q_nocons_cv
 
     first = .FALSE.
@@ -2707 +2704 @@
                      wdtrainA, wdtrainS, wdtrainM)                                      ! RomP
   USE lmdz_cv_ini, ONLY : cpd,ginv,grav,nl,nlp,sigdz
-  USE lmdz_cv_ini, ONLY : keep_bug_q_nocons_cv
   USE cvflag_mod_h
   USE print_control_mod, ONLY: prt_level, lunout
@@ -2912 +2908 @@
   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-  IF (keep_bug_q_nocons_cv) THEN
-  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-        DO il = 1, ncum
-          IF (i<=inb(il) .AND. lwork(il)) THEN
-            wdtrain(il) = grav*ep(il, i)*m(il, i)*clw(il, i)
-            wdtrainS(il, i) = wdtrain(il)/grav                                            !   Ps   jyg
-          END IF
-        END DO
-    
-        IF (i>1) THEN
-          DO j = 1, i - 1
-            DO il = 1, ncum
-              IF (i<=inb(il) .AND. lwork(il)) THEN
-                awat = elij(il, j, i) - (1.-ep(il,i))*clw(il, i)
-                awat = max(awat, 0.0)
-                wdtrain(il) = wdtrain(il) + grav*awat*ment(il, j, i)
-                wdtrainM(il, i) = wdtrain(il)/grav - wdtrainS(il, i)    !   Pm  jyg
-              END IF
-            END DO
-          END DO
-        END IF
-    
-        IF (cvflag_prec_eject) THEN
-    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-          IF (adiab_ascent_mass_flux_depends_on_ejectliq) THEN
-    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-    !!! Warning : this option leads to water conservation violation
-    !!!           Expert only
-    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-              IF ( i > 1) THEN
-                DO il = 1, ncum
-                  IF (i<=inb(il) .AND. lwork(il)) THEN
-                    wdtrainA(il,i) = ma(il, i+1)*(qta(il, i-1)-qta(il,i))/(1. - qta(il, i-1))    !   Pa   jygprl
-                    wdtrain(il) = wdtrain(il) + grav*wdtrainA(il,i)
-                  END IF
-                END DO
-              ENDIF  ! ( i > 1)
-    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-          ELSE ! (adiab_ascent_mass_flux_depends_on_ejectliq)
-    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-              IF ( i > 1) THEN
-                DO il = 1, ncum
-                  IF (i<=inb(il) .AND. lwork(il)) THEN
-                    wdtrainA(il,i) = ma(il, i+1)*(qta(il, i-1)-qta(il,i))                        !   Pa   jygprl
-                    wdtrain(il) = wdtrain(il) + grav*wdtrainA(il,i)
-                  END IF
-                END DO
-              ENDIF  ! ( i > 1)
-    
-          ENDIF ! (adiab_ascent_mass_flux_depends_on_ejectliq) ELSE
-    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-        ENDIF  ! (cvflag_prec_eject)
-    
-  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-  ELSE ! (keep_bug_q_nocons_cv)
-  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
         DO il = 1, ncum
           IF (i<=inb(il) .AND. lwork(il)) THEN
@@ -3023 +2963 @@
         ENDIF  ! ( i > 1)
     
-  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-  ENDIF ! (keep_bug_q_nocons_cv)
   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
   !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -3519 +3457 @@
     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 : keep_bug_q_nocons_cv
   IMPLICIT NONE
 
@@ -4095 +4032 @@
            IF (ok_optim_yield) THEN                       !|
 !-----------------------------------------------------------
-    IF (keep_bug_q_nocons_cv) THEN    !!jyg20250215
-      DO il = 1, ncum
-         amp1(il) = upwd(il,i+1)
-         ad(il) = dnwd(il,i)
-      ENDDO
-    ELSE  ! (keep_bug_q_nocons_cv)
       DO il = 1, ncum
          amp1(il) = upwd(il,i+1)
          ad(il) = - dnwd(il,i)
       ENDDO
-    ENDIF  ! (keep_bug_q_nocons_cv)
 !-----------------------------------------------------------
         ELSE !(ok_optim_yield)                            !|