Changeset 5105 for LMDZ6/branches/Amaury_dev/libf/phylmdiso

Timestamp:

Jul 23, 2024, 7:14:34 PM (6 months ago)

Author:

abarral

Message:

Replace 1DUTILS.h by module lmdz_1dutils.f90
Replace 1DConv.h by module lmdz_old_1dconv.f90 (it's only used by old_* files)
Convert *.F to *.f90
Fix gradsdef.h formatting
Remove unnecessary "RETURN" at the end of functions/subroutines

Location:

LMDZ6/branches/Amaury_dev/libf/phylmdiso

Files:

• add_phys_tend_mod.F90 (modified) (3 diffs)
• ajsec.F90 (modified) (3 diffs)
• calwake.F90 (modified) (1 diff)
• clift.F90 (modified) (1 diff)
• concvl.F90 (modified) (1 diff)
• cv30_routines.F90 (modified) (14 diffs)
• cv3_enthalpmix.F90 (modified) (1 diff)
• cv3_estatmix.F90 (modified) (1 diff)
• cv3_routines.F90 (modified) (17 diffs)
• cv3a_compress.F90 (modified) (1 diff)
• cv3a_uncompress.F90 (modified) (1 diff)
• cv3p_mixing.F90 (modified) (1 diff)
• cv_driver.F90 (modified) (3 diffs)
• cv_routines.F90 (modified) (12 diffs)
• cva_driver.F90 (modified) (1 diff)
• fcg_racmo.h (deleted)
• isotopes_routines_mod.F90 (modified) (16 diffs)
• isotopes_verif_mod.F90 (modified) (26 diffs)
• isotrac_routines_mod.F90 (modified) (22 diffs)
• lmdz_lscp_old.F90 (modified) (1 diff)
• lmdz_wake.F90 (modified) (2 diffs)
• phyaqua_mod.F90 (modified) (3 diffs)
• reevap.F90 (modified) (1 diff)

LMDZ6/branches/Amaury_dev/libf/phylmdiso/add_phys_tend_mod.F90

@@ -118 +118 @@
 
 
-  RETURN
+
 END SUBROUTINE add_pbl_tend
 
@@ -663 +663 @@
   ENDIF ! (mode == 1)
 
-  RETURN
+
 END SUBROUTINE add_phys_tend
 
@@ -828 +828 @@
   end if ! end if (fl_ebil .GT. 0)
 
-  RETURN
+
 END SUBROUTINE diag_phys_tend
 

LMDZ6/branches/Amaury_dev/libf/phylmdiso/ajsec.F90

@@ -293 +293 @@
 
 
-  RETURN
+
 END SUBROUTINE ajsec
 
@@ -575 +575 @@
 #endif
 
-  RETURN
+
 END SUBROUTINE ajsec_convv2
 SUBROUTINE ajsec_old(paprs, pplay, t, d_t)
@@ -668 +668 @@
   END DO
 
-  RETURN
+
 END SUBROUTINE ajsec_old

LMDZ6/branches/Amaury_dev/libf/phylmdiso/calwake.F90

@@ -433 +433 @@
 !>jyg
 
-  RETURN
+
 END SUBROUTINE calwake
 

LMDZ6/branches/Amaury_dev/libf/phylmdiso/clift.F90

@@ -71 +71 @@
 
 
-  RETURN
+
 END SUBROUTINE clift

LMDZ6/branches/Amaury_dev/libf/phylmdiso/concvl.F90

@@ -811 +811 @@
   END IF !(prt_level.EQ.20) THEN
 
-  RETURN
+
 END SUBROUTINE concvl
 

LMDZ6/branches/Amaury_dev/libf/phylmdiso/cv30_routines.F90

@@ -80 +80 @@
   betad = 10.0 ! original value (from convect 4.3)
 
-  RETURN
+
 END SUBROUTINE cv30_param
 
@@ -155 +155 @@
   END DO
 
-  RETURN
+
 END SUBROUTINE cv30_prelim
 
@@ -359 +359 @@
   END DO
 
-  RETURN
+
 END SUBROUTINE cv30_feed
 
@@ -828 +828 @@
 #endif
 
-  RETURN
+
 END SUBROUTINE cv30_undilute1
 
@@ -932 +932 @@
   ! fin oct3 --
 
-  RETURN
+
 END SUBROUTINE cv30_trigger
 
@@ -1121 +1121 @@
 
 
-  RETURN
+
 END SUBROUTINE cv30_compress
 
@@ -1610 +1610 @@
   END DO
 
-  RETURN
+
 END SUBROUTINE cv30_undilute2
 
@@ -1815 +1815 @@
   ! !      sig(icb-1)=sig(icb)
 
-  RETURN
+
 END SUBROUTINE cv30_closure
 
@@ -2633 +2633 @@
 #endif
 
-  RETURN
+
 END SUBROUTINE cv30_mixing
 
@@ -3361 +3361 @@
 #endif
 #endif
-  RETURN
+
 END SUBROUTINE cv30_unsat
 
@@ -5981 +5981 @@
   END DO ! cld
 
-  RETURN
+
 END SUBROUTINE cv30_yield
 
@@ -6093 +6093 @@
   END DO
 
-  RETURN
+
 END SUBROUTINE cv30_tracer
 ! RomP <<<
@@ -6347 +6347 @@
   END DO
 
-  RETURN
+
 END SUBROUTINE cv30_uncompress
 
@@ -6434 +6434 @@
       endif !if (coef_epmax_cape.gt.1e-12) then
 
-      return
+
       END SUBROUTINE  cv30_epmax_fn_cape
 

LMDZ6/branches/Amaury_dev/libf/phylmdiso/cv3_enthalpmix.F90

@@ -235 +235 @@
 
 
-  RETURN
+
 END SUBROUTINE cv3_enthalpmix
 

LMDZ6/branches/Amaury_dev/libf/phylmdiso/cv3_estatmix.F90

@@ -218 +218 @@
 
 
-  RETURN
+
 END SUBROUTINE cv3_estatmix
 

LMDZ6/branches/Amaury_dev/libf/phylmdiso/cv3_routines.F90

@@ -106 +106 @@
      CALL getin_p('wbmax',wbmax)
      ok_convstop=.False.
-     CALL getin_p('ok_convstop',ok_convstop)
+     CALL getin_p('ok_convstop ',ok_convstop)
      tau_stop=15000.
-     CALL getin_p('tau_stop',tau_stop)
+     CALL getin_p('tau_stop ',tau_stop)
      ok_intermittent=.False.
      CALL getin_p('ok_intermittent',ok_intermittent)
@@ -179 +179 @@
   noconv_stop = max(2.,tau_stop/delt)
 
-  RETURN
+
 END SUBROUTINE cv3_param
 
@@ -219 +219 @@
 !    print *,'cv3_incrcount out, sig(1,nd) ',sig(1,nd)
 
-  RETURN
+
 END SUBROUTINE cv3_incrcount
 
@@ -301 +301 @@
   END DO
 
-  RETURN
+
 END SUBROUTINE cv3_prelim
 
@@ -672 +672 @@
   END DO
 
-  RETURN
+
 END SUBROUTINE cv3_feed
 
@@ -1141 +1141 @@
 #endif  
 #endif
-  RETURN
+
 END SUBROUTINE cv3_undilute1
 
@@ -1244 +1244 @@
 ! fin oct3 --
 
-  RETURN
+
 END SUBROUTINE cv3_trigger
 
@@ -1418 +1418 @@
 #endif
 #endif
-  RETURN
+
 END SUBROUTINE cv3_compress
 
@@ -1450 +1450 @@
   END DO
 
-  RETURN
+
 
 END SUBROUTINE icefrac
@@ -2503 +2503 @@
   END IF  ! (cvflag_ice)
 
-  RETURN
+
 END SUBROUTINE cv3_undilute2
 
@@ -2744 +2744 @@
 !!      sig(icb-1)=sig(icb)
 
-  RETURN
+
 END SUBROUTINE cv3_closure
 
@@ -3569 +3569 @@
 #endif
 #endif
-  RETURN
+
 END SUBROUTINE cv3_mixing
 
@@ -4662 +4662 @@
 
 
-  RETURN
+
 
 END SUBROUTINE cv3_unsat
@@ -7272 +7272 @@
 ! PRINT*,'cv3_yield fin'
 
-  RETURN
+
 END SUBROUTINE cv3_yield
 
@@ -7372 +7372 @@
   END DO
 
-  RETURN
+
 END SUBROUTINE cv3_tracer
 !AC! et !RomP <<<
@@ -7592 +7592 @@
 !AC! 2100   continue
 
-  RETURN
+
 END SUBROUTINE cv3_uncompress
 
@@ -7735 +7735 @@
       !write(*,*) 'cv3_routines check 4367'
 
-      return
+
       END SUBROUTINE  cv3_epmax_fn_cape
 

LMDZ6/branches/Amaury_dev/libf/phylmdiso/cv3a_compress.F90

@@ -297 +297 @@
 !>jyg
 
-  RETURN
+
 END SUBROUTINE cv3a_compress

LMDZ6/branches/Amaury_dev/libf/phylmdiso/cv3a_uncompress.F90

@@ -504 +504 @@
 !>jyg
 
-  RETURN
+
 END SUBROUTINE cv3a_uncompress
 

LMDZ6/branches/Amaury_dev/libf/phylmdiso/cv3p_mixing.F90

@@ -1371 +1371 @@
 
 
-  RETURN
+
 END SUBROUTINE cv3p_mixing
 

LMDZ6/branches/Amaury_dev/libf/phylmdiso/cv_driver.F90

@@ -1223 +1223 @@
 
   ! print *, 'fin cv_driver ->'      !jyg
-  RETURN
+
 END SUBROUTINE cv_driver
 
@@ -1257 +1257 @@
   CALL getin_p('icvflag_Tpa', icvflag_Tpa)
 
-  RETURN
+
 END SUBROUTINE cv_flag
 
@@ -1318 +1318 @@
   hrd = 0.5*rrd
 
-  RETURN
+
 END SUBROUTINE cv_thermo

LMDZ6/branches/Amaury_dev/libf/phylmdiso/cv_routines.F90

@@ -71 +71 @@
   delta = 0.01 ! cld
 
-  RETURN
+
 END SUBROUTINE cv_param
 
@@ -128 +128 @@
   END DO
 
-  RETURN
+
 END SUBROUTINE cv_prelim
 
@@ -249 +249 @@
   END DO
 
-  RETURN
+
 END SUBROUTINE cv_feed
 
@@ -359 +359 @@
   END DO
 
-  RETURN
+
 END SUBROUTINE cv_undilute1
 
@@ -389 +389 @@
   END DO
 
-  RETURN
+
 END SUBROUTINE cv_trigger
 
@@ -476 +476 @@
   END DO
 
-  RETURN
+
 END SUBROUTINE cv_compress
 
@@ -759 +759 @@
   END DO
 
-  RETURN
+
 END SUBROUTINE cv_undilute2
 
@@ -841 +841 @@
   END DO
 
-  RETURN
+
 END SUBROUTINE cv_closure
 
@@ -1093 +1093 @@
 789 END DO
 
-  RETURN
+
 END SUBROUTINE cv_mixing
 
@@ -1294 +1294 @@
 899 END DO
 
-  RETURN
+
 END SUBROUTINE cv_unsat
 
@@ -1663 +1663 @@
   END DO ! cld
 
-  RETURN
+
 END SUBROUTINE cv_yield
 
@@ -1709 +1709 @@
   END DO
 
-  RETURN
+
 END SUBROUTINE cv_uncompress
 

LMDZ6/branches/Amaury_dev/libf/phylmdiso/cva_driver.F90

@@ -1791 +1791 @@
 
 
-  RETURN
+
 END SUBROUTINE cva_driver

LMDZ6/branches/Amaury_dev/libf/phylmdiso/isotopes_routines_mod.F90

@@ -2229 +2229 @@
           ! end verif
 
- return
+
  END SUBROUTINE  calcul_Rsol
 
@@ -9548 +9548 @@
 
 #ifdef ISOVERIF 
-!      write(*,*) 'appel_stewart_np 335 nostop' 
+!      write(*,*) 'appel_stewart_np 335 nostop '
 !      il=1
 !      write(*,*) 'Pqisup=',Pqisup(il)
@@ -9748 +9748 @@
 !             if (iso_verif_positif_nostop((
 !     :            Pqisup(il)-Eqi_prime(il)),
-!     :            'appel_stewart_np 388 nostop').eq.1) then
+!     :            'appel_stewart_np 388 nostop ').eq.1) then
 !               write(*,*) 'il,Pqisup=',il,Pqisup(il)
 !               write(*,*) 'Eqi_prime=',Eqi_prime(il)
