Changeset 5092 for LMDZ6

Timestamp:

Jul 21, 2024, 1:04:08 PM (2 months ago)

Author:

abarral

Message:

Revert rrtm and ecrad to trunk (external sources)

Location:

LMDZ6/branches/Amaury_dev/libf/phylmd

Files:

• ecrad.v1.5.1/radiation_scheme.F90 (modified) (2 diffs)
• ecrad.v1.5.1/readaerosol_optic_ecrad.F90 (modified) (6 diffs)
• rrtm/aeropt_5wv_rrtm.F90 (deleted)
• rrtm/aeropt_6bands_rrtm.F90 (deleted)
• rrtm/aeropt_lw_rrtm.F90 (deleted)
• rrtm/dump2ds.F (deleted)
• rrtm/eq_regions_mod.F90 (deleted)
• rrtm/gstats.F90 (deleted)
• rrtm/read_rsun_rrtm.F90 (deleted)
• rrtm/readaerosol_optic_rrtm.F90 (deleted)
• rrtm/readaerosolstrato1_rrtm.F90 (deleted)
• rrtm/readaerosolstrato2_rrtm.F90 (deleted)
• rrtm/recmwf_aero.F90 (deleted)
• rrtm/rrtm_gasabs1a_140gp.F90 (deleted)
• rrtm/rrtm_rtrn1a_140gp.F90 (deleted)
• rrtm/rrtm_taumol1.F90 (deleted)
• rrtm/set99.F (deleted)
• rrtm/suecrad.F90 (deleted)
• rrtm/yomhook.F90 (deleted)
• rrtm/yomoml.F90 (deleted)

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad.v1.5.1/radiation_scheme.F90

@@ -654 +654 @@
 ! Compute UV fluxes as weighted sum of appropriate shortwave bands
 !AI ATTENTION
-if (0==1) then
+if (0.eq.1) then
 PFLUX_UV       (KIDIA:KFDIA) = 0.0_JPRB
 DO JBAND = 1,NWEIGHT_UV
@@ -690 +690 @@
 !AI ATTENTION
 !IF (YRERAD%LAPPROXSWUPDATE) THEN
-if (0==1) then
+if (0.eq.1) then
 IF (rad_config%do_surface_sw_spectral_flux) THEN
   PSWDIFFUSEBAND(KIDIA:KFDIA,:) = 0.0_JPRB

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad.v1.5.1/readaerosol_optic_ecrad.F90

@@ -161 +161 @@
      !
      ! Read and interpolate sulfate
-     IF ( flag_aerosol == 1 .OR. flag_aerosol == 6 .OR. flag_aerosol == 7 ) THEN
+     IF ( flag_aerosol .EQ. 1 .OR. flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN 
 
         CALL readaerosol_interp(id_ASSO4M_phy, itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, sulfacc, sulfacc_pi,loadso4)
@@ -170 +170 @@
 
      ! Read and interpolate bcsol and bcins
-     IF ( flag_aerosol == 2 .OR. flag_aerosol == 6 .OR. flag_aerosol == 7 ) THEN
+     IF ( flag_aerosol .EQ. 2 .OR. flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN 
 
         ! Get bc aerosol distribution 
@@ -183 +183 @@
 
      ! Read and interpolate pomsol and pomins
-     IF ( flag_aerosol == 3 .OR. flag_aerosol == 6 .OR. flag_aerosol == 7 ) THEN
+     IF ( flag_aerosol .EQ. 3 .OR. flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN
 
         CALL readaerosol_interp(id_ASPOMM_phy, itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, pomsol, pomsol_pi, load_tmp3)
@@ -195 +195 @@
 
      ! Read and interpolate csssm, ssssm, assssm
-     IF (flag_aerosol == 4 .OR. flag_aerosol == 6 .OR. flag_aerosol == 7 ) THEN
+     IF (flag_aerosol .EQ. 4 .OR. flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN 
 
         CALL readaerosol_interp(id_SSSSM_phy ,itap, pdtphys,rjourvrai, &
@@ -212 +212 @@
 
      ! Read and interpolate cidustm
-     IF (flag_aerosol == 5 .OR. flag_aerosol == 6 .OR. flag_aerosol == 7 ) THEN
+     IF (flag_aerosol .EQ. 5 .OR. flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN 
 
         CALL readaerosol_interp(id_CIDUSTM_phy, itap, pdtphys, rjourvrai, debut, pplay, paprs, t_seri, cidust, cidust_pi, loaddust) 
@@ -222 +222 @@
      !
      ! Read and interpolate asno3m, csno3m, cino3m
-     IF (flag_aerosol == 6 .OR. flag_aerosol == 7 ) THEN
+     IF (flag_aerosol .EQ. 6 .OR. flag_aerosol .EQ. 7 ) THEN 
 
         CALL readaerosol_interp(id_ASNO3M_phy, itap, pdtphys, rjourvrai, &