Changeset 5160 for LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad

Timestamp:

Aug 3, 2024, 2:56:58 PM (5 months ago)

Author:

abarral

Message:

Put .h into modules

Location:

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad

Files:

• driver/test_aerosol_optics_description.F90 (modified) (1 diff)
• driver/test_fast_expm.F90 (modified) (1 diff)
• driver/test_random_number_generator.F90 (modified) (2 diffs)
• lmdz/readaerosolstrato_ecrad.F90 (modified) (7 diffs)
• radiation/radiation_monochromatic.F90 (modified) (1 diff)

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/driver/test_aerosol_optics_description.F90

@@ -33 +33 @@
 
   ! These two should issue a warning that the aerosol type is ambiguous
-  print *, 'DD: ', aer_desc%get_index('DD',.false.)
-  print *, 'DD (bin=2): ', aer_desc%get_index('DD',.false.,ibin=2)
+  PRINT *, 'DD: ', aer_desc%get_index('DD',.false.)
+  PRINT *, 'DD (bin=2): ', aer_desc%get_index('DD',.false.,ibin=2)
   ! Indicate preferred aerosol optical model, after which further
   ! calls will prefer one particular model
-  print *, 'preferred_optical_model(DD,Fouquart)'
+  PRINT *, 'preferred_optical_model(DD,Fouquart)'
   call aer_desc%preferred_optical_model('DD','Fouquart')
-  print *, 'DD (bin=2): ', aer_desc%get_index('DD',.false.,ibin=2)
-  print *, 'DD (bin=2,model=Woodward): ', aer_desc%get_index('DD',.false.,ibin=2,optical_model_str="Woodward")
-  print *, 'DD (bin=2,model=Woodward2001): ', aer_desc%get_index('DD',.false.,ibin=2,optical_model_str="Woodward2001")
+  PRINT *, 'DD (bin=2): ', aer_desc%get_index('DD',.false.,ibin=2)
+  PRINT *, 'DD (bin=2,model=Woodward): ', aer_desc%get_index('DD',.false.,ibin=2,optical_model_str="Woodward")
+  PRINT *, 'DD (bin=2,model=Woodward2001): ', aer_desc%get_index('DD',.false.,ibin=2,optical_model_str="Woodward2001")
   ! This should fail to find a match, returning zero
-  print *, 'DD (model=Nobody): ', aer_desc%get_index('DD',.false.,optical_model_str="Nobody")
-  print *, 'SS (bin=3): ', aer_desc%get_index('SS',.true.,ibin=3)
+  PRINT *, 'DD (model=Nobody): ', aer_desc%get_index('DD',.false.,optical_model_str="Nobody")
+  PRINT *, 'SS (bin=3): ', aer_desc%get_index('SS',.true.,ibin=3)
 
 end program test_aerosol_optics_description

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/driver/test_fast_expm.F90

@@ -18 +18 @@
   call fast_expm_exchange_3(1,1,a(1:1),b(1:1),c(1:1),d(1:1),r)
 
-  print *, r
-  print *, 0.0000001
-  print *, epsilon(1.0_jprb)
+  PRINT *, r
+  PRINT *, 0.0000001
+  PRINT *, epsilon(1.0_jprb)
 
 end program test_fast_expm

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/driver/test_random_number_generator.F90

@@ -19 +19 @@
   integer :: jl
 
-  print *, 'working_fp_precision = ', jprb
+  PRINT *, 'working_fp_precision = ', jprb
 
   if (IRngType == IRngNative) then
-    print *, "rng_type = 'native'"
+    PRINT *, "rng_type = 'native'"
   else
-    print *, "rng_type = 'native'"
+    PRINT *, "rng_type = 'native'"
   end if
   
@@ -30 +30 @@
        &                                  nmaxstreams=streammax)
   DO jl = 1,1
-    print *, 'initial_state = [ ', int(random_number_generator%istate(1:streammax),jpib), ' ]'
+    PRINT *, 'initial_state = [ ', int(random_number_generator%istate(1:streammax),jpib), ' ]'
     call random_number_generator%uniform_distribution(vec)
-    print *, 'uniform_deviates = [ ', vec, ' ]'
-    print *, 'final_state = [ ', int(random_number_generator%istate(1:streammax),jpib), ' ]'
+    PRINT *, 'uniform_deviates = [ ', vec, ' ]'
+    PRINT *, 'final_state = [ ', int(random_number_generator%istate(1:streammax),jpib), ' ]'
   end do
 

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/lmdz/readaerosolstrato_ecrad.F90