@@ -13837 +13837 @@
 
 
-        return
+
         END SUBROUTINE  calcul_iso_surf_oce_vectall
 
@@ -14089 +14089 @@
 
 
-      return
+
       END SUBROUTINE  calcul_iso_surf_sic_vectall
 
@@ -14419 +14419 @@
 
 
-        return
+
         END SUBROUTINE  calcul_iso_surf_lic_vectall
 
@@ -15842 +15842 @@
         enddo !do i=1,knon
 
-        return
+
         END SUBROUTINE  calcul_iso_surf_ter_vectall
 
@@ -16017 +16017 @@
         endif
 
-      RETURN
+
       END SUBROUTINE phyisoetat0
       
@@ -17925 +17925 @@
 
 
-      return
+
       END SUBROUTINE  iso_tritium
 
@@ -18040 +18040 @@
       endif ! if (ok_prod_nucl_tritium)
 
-      return
+
       END SUBROUTINE  table_tritium_nucl
 
@@ -18123 +18123 @@
              
 
-      return
+
       END SUBROUTINE  date_prod_nucl_HTO
 
@@ -18214 +18214 @@
       enddo
 
-      return
+
       END SUBROUTINE  lancer_bombes
 ! --------------------------------------------------------------------------------
@@ -18352 +18352 @@
 !#endif
       
