Changeset 2446 for trunk

Timestamp:

Jan 19, 2021, 9:52:48 AM (4 years ago)

Author:

emillour

Message:

Generic model:
Minor fixes:

• callcorrk: OLR_nu(:,:) and OSR_nu(:,:) should be initialized every call,

not just at the first call

• physiq: only compute dtaui and dtauv using CLFvarying contributions

if they are provided (i.e. if flag diagdtau is .true.)

EM

Location:

trunk/LMDZ.GENERIC

Files:

• README (modified) (1 diff)
• libf/phystd/callcorrk.F90 (modified) (2 diffs)
• libf/phystd/physiq_mod.F90 (modified) (2 diffs)

trunk/LMDZ.GENERIC/README

@@ -1611 +1611 @@
 Use "#ModernTrac-v1" flag as first line of "traceur.def" to use this option
 Further details in "LMDZ.GENERIC/deftank/traceur.def.modern"
+
+== 19/01/2021 == EM
+Minor fixes:
+- callcorrk: OLR_nu(:,:) and OSR_nu(:,:) should be initialized every call,
+             not just at the first call
+- physiq: only compute dtaui and dtauv using CLFvarying contributions
+          if they are provided (i.e. if flag diagdtau is .true.)

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

@@ -273 +273 @@
          endif
 
-         OLR_nu(:,:) = 0.
-         OSR_nu(:,:) = 0.
-
          if (ngrid.eq.1) then
             PRINT*, 'Simulate global averaged conditions ?'
@@ -310 +307 @@
       qsiaer(:,:,:)=0.0
       giaer(:,:,:) =0.0
+
+      OLR_nu(:,:) = 0.
+      OSR_nu(:,:) = 0.
 
 !--------------------------------------------------

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

@@ -47 +47 @@
       use comcstfi_mod, only: pi, g, rcp, r, rad, mugaz, cpp
       use time_phylmdz_mod, only: daysec
-      use callkeys_mod
+      use callkeys_mod, only: albedo_spectral_mode, calladj, calldifv, &
+                              calllott_nonoro, callrad, callsoil, callstats, &
+                              calltherm, CLFvarying, co2cond, corrk, diagdtau, &
+                              diurnal, enertest, fat1au, flatten, j2, &
+                              hydrology, icetstep, intheat, iradia, kastprof, &
+                              lwrite, mass_redistrib, massplanet, meanOLR, &
+                              nearco2cond, newtonian, noseason_day, oblate, &
+                              ok_slab_ocean, photochem, rings_shadow, rmean, &
+                              season, sedimentation, sourceevol, specOLR, &
+                              startphy_file, testradtimes, tlocked, &
+                              tracer, UseTurbDiff, water, watercond, &
+                              waterrain
       use nonoro_gwd_ran_mod, only: nonoro_gwd_ran
       use conc_mod
@@ -933 +944 @@
                      OSR_nu(ig,1:L_NSPECTV) = ntf*OSR_nu1(ig,1:L_NSPECTV) + tf*OSR_nu(ig,1:L_NSPECTV)                       
                      OLR_nu(ig,1:L_NSPECTI) = ntf*OLR_nu1(ig,1:L_NSPECTI) + tf*OLR_nu(ig,1:L_NSPECTI)                       
-                     int_dtauv(ig,:,1:L_NSPECTV) = ntf*int_dtauv1(ig,:,1:L_NSPECTV) + tf*int_dtauv(ig,:,1:L_NSPECTV)                       
-                     int_dtaui(ig,:,1:L_NSPECTI) = ntf*int_dtaui1(ig,:,1:L_NSPECTI) + tf*int_dtaui(ig,:,1:L_NSPECTI)                       
+                     if (diagdtau) then
+                       int_dtauv(ig,:,1:L_NSPECTV) = ntf*int_dtauv1(ig,:,1:L_NSPECTV) + tf*int_dtauv(ig,:,1:L_NSPECTV)                       
+                       int_dtaui(ig,:,1:L_NSPECTI) = ntf*int_dtaui1(ig,:,1:L_NSPECTI) + tf*int_dtaui(ig,:,1:L_NSPECTI)                       
+                     endif
                   enddo