@@ -124 +124 @@
 !--check mth_cur
         IF (mth_cur.LT.1.OR.mth_cur.GT.12) THEN
-          print *,'probleme avec le mois dans readaerosolstrat =', mth_cur
+          PRINT *,'probleme avec le mois dans readaerosolstrat =', mth_cur
         ENDIF
 
@@ -148 +148 @@
         IF (grid_type/=unstructured) THEN
            IF (n_lat.NE.nbp_lat) THEN 
-             print *, 'latitude=', n_lat, nbp_lat
+             PRINT *, 'latitude=', n_lat, nbp_lat
              abort_message='Le nombre de lat n est pas egal a nbp_lat'
              CALL abort_physic(modname,abort_message,1)
@@ -165 +165 @@
         CALL nf95_gw_var(ncid_in, varid, wav)
         n_wav = size(wav)
-        print *, 'WAV aerosol strato=', n_wav, wav
+        PRINT *, 'WAV aerosol strato=', n_wav, wav
 !        IF (n_wav.NE.config%n_bands_sw) THEN 
 !           abort_message='Le nombre de wav n est pas egal a config%n_bands_sw'
@@ -178 +178 @@
         CALL nf95_inq_varid(ncid_in, "TAU_SUN", varid)
         ncerr = nf90_get_var(ncid_in, varid, tauaerstrat)
-        print *,'code erreur readaerosolstrato=', ncerr, varid
+        PRINT *,'code erreur readaerosolstrato=', ncerr, varid
 
 !--reading stratospheric aerosol omega per layer
         CALL nf95_inq_varid(ncid_in, "OME_SUN", varid)
         ncerr = nf90_get_var(ncid_in, varid, pizaerstrat)
-        print *,'code erreur readaerosolstrato=', ncerr, varid
+        PRINT *,'code erreur readaerosolstrato=', ncerr, varid
 
 !--reading stratospheric aerosol g per layer
         CALL nf95_inq_varid(ncid_in, "GGG_SUN", varid)
         ncerr = nf90_get_var(ncid_in, varid, cgaerstrat)
-        print *,'code erreur readaerosolstrato sw=', ncerr, varid
+        PRINT *,'code erreur readaerosolstrato sw=', ncerr, varid
 
         CALL nf95_close(ncid_in)
@@ -256 +256 @@
         CALL nf95_gw_var(ncid_in, varid, wav)
         n_wav = size(wav)
-        print *, 'WAV aerosol strato=', n_wav, wav
+        PRINT *, 'WAV aerosol strato=', n_wav, wav
 !        IF (n_wav.NE.config%n_bands_lw) THEN 
 !           abort_message='Le nombre de wav n est pas egal a config%n_bands_lw'
@@ -271 +271 @@
         CALL nf95_inq_varid(ncid_in, "TAU_EAR", varid)
         ncerr = nf90_get_var(ncid_in, varid, taulwaerstrat)
-        print *,'code erreur readaerosolstrato lw=', ncerr, varid
+        PRINT *,'code erreur readaerosolstrato lw=', ncerr, varid
 
 ! add/mod ThL
@@ -278 +278 @@
         CALL nf95_inq_varid(ncid_in, "OME_EAR", varid)
         ncerr = nf90_get_var(ncid_in, varid, pizlwaerstrat)
-        print *,'code erreur readaerosolstrato lw=', ncerr, varid
+        PRINT *,'code erreur readaerosolstrato lw=', ncerr, varid
 
 !--reading stratospheric aerosol g per layer
         CALL nf95_inq_varid(ncid_in, "GGG_EAR", varid)
         ncerr = nf90_get_var(ncid_in, varid, cglwaerstrat)
-        print *,'code erreur readaerosolstrato lw=', ncerr, varid
+        PRINT *,'code erreur readaerosolstrato lw=', ncerr, varid
 
         CALL nf95_close(ncid_in)

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/radiation/radiation_monochromatic.F90

@@ -293 +293 @@
              &  ', longwave optical depth = ', &
              &  sum(od_lw_cloud(1,:,jcol)*cloud%fraction(jcol,:))
-        !    print *, 'LWP = ', sum(lwp_kg_m2(:,istartcol)*cloud%fraction(istartcol,:))
+        !    PRINT *, 'LWP = ', sum(lwp_kg_m2(:,istartcol)*cloud%fraction(istartcol,:))
       end do
     end if