-      return
+
       END SUBROUTINE  coord_prod_nucl_HTO
 
@@ -18492 +18492 @@
 !#endif
 
-      return
+
       END SUBROUTINE  calcul_prod_nucl_HTO
 
@@ -18631 +18631 @@
 #endif
 
-        return
+
         END SUBROUTINE  condiso_liq_ice_vectiso_trac
 
@@ -18770 +18770 @@
 #endif
 
-        return
+
         END SUBROUTINE  condiso_liq_ice_vectall_trac
 #endif

LMDZ6/branches/Amaury_dev/libf/phylmdiso/isotopes_verif_mod.F90

@@ -160 +160 @@
 #endif           
 
-        return
+
         END SUBROUTINE  iso_verif_egalite
 
@@ -188 +188 @@
 #endif                  
 
-        return
+
         end function iso_verif_egalite_nostop
 
@@ -322 +322 @@
 #endif           
         
-        return
+
         end function iso_verif_aberrant_nostop
 
@@ -353 +353 @@
         stop
 #endif                   
-        return
+
         end function iso_verif_aberrant_enc_nostop
 
@@ -417 +417 @@
 #endif                   
         
-        return
+
         end function iso_verif_aberrant_choix_nostop
 
@@ -461 +461 @@
 #endif                   
         
