From 4698eefe61a645da5619a84a5f2ef75dc43989c7 Mon Sep 17 00:00:00 2001 From: TimSlendebroek <32385057+TimSlendebroek@users.noreply.github.com> Date: Wed, 9 Mar 2022 13:10:29 -0800 Subject: [PATCH 1/4] conflict --- Makefile | 22 ++++++++++++---------- Project.toml | 7 ++++++- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index cec64415e..4f6f0cac0 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ install: install_FUSE install_IJulia julia -e '\ using Pkg;\ Pkg.activate();\ -Pkg.develop(["FUSE", "IMAS", "IMASDD", "CoordinateConventions", "FusionMaterials", "AD_GS", "Equilibrium", "AD_TAUENN", "AD_EPEDNN", "AD_TGLFNN", "QED"]);\ +Pkg.develop(["FUSE", "IMAS","IMASDD", "CoordinateConventions", "FusionMaterials", "AD_GS", "Equilibrium", "AD_TAUENN", "AD_EPEDNN", "AD_TGLFNN", "QED"]);\ Pkg.resolve();\ try Pkg.upgrade_manifest() catch end;\ ' @@ -29,34 +29,36 @@ install_FUSE: install_IMAS install_IMASDD install_FusionMaterials install_AD_GS julia -e '\ using Pkg;\ Pkg.activate("$(JULIA_PKG_DEVDIR)/FUSE");\ -Pkg.develop(["IMAS", "IMASDD", "CoordinateConventions", "FusionMaterials", "AD_GS", "Equilibrium", "AD_TAUENN", "AD_EPEDNN", "AD_TGLFNN", "QED"]);\ +Pkg.develop(["IMAS", "CoordinateConventions", "FusionMaterials", "AD_GS", "Equilibrium", "AD_TAUENN", "AD_EPEDNN", "AD_TGLFNN", "QED"]);\ Pkg.resolve();\ try Pkg.upgrade_manifest() catch end;\ ' -install_IMAS: install_IMASDD install_CoordinateConventions +install_IMAS: install_CoordinateConventions if [ ! -d "$(JULIA_PKG_DEVDIR)/IMAS" ]; then\ julia -e 'using Pkg; Pkg.develop(url="git@github.com:ProjectTorreyPines/IMAS.jl.git");';\ fi julia -e '\ using Pkg;\ Pkg.activate("$(JULIA_PKG_DEVDIR)/IMAS");\ -Pkg.develop(["IMASDD", "CoordinateConventions"]);\ +Pkg.develop(["CoordinateConventions"]);\ Pkg.resolve();\ try Pkg.upgrade_manifest() catch end;\ ' -install_IMASDD: - if [ ! -d "$(JULIA_PKG_DEVDIR)/IMAS" ]; then\ +install_IMASDD: install_CoordinateConventions + if [ ! -d "$(JULIA_PKG_DEVDIR)/IMASDD" ]; then\ julia -e 'using Pkg; Pkg.develop(url="git@github.com:ProjectTorreyPines/IMASDD.jl.git");';\ fi julia -e '\ using Pkg;\ -Pkg.activate("$(JULIA_PKG_DEVDIR)/IMAS");\ +Pkg.activate("$(JULIA_PKG_DEVDIR)/IMASDD");\ +Pkg.develop(["CoordinateConventions"]);\ Pkg.resolve();\ try Pkg.upgrade_manifest() catch end;\ ' + install_CoordinateConventions: if [ ! -d "$(JULIA_PKG_DEVDIR)/CoordinateConventions" ]; then\ julia -e 'using Pkg; Pkg.develop(url="git@github.com:ProjectTorreyPines/CoordinateConventions.jl.git");';\ @@ -103,12 +105,12 @@ Pkg.resolve();\ try Pkg.upgrade_manifest() catch end;\ ' -install_TAUENN: install_IMAS install_IMASDD install_CoordinateConventions install_TGLFNN install_EPEDNN +install_TAUENN: install_IMAS install_CoordinateConventions install_TGLFNN install_EPEDNN if [ ! -d "$(JULIA_PKG_DEVDIR)/AD_TAUENN" ]; then ln -s $(CURRENTDIR) $(JULIA_PKG_DEVDIR)/AD_TAUENN; fi julia -e '\ using Pkg;\ Pkg.activate("$(JULIA_PKG_DEVDIR)/AD_TAUENN");\ -Pkg.develop(["IMAS", "IMASDD", "CoordinateConventions", "AD_TGLFNN", "AD_EPEDNN"]);\ +Pkg.develop(["IMAS", "CoordinateConventions", "AD_TGLFNN", "AD_EPEDNN"]);\ Pkg.resolve();\ try Pkg.upgrade_manifest() catch end;\ ' @@ -143,7 +145,7 @@ Pkg.resolve();\ try Pkg.upgrade_manifest() catch end;\ ' -update: update_FUSE update_IMAS update_IMASDD update_CoordinateConventions update_FusionMaterials update_AD_GS update_Equilibrium update_TAUENN update_EPEDNN update_TGLFNN update_QED +update: update_FUSE update_IMAS update_CoordinateConventions update_FusionMaterials update_AD_GS update_Equilibrium update_TAUENN update_EPEDNN update_TGLFNN update_QED make install update_FUSE: diff --git a/Project.toml b/Project.toml index e68eefe81..5a6b2f73b 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ +authors = ["Orso Meneghini "] name = "FUSE" uuid = "e64856f0-3bb8-4376-b4b7-c03396503992" -authors = ["Orso Meneghini "] version = "0.1.0" [deps] @@ -8,8 +8,10 @@ AD_EPEDNN = "e64856f0-3bb8-4376-b4b7-c03396503991" AD_GS = "9d9223b5-c5da-4bf4-abee-2a8bb6775a49" AD_TAUENN = "4f5ffc88-c87f-11eb-142e-4d2ba0394a67" AD_TGLFNN = "558c7b13-fd9f-4806-b461-592296cfa9d0" +CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b" Contour = "d38c429a-6771-53c6-b99e-75d170b6e991" CoordinateConventions = "7204ce3a-f536-43d2-be4a-fbed74e90d86" +DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" EFIT = "cda752c5-6b03-55a3-9e33-132a441b0c17" Equilibrium = "187daef3-cca3-527a-8725-7379bc760182" @@ -36,3 +38,6 @@ Revise = "295af30f-e4ad-537b-8983-00126c2a3abe" StaticArrays = "90137ffa-7385-5640-81b9-e52037218182" Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" + +[extras] +CPUSummary = "2a0fbf3d-bb9c-48f3-b0a9-814d99fd7ab9" From 883df21f09544233e5aa46d7aa270dca337398ea Mon Sep 17 00:00:00 2001 From: TimSlendebroek <32385057+TimSlendebroek@users.noreply.github.com> Date: Thu, 10 Mar 2022 14:36:27 -0800 Subject: [PATCH 2/4] transport_model for AD_TAUENN --- src/actors/transport_actor.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/actors/transport_actor.jl b/src/actors/transport_actor.jl index 7c7a60cc1..8e4cfcf8d 100644 --- a/src/actors/transport_actor.jl +++ b/src/actors/transport_actor.jl @@ -10,13 +10,13 @@ mutable struct TaueNNactor <: AbstractActor outputs::AD_TAUENN.TauennOutputs end -function TaueNNactor(dd::IMAS.dd; rho_fluxmatch = 0.6, eped_factor = 1.0, T_shaping = 1.8, temp_pedestal_ratio = 1.0, error = 1E-2, use_tglfnn = true, kw...) +function TaueNNactor(dd::IMAS.dd; rho_fluxmatch = 0.6, eped_factor = 1.0, T_shaping = 1.8, temp_pedestal_ratio = 1.0, error = 1E-2, transport_model = :tglfnn, kw...) parameters = AD_TAUENN.TauennParameters() parameters.eped_factor = eped_factor parameters.rho_fluxmatch = rho_fluxmatch parameters.T_shaping = T_shaping parameters.temp_pedestal_ratio = temp_pedestal_ratio - parameters.use_tglfnn = use_tglfnn + parameters.transport_model = transport_model parameters.error = error for param in keys(kw) setfield!(parameters, param, kw[param]) From 735fe4f4c98600e225213a45b3941951639ca659 Mon Sep 17 00:00:00 2001 From: TimSlendebroek <32385057+TimSlendebroek@users.noreply.github.com> Date: Thu, 10 Mar 2022 14:41:10 -0800 Subject: [PATCH 3/4] mistake makefile --- Makefile | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 4f6f0cac0..cec64415e 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ install: install_FUSE install_IJulia julia -e '\ using Pkg;\ Pkg.activate();\ -Pkg.develop(["FUSE", "IMAS","IMASDD", "CoordinateConventions", "FusionMaterials", "AD_GS", "Equilibrium", "AD_TAUENN", "AD_EPEDNN", "AD_TGLFNN", "QED"]);\ +Pkg.develop(["FUSE", "IMAS", "IMASDD", "CoordinateConventions", "FusionMaterials", "AD_GS", "Equilibrium", "AD_TAUENN", "AD_EPEDNN", "AD_TGLFNN", "QED"]);\ Pkg.resolve();\ try Pkg.upgrade_manifest() catch end;\ ' @@ -29,36 +29,34 @@ install_FUSE: install_IMAS install_IMASDD install_FusionMaterials install_AD_GS julia -e '\ using Pkg;\ Pkg.activate("$(JULIA_PKG_DEVDIR)/FUSE");\ -Pkg.develop(["IMAS", "CoordinateConventions", "FusionMaterials", "AD_GS", "Equilibrium", "AD_TAUENN", "AD_EPEDNN", "AD_TGLFNN", "QED"]);\ +Pkg.develop(["IMAS", "IMASDD", "CoordinateConventions", "FusionMaterials", "AD_GS", "Equilibrium", "AD_TAUENN", "AD_EPEDNN", "AD_TGLFNN", "QED"]);\ Pkg.resolve();\ try Pkg.upgrade_manifest() catch end;\ ' -install_IMAS: install_CoordinateConventions +install_IMAS: install_IMASDD install_CoordinateConventions if [ ! -d "$(JULIA_PKG_DEVDIR)/IMAS" ]; then\ julia -e 'using Pkg; Pkg.develop(url="git@github.com:ProjectTorreyPines/IMAS.jl.git");';\ fi julia -e '\ using Pkg;\ Pkg.activate("$(JULIA_PKG_DEVDIR)/IMAS");\ -Pkg.develop(["CoordinateConventions"]);\ +Pkg.develop(["IMASDD", "CoordinateConventions"]);\ Pkg.resolve();\ try Pkg.upgrade_manifest() catch end;\ ' -install_IMASDD: install_CoordinateConventions - if [ ! -d "$(JULIA_PKG_DEVDIR)/IMASDD" ]; then\ +install_IMASDD: + if [ ! -d "$(JULIA_PKG_DEVDIR)/IMAS" ]; then\ julia -e 'using Pkg; Pkg.develop(url="git@github.com:ProjectTorreyPines/IMASDD.jl.git");';\ fi julia -e '\ using Pkg;\ -Pkg.activate("$(JULIA_PKG_DEVDIR)/IMASDD");\ -Pkg.develop(["CoordinateConventions"]);\ +Pkg.activate("$(JULIA_PKG_DEVDIR)/IMAS");\ Pkg.resolve();\ try Pkg.upgrade_manifest() catch end;\ ' - install_CoordinateConventions: if [ ! -d "$(JULIA_PKG_DEVDIR)/CoordinateConventions" ]; then\ julia -e 'using Pkg; Pkg.develop(url="git@github.com:ProjectTorreyPines/CoordinateConventions.jl.git");';\ @@ -105,12 +103,12 @@ Pkg.resolve();\ try Pkg.upgrade_manifest() catch end;\ ' -install_TAUENN: install_IMAS install_CoordinateConventions install_TGLFNN install_EPEDNN +install_TAUENN: install_IMAS install_IMASDD install_CoordinateConventions install_TGLFNN install_EPEDNN if [ ! -d "$(JULIA_PKG_DEVDIR)/AD_TAUENN" ]; then ln -s $(CURRENTDIR) $(JULIA_PKG_DEVDIR)/AD_TAUENN; fi julia -e '\ using Pkg;\ Pkg.activate("$(JULIA_PKG_DEVDIR)/AD_TAUENN");\ -Pkg.develop(["IMAS", "CoordinateConventions", "AD_TGLFNN", "AD_EPEDNN"]);\ +Pkg.develop(["IMAS", "IMASDD", "CoordinateConventions", "AD_TGLFNN", "AD_EPEDNN"]);\ Pkg.resolve();\ try Pkg.upgrade_manifest() catch end;\ ' @@ -145,7 +143,7 @@ Pkg.resolve();\ try Pkg.upgrade_manifest() catch end;\ ' -update: update_FUSE update_IMAS update_CoordinateConventions update_FusionMaterials update_AD_GS update_Equilibrium update_TAUENN update_EPEDNN update_TGLFNN update_QED +update: update_FUSE update_IMAS update_IMASDD update_CoordinateConventions update_FusionMaterials update_AD_GS update_Equilibrium update_TAUENN update_EPEDNN update_TGLFNN update_QED make install update_FUSE: From 714abd44725dfbc0fddfb68e420971530007542f Mon Sep 17 00:00:00 2001 From: TimSlendebroek <32385057+TimSlendebroek@users.noreply.github.com> Date: Thu, 10 Mar 2022 14:45:47 -0800 Subject: [PATCH 4/4] fix to Project.toml --- Project.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Project.toml b/Project.toml index 12dc5edff..32b3201a7 100644 --- a/Project.toml +++ b/Project.toml @@ -38,5 +38,3 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182" Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" -[extras] -CPUSummary = "2a0fbf3d-bb9c-48f3-b0a9-814d99fd7ab9"