Changeset 3278 for trunk/LMDZ.GENERIC

Timestamp:

Mar 20, 2024, 4:29:23 PM (8 months ago)

Author:

jleconte

Message:

Correction on moistadj_generic tendencies (Noe C)

File:

• trunk/LMDZ.GENERIC/libf/phystd/physiq_mod.F90 (modified) (3 diffs)

trunk/LMDZ.GENERIC/libf/phystd/physiq_mod.F90

@@ -1690 +1690 @@
                pdq(1:ngrid,1:nlayer,1:nq) = pdq(1:ngrid,1:nlayer,1:nq)     &
                                                   + dqmoist(1:ngrid,1:nlayer,1:nq)
-               pdq(1:ngrid,1:nlayer,1:nq) = pdq(1:ngrid,1:nlayer,1:nq)     &
-                                                  + dqmoist(1:ngrid,1:nlayer,1:nq)
                pdt(1:ngrid,1:nlayer) = pdt(1:ngrid,1:nlayer)+dtmoist(1:ngrid,1:nlayer)
 
@@ -1706 +1704 @@
                   
                   if (is_master) then
-                     print*,'In moistadj atmospheric energy change   =',dEtot,' W m-2'
-                     print*,'In moistadj MAX atmospheric energy change   =',dtmoist_max*ptimestep,'K/step'
-                     print*,'In moistadj MIN atmospheric energy change   =',dtmoist_min*ptimestep,'K/step'
+                     print*,'In moistadj_generic atmospheric energy change   =',dEtot,' W m-2'
+                     print*,'In moistadj_generic MAX atmospheric energy change   =',dtmoist_max*ptimestep,'K/step'
+                     print*,'In moistadj_generic MIN atmospheric energy change   =',dtmoist_min*ptimestep,'K/step'
                   endif
 
                   ! igcm_generic_vap & igcm_generic_ice are not declared below
-                  ! call planetwide_sumval(massarea(:,:)*dqmoist(:,:,igcm_generic_vap)*ptimestep/totarea_planet+        &
-                  !                        massarea(:,:)*dqmoist(:,:,igcm_generic_ice)*ptimestep/totarea_planet,dWtot)
-                  ! if (is_master) print*,'In moistadj atmospheric water change    =',dWtot,' kg m-2'
+                  call planetwide_sumval(massarea(:,:)*dqmoist(:,:,1)*ptimestep/totarea_planet+        &
+                                         massarea(:,:)*dqmoist(:,:,2)*ptimestep/totarea_planet,dWtot)
+                  if (is_master) print*,'In moistadj_generic atmospheric GCS change    =',dWtot,' kg m-2'
                
                endif ! end of 'enertest'
@@ -1809 +1807 @@
                      call planetwide_sumval(cell_area(:)*zdqssnow_generic(:,igcm_generic_ice)/totarea_planet*RLVTT/cpp,dItot)
                      dItot = dItot + dItot_tmp
-                     call planetwide_sumval(massarea(:,:)*dq_rain_generic_vap(:,:,igcm_generic_vap)*ptimestep/totarea_planet,dVtot_tmp)
+                     call planetwide_sumval(massarea(:,:)*dq_rain_generic_vap(:,:,igcm_generic_vap)/totarea_planet*RLVTT/cpp,dVtot_tmp)
                      call planetwide_sumval(cell_area(:)*zdqsrain_generic(:,igcm_generic_ice)/totarea_planet*RLVTT/cpp,dVtot)
                      dVtot = dVtot + dVtot_tmp