-        return
+
         end function iso_verif_aberrant_enc_choix_nostop
 
@@ -493 +493 @@
 #endif                   
         
-        return
+
         END SUBROUTINE  iso_verif_aberrant_o17
 
@@ -534 +534 @@
 #endif                   
         
-        return
+
         end function iso_verif_aberrant_o17_nostop
 
@@ -592 +592 @@
 #endif           
 
-        return
+
         end function iso_verif_noNaN_nostop
 
@@ -750 +750 @@
 #endif           
         
-        return
+
         end function iso_verif_egalite_choix_nostop       
 
@@ -890 +890 @@
         endif    
         
-        return
+
         end function iso_verif_positif_strict_nostop
 
@@ -950 +950 @@
 #endif         
         
-        return
+
         end function iso_verif_positif_nostop
 
@@ -984 +984 @@
 #endif
         
-        return
+
         end function iso_verif_positif_choix_nostop
 
@@ -1053 +1053 @@
 #endif                   
 
-        return
+
         end function iso_verif_O18_aberrant_nostop
 
@@ -1070 +1070 @@
                  iso_HDO.gt.0
         endif
-        return
+
         end function deltaD
 
@@ -1085 +1085 @@
                  iso_O18.gt.0
         endif
-        return
+
         end function deltaO
 
@@ -1101 +1101 @@
             write(*,*) 'iso_verif_egalite 1109: iso_O18,iso_HDO=',iso_O18,iso_HDO
         endif
-        return
+
         end function dexcess
 
@@ -1113 +1113 @@
         
         delta_all=(R/tnat(ixt)-1)*1000.0
-        return
+
         end function delta_all
 
@@ -1124 +1124 @@
         
         delta_to_R=(delta/1000.0+1.0)*tnat(ixt)
-        return
+
         end function delta_to_R
 
@@ -1142 +1142 @@
                  iso_O17.gt.0,iso_O18.gt.0
         endif
-        return
+
         end function o17excess
 
@@ -1195 +1195 @@
 #endif         
 
-        return
+
         END SUBROUTINE  iso_verif_egalite_vect2D
 
@@ -1279 +1279 @@
         endif 
 
-        return
+
         END SUBROUTINE  iso_verif_egalite_std_vect
 
@@ -1555 +1555 @@
         enddo
 
-        return
+
         END SUBROUTINE  select_dim23_from4D
 
@@ -1576 +1576 @@
         enddo
 
-        return
+
         END SUBROUTINE  select_dim4_from4D
 
@@ -1742 +1742 @@
 #endif           
 
-        return
+
         END SUBROUTINE  iso_verif_noNaN_par2D
 
@@ -1936 +1936 @@
         endif ! if (iso_HDO.gt.0) then  
 
-        return
+
         end function iso_verif_tracnps_choix_nostop
 

LMDZ6/branches/Amaury_dev/libf/phylmdiso/isotrac_routines_mod.F90

@@ -1101 +1101 @@
 #endif      
 
-      return
+
       END SUBROUTINE  ajoute_revap
 
@@ -1311 +1311 @@
       endif
       
-      return
+
       end function is_in_bassin
 
@@ -1368 +1368 @@
 #endif
 
-        return
+
         END SUBROUTINE  find_bassin
 
@@ -1394 +1394 @@
        endif
 
-        return
+
         END SUBROUTINE  initialise_bassins_boites
 
@@ -1420 +1420 @@
         enddo
 
-        return
+
         END SUBROUTINE  bassin_map_init
 
@@ -1447 +1447 @@
 !        write(*,*) 'is_in_rectangle=',is_in_rectangle
 !#endif        
-        return
+
         end function is_in_rectangle
 
@@ -1484 +1484 @@
 !     :         det1,det2,det3,is_in_triangle
 !#endif
-        return
+
         end function is_in_triangle
 
@@ -1569 +1569 @@
 #endif
 
-        return
+
         END SUBROUTINE  isotrac_recolorise_tmin
 
@@ -1624 +1624 @@
 #endif
 
-        return
+
         END SUBROUTINE  isotrac_recolorise_tmin_sfrev
 
@@ -1689 +1689 @@
 #endif
 
-        return
+
         END SUBROUTINE  isotrac_recolorise_saturation
 
@@ -1741 +1741 @@
 #endif
 
-        return
+
         END SUBROUTINE  isotrac_recolorise_boite
 
@@ -1788 +1788 @@
 #endif
 
-        return
+
         END SUBROUTINE  isotrac_recolorise_extra
 
@@ -1857 +1857 @@
 #endif
 
-        return
+
         END SUBROUTINE  isotrac_recolorise_conv
 
@@ -1910 +1910 @@
         enddo
 
-        return
+
         END SUBROUTINE  boite_AMMA_init
 
@@ -1948 +1948 @@
         enddo
 
-        return
+
         END SUBROUTINE  boite_UT_extra_init
 
@@ -1968 +1968 @@
         endif
 
-        return
+
         end function index_zone_lat
 
@@ -1988 +1988 @@
         write(*,*) 'zone_pres=',zone_pres(1:nzone_pres-1)
 
-        return
+
         end function index_zone_pres
 
@@ -2024 +2024 @@
         endif !if (nzone_pres.gt.1) then
 
-        return
+
         end function find_index
 
@@ -2045 +2045 @@
         index_zone_latpres=index_lat+(index_pres-1)*nzone_lat
 
-        return
+
         end function index_zone_latpres
 
@@ -2254 +2254 @@
 #endif
 
-            return
+
             END SUBROUTINE  iso_recolorise_condensation
 
@@ -2281 +2281 @@
         enddo !do i=1,klon
         
-        return
+
         END SUBROUTINE  bassin_map_init_opt20
 
@@ -2309 +2309 @@
       endif !if (option_traceurs.eq.4) then
 
-        return
+
         END SUBROUTINE  isotrac_recolorise_general
 

LMDZ6/branches/Amaury_dev/libf/phylmdiso/lmdz_lscp_old.F90

@@ -549 +549 @@
                write(*,*) 'ilp 400: avant clmain 31janv: i,k,q=', &
                  i,k,q(i,k)
-               CALL abort_physic('ilp 484', 'on stop', 1)
+               CALL abort_physic('ilp 484', 'on stop ', 1)
         endif 
 #endif

LMDZ6/branches/Amaury_dev/libf/phylmdiso/lmdz_wake.F90

@@ -2548 +2548 @@
 
 
-  RETURN
+
 END SUBROUTINE wake
 
@@ -2620 +2620 @@
   END DO
 
-  RETURN
+
 END SUBROUTINE wake_vec_modulation
 

LMDZ6/branches/Amaury_dev/libf/phylmdiso/phyaqua_mod.F90

@@ -410 +410 @@
     CALL phys_state_var_end
 
-    RETURN
+
   END SUBROUTINE iniaqua
 
@@ -526 +526 @@
     END IF
 
-    RETURN
+
   END SUBROUTINE zenang_an
 
@@ -1008 +1008 @@
     ! IM end : verif profil SST: phy_sst
 
-    RETURN
+
   END SUBROUTINE profil_sst
 

LMDZ6/branches/Amaury_dev/libf/phylmdiso/reevap.F90

@@ -91 +91 @@
 
 
-RETURN
+
 
 END SUBROUTINE